You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ex...@apache.org on 2024/02/15 21:13:18 UTC

(nifi) branch support/nifi-1.x updated: NIFI-12725 Upgraded json-schema-validator from 1.1.0 to 1.3.2

This is an automated email from the ASF dual-hosted git repository.

exceptionfactory pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
     new b5dd5c1f2c NIFI-12725 Upgraded json-schema-validator from 1.1.0 to 1.3.2
b5dd5c1f2c is described below

commit b5dd5c1f2c56e399adda396959c5eb175f12b6c2
Author: dan-s1 <ds...@gmail.com>
AuthorDate: Wed Feb 14 16:50:51 2024 +0000

    NIFI-12725 Upgraded json-schema-validator from 1.1.0 to 1.3.2
    
    - Adjusted URIs for schemas Draft 4, Draft 6 and Draft 7 to match official values set on json-schema-validator 1.3.0
    
    This closes #8405
    
    Signed-off-by: David Handermann <ex...@apache.org>
    (cherry picked from commit fd4a74dbff710171b7eeae10f51c09acd7b0c093)
---
 .../src/main/java/org/apache/nifi/json/schema/SchemaVersion.java    | 6 +++---
 nifi-nar-bundles/nifi-registry-bundle/nifi-registry-service/pom.xml | 2 +-
 nifi-nar-bundles/nifi-standard-bundle/pom.xml                       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nifi-commons/nifi-json-schema-api/src/main/java/org/apache/nifi/json/schema/SchemaVersion.java b/nifi-commons/nifi-json-schema-api/src/main/java/org/apache/nifi/json/schema/SchemaVersion.java
index 2df8d64312..f2df6bfd13 100644
--- a/nifi-commons/nifi-json-schema-api/src/main/java/org/apache/nifi/json/schema/SchemaVersion.java
+++ b/nifi-commons/nifi-json-schema-api/src/main/java/org/apache/nifi/json/schema/SchemaVersion.java
@@ -19,9 +19,9 @@ package org.apache.nifi.json.schema;
 import org.apache.nifi.components.DescribedValue;
 
 public enum SchemaVersion implements DescribedValue {
-    DRAFT_4("Draft Version 4", "Draft 4", "https://json-schema.org/draft-04/schema"),
-    DRAFT_6("Draft Version 6", "Draft 6", "https://json-schema.org/draft-06/schema"),
-    DRAFT_7("Draft Version 7", "Draft 7", "https://json-schema.org/draft-07/schema"),
+    DRAFT_4("Draft Version 4", "Draft 4", "http://json-schema.org/draft-04/schema#"),
+    DRAFT_6("Draft Version 6", "Draft 6", "http://json-schema.org/draft-06/schema#"),
+    DRAFT_7("Draft Version 7", "Draft 7", "http://json-schema.org/draft-07/schema#"),
     DRAFT_2019_09("Draft Version 2019-09", "Draft 2019-09", "https://json-schema.org/draft/2019-09/schema"),
     DRAFT_2020_12("Draft Version 2020-12", "Draft 2020-12", "https://json-schema.org/draft/2020-12/schema");
 
diff --git a/nifi-nar-bundles/nifi-registry-bundle/nifi-registry-service/pom.xml b/nifi-nar-bundles/nifi-registry-bundle/nifi-registry-service/pom.xml
index 64ad7f2ac2..d2c2c7932b 100644
--- a/nifi-nar-bundles/nifi-registry-bundle/nifi-registry-service/pom.xml
+++ b/nifi-nar-bundles/nifi-registry-bundle/nifi-registry-service/pom.xml
@@ -55,7 +55,7 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>com.networknt</groupId>
             <artifactId>json-schema-validator</artifactId>
-            <version>1.1.0</version>
+            <version>1.3.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
diff --git a/nifi-nar-bundles/nifi-standard-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
index e341234100..6831c02407 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
@@ -287,7 +287,7 @@
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>json-schema-validator</artifactId>
-                <version>1.1.0</version>
+                <version>1.3.2</version>
             </dependency>
             <!-- Override Commons Compiler 3.1.9 from calcite-core -->
             <dependency>