Upgrade schema to v0.5, re #12

jsonx-org · Sep 22, 2023 · 45ae077 · 45ae077
1 parent caa8443
commit 45ae077
Show file tree

Hide file tree

Showing 15 changed files with 1,592 additions and 23 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -28,7 +28,7 @@ jobs:
         mkdir -p $BUILD_DIR
 
         ARTIFACT_ID="sax"
-        VERSION="0.9.5-SNAPSHOT"
+        VERSION="1.0.0-SNAPSHOT"
         CLASSIFIER="bundle"
         JAR="$ARTIFACT_ID-$VERSION-$CLASSIFIER.jar"
 

diff --git a/examples/array.jsdx b/examples/array.jsdx
@@ -15,9 +15,9 @@
   program. If not, see <http://opensource.org/licenses/MIT/>.
 -->
 <schema
-  xmlns="http://www.jsonx.org/schema-0.4.xsd"
+  xmlns="http://www.jsonx.org/schema-0.5.xsd"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.jsonx.org/schema-0.4.xsd http://www.jsonx.org/schema.xsd"
+  xsi:schemaLocation="http://www.jsonx.org/schema-0.5.xsd http://www.jsonx.org/schema.xsd"
   targetNamespace="http://www.jsonx.org/examples/array.jsdx">
   <array name="bar-rootArray1">
     <reference type="rootBoolean" minOccurs="5" maxOccurs="6"/>

diff --git a/examples/complete.jsdx b/examples/complete.jsdx
@@ -15,9 +15,9 @@
   program. If not, see <http://opensource.org/licenses/MIT/>.
 -->
 <schema
-  xmlns="http://www.jsonx.org/schema-0.4.xsd"
+  xmlns="http://www.jsonx.org/schema-0.5.xsd"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.jsonx.org/schema-0.4.xsd http://www.jsonx.org/schema.xsd"
+  xsi:schemaLocation="http://www.jsonx.org/schema-0.5.xsd http://www.jsonx.org/schema.xsd"
   targetNamespace="http://www.jsonx.org/examples/complete.jsdx"
   doc="Schema intended to provide a complete set of variations of declarations">
   <array name="rootArrayBool" doc="Root array boolean">

diff --git a/examples/datatype.jsdx b/examples/datatype.jsdx
@@ -15,9 +15,9 @@
   program. If not, see <http://opensource.org/licenses/MIT/>.
 -->
 <schema
-  xmlns="http://www.jsonx.org/schema-0.4.xsd"
+  xmlns="http://www.jsonx.org/schema-0.5.xsd"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.jsonx.org/schema-0.4.xsd http://www.jsonx.org/schema.xsd"
+  xsi:schemaLocation="http://www.jsonx.org/schema-0.5.xsd http://www.jsonx.org/schema.xsd"
   targetNamespace="http://www.jsonx.org/examples/datatype.jsdx"
   doc="Schema intended to express full variability of type declarations">
   <array name="arrayArr" doc="Array of arrays">

diff --git a/examples/reference.jsdx b/examples/reference.jsdx
@@ -15,9 +15,9 @@
   program. If not, see <http://opensource.org/licenses/MIT/>.
 -->
 <schema
-  xmlns="http://www.jsonx.org/schema-0.4.xsd"
+  xmlns="http://www.jsonx.org/schema-0.5.xsd"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.jsonx.org/schema-0.4.xsd http://www.jsonx.org/schema.xsd"
+  xsi:schemaLocation="http://www.jsonx.org/schema-0.5.xsd http://www.jsonx.org/schema.xsd"
   targetNamespace="http://www.jsonx.org/examples/reference.jsdx"
   doc="Schema focusing on references">
   <array name="arrayObj">

diff --git a/examples/reserved.jsdx b/examples/reserved.jsdx
@@ -15,9 +15,9 @@
   program. If not, see <http://opensource.org/licenses/MIT/>.
 -->
 <schema
-  xmlns="http://www.jsonx.org/schema-0.4.xsd"
+  xmlns="http://www.jsonx.org/schema-0.5.xsd"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.jsonx.org/schema-0.4.xsd http://www.jsonx.org/schema.xsd"
+  xsi:schemaLocation="http://www.jsonx.org/schema-0.5.xsd http://www.jsonx.org/schema.xsd"
   targetNamespace="http://www.jsonx.org/examples/reserved.jsdx"
   doc="Schema with names that overlap with Java's reserved words">
   <array name="break" maxIterate="2">

diff --git a/examples/structure.jsdx b/examples/structure.jsdx
@@ -15,9 +15,9 @@
   program. If not, see <http://opensource.org/licenses/MIT/>.
 -->
 <schema
-  xmlns="http://www.jsonx.org/schema-0.4.xsd"
+  xmlns="http://www.jsonx.org/schema-0.5.xsd"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.jsonx.org/schema-0.4.xsd http://www.jsonx.org/schema.xsd"
+  xsi:schemaLocation="http://www.jsonx.org/schema-0.5.xsd http://www.jsonx.org/schema.xsd"
   targetNamespace="http://www.jsonx.org/examples/structure.jsdx"
   doc="Schema expressing complex nested structures">
   <array name="array">

diff --git a/examples/template.jsdx b/examples/template.jsdx
@@ -15,9 +15,9 @@
   program. If not, see <http://opensource.org/licenses/MIT/>.
 -->
 <schema
-  xmlns="http://www.jsonx.org/schema-0.4.xsd"
+  xmlns="http://www.jsonx.org/schema-0.5.xsd"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.jsonx.org/schema-0.4.xsd http://www.jsonx.org/schema.xsd"
+  xsi:schemaLocation="http://www.jsonx.org/schema-0.5.xsd http://www.jsonx.org/schema.xsd"
   targetNamespace="http://www.jsonx.org/examples/template.jsdx"
   doc="Schema expressing the variations of templates">
   <array name="arrayDepthFour" minIterate="4" maxIterate="4" doc="Array template">

diff --git a/schema-0.4/schema-0.4.jsd b/schema-0.4/schema-0.4.jsd
@@ -1,7 +1,7 @@
 {
-  "jx:ns": "http://www.jsonx.org/schema-0.4.jsd",
-  "jx:schemaLocation": "http://www.jsonx.org/schema-0.4.jsd http://www.jsonx.org/schema-0.4.jsd",
-  "jx:targetNamespace": "http://www.jsonx.org/schema-0.4.jsd",
+  "jx:ns": "http://www.jsonx.org/schema-0.5.jsd",
+  "jx:schemaLocation": "http://www.jsonx.org/schema-0.5.jsd http://www.jsonx.org/schema-0.5.jsd",
+  "jx:targetNamespace": "http://www.jsonx.org/schema-0.5.jsd",
   "min": {
     "jx:type": "string",
     "pattern": "\\d+"
@@ -39,12 +39,12 @@
     "properties": {
       "jx:ns": {
         "jx:type": "string",
-        "pattern": "http://www.jsonx.org/schema-0.4.jsd",
+        "pattern": "http://www.jsonx.org/schema-0.5.jsd",
         "nullable": false
       },
       "jx:schemaLocation": {
         "jx:type": "string",
-        "pattern": "http://www.jsonx.org/schema-0.4.jsd [^ ]+",
+        "pattern": "http://www.jsonx.org/schema-0.5.jsd [^ ]+",
         "use": "optional",
         "nullable": false
       },