Skip to content

Commit

Permalink
Adopt metaschema 0.9.0 (#182)
Browse files Browse the repository at this point in the history
* Migrated management of some dependency versions to parent POM.
* Advanced metaschema submodule to the 0.9.0 release.
  • Loading branch information
david-waltermire authored Jun 27, 2023
1 parent cc5d4ad commit f6cb524
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
4 changes: 0 additions & 4 deletions metaschema-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
</distributionManagement>

<properties>
<mojo.maven.version>3.9.3</mojo.maven.version>
<mojo.java.target>${maven.compiler.target}</mojo.java.target>
<dependency.plexus-utils.version>4.0.0</dependency.plexus-utils.version>
<dependency.plexus-build-api.version>0.0.7</dependency.plexus-build-api.version>
<dependency.maven-shared-incremental.version>1.1</dependency.maven-shared-incremental.version>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion metaschema-model/metaschema
Submodule metaschema updated 63 files
+3 −3 .github/workflows/workflow-generate-website.yml
+1 −1 .github/workflows/workflow-validate-repo-markdown.yml
+2 −2 .github/workflows/workflow-validate-website-content.yml
+3 −0 .gitignore
+3 −0 build/config/.markdown-link-check/config.json
+49 −39 build/go.mod
+101 −74 build/go.sum
+2 −2 schema/json/metaschema-datatypes.json
+2 −2 schema/xml/metaschema-datatypes.xsd
+67 −28 test-suite/metaschema-xspec/json-schema-gen/json-schema-gen.xspec
+0 −70 test-suite/metaschema-xspec/json-schema-gen/json-value_constrained-closed.json
+0 −58 test-suite/metaschema-xspec/json-schema-gen/json-value_constrained-narrow.json
+0 −70 test-suite/metaschema-xspec/json-schema-gen/json-value_constrained-open.json
+0 −58 test-suite/metaschema-xspec/json-schema-gen/json-value_constrained-sortof.json
+53 −0 test-suite/metaschema-xspec/json-schema-gen/json-value_field_constrained-closed.json
+5 −0 test-suite/metaschema-xspec/json-schema-gen/json-value_field_constrained-closed_example_FAIL.json
+5 −0 test-suite/metaschema-xspec/json-schema-gen/json-value_field_constrained-closed_example_PASS.json
+9 −13 test-suite/metaschema-xspec/json-schema-gen/json-value_field_constrained-closed_metaschema.xml
+41 −0 test-suite/metaschema-xspec/json-schema-gen/json-value_field_constrained-narrow.json
+5 −0 test-suite/metaschema-xspec/json-schema-gen/json-value_field_constrained-narrow_example-FAIL.json
+5 −0 test-suite/metaschema-xspec/json-schema-gen/json-value_field_constrained-narrow_example-PASS1.json
+5 −0 test-suite/metaschema-xspec/json-schema-gen/json-value_field_constrained-narrow_example-PASS2.json
+9 −14 test-suite/metaschema-xspec/json-schema-gen/json-value_field_constrained-narrow_metaschema.xml
+53 −0 test-suite/metaschema-xspec/json-schema-gen/json-value_field_constrained-open.json
+5 −0 test-suite/metaschema-xspec/json-schema-gen/json-value_field_constrained-open_example-FAIL.json
+5 −0 test-suite/metaschema-xspec/json-schema-gen/json-value_field_constrained-open_example-PASS1.json
+5 −0 test-suite/metaschema-xspec/json-schema-gen/json-value_field_constrained-open_example-PASS2.json
+9 −13 test-suite/metaschema-xspec/json-schema-gen/json-value_field_constrained-open_metaschema.xml
+41 −0 test-suite/metaschema-xspec/json-schema-gen/json-value_field_constrained-sortof.json
+5 −0 test-suite/metaschema-xspec/json-schema-gen/json-value_field_constrained-sortof_example-FAIL.json
+5 −0 test-suite/metaschema-xspec/json-schema-gen/json-value_field_constrained-sortof_example-PASS1.json
+5 −0 test-suite/metaschema-xspec/json-schema-gen/json-value_field_constrained-sortof_example-PASS2.json
+9 −13 test-suite/metaschema-xspec/json-schema-gen/json-value_field_constrained-sortof_metaschema.xml
+41 −0 test-suite/metaschema-xspec/json-schema-gen/json-value_field_unconstrained.json
+5 −0 test-suite/metaschema-xspec/json-schema-gen/json-value_field_unconstrained_example-FAIL.json
+5 −0 test-suite/metaschema-xspec/json-schema-gen/json-value_field_unconstrained_example-PASS.json
+26 −0 test-suite/metaschema-xspec/json-schema-gen/json-value_field_unconstrained_metaschema.xml
+72 −0 test-suite/metaschema-xspec/json-schema-gen/json-value_flag_constrained-closed.json
+8 −0 test-suite/metaschema-xspec/json-schema-gen/json-value_flag_constrained-closed_example-FAIL.json
+8 −0 test-suite/metaschema-xspec/json-schema-gen/json-value_flag_constrained-closed_example-PASS.json
+38 −0 test-suite/metaschema-xspec/json-schema-gen/json-value_flag_constrained-closed_metaschema.xml
+72 −0 test-suite/metaschema-xspec/json-schema-gen/json-value_flag_constrained-open.json
+8 −0 test-suite/metaschema-xspec/json-schema-gen/json-value_flag_constrained-open_example-FAIL.json
+8 −0 test-suite/metaschema-xspec/json-schema-gen/json-value_flag_constrained-open_example-PASS1.json
+8 −0 test-suite/metaschema-xspec/json-schema-gen/json-value_flag_constrained-open_example-PASS2.json
+38 −0 test-suite/metaschema-xspec/json-schema-gen/json-value_flag_constrained-open_metaschema.xml
+19 −17 test-suite/metaschema-xspec/json-schema-gen/json-value_flag_unconstrained.json
+8 −0 test-suite/metaschema-xspec/json-schema-gen/json-value_flag_unconstrained_example-FAIL.json
+8 −0 test-suite/metaschema-xspec/json-schema-gen/json-value_flag_unconstrained_example-PASS.json
+11 −11 test-suite/metaschema-xspec/json-schema-gen/json-value_flag_unconstrained_metaschema.xml
+17 −0 test-suite/metaschema-xspec/json-schema-gen/schema_directive_imported1.xml
+17 −0 test-suite/metaschema-xspec/json-schema-gen/schema_directive_imported2.xml
+63 −0 test-suite/metaschema-xspec/json-schema-gen/schema_directive_importing.json
+13 −0 test-suite/metaschema-xspec/json-schema-gen/schema_directive_importing.xml
+4 −0 test-suite/metaschema-xspec/json-schema-gen/schema_directive_importing_PASS1.json
+3 −0 test-suite/metaschema-xspec/json-schema-gen/schema_directive_importing_PASS2.json
+38 −0 test-suite/metaschema-xspec/json-schema-gen/schema_directive_no-imports.json
+16 −0 test-suite/metaschema-xspec/json-schema-gen/schema_directive_no-imports.xml
+4 −0 test-suite/metaschema-xspec/json-schema-gen/schema_directive_no-imports_PASS1.json
+3 −0 test-suite/metaschema-xspec/json-schema-gen/schema_directive_no-imports_PASS2.json
+24 −6 toolchains/xslt-M4/schema-gen/make-json-schema-metamap.xsl
+1 −1 website/config.yaml
+9 −7 website/content/specification/datatypes.md
8 changes: 8 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,18 @@
<jqueryVersion>3.4.1</jqueryVersion>
<fontawesomeVersion>5.12.1</fontawesomeVersion>
<popperVersion>1.16.0</popperVersion>

<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.release>11</maven.compiler.release>
<mojo.java.target>${maven.compiler.target}</mojo.java.target>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<mojo.maven.version>3.9.3</mojo.maven.version>

<dependency.antlr4.version>4.10.1</dependency.antlr4.version>
<dependency.auto-service.version>1.0.1</dependency.auto-service.version>
<dependency.commons-collections4.version>4.4</dependency.commons-collections4.version>
Expand All @@ -130,6 +136,8 @@
<dependency.junit5-platform-launcher.version>1.9.0</dependency.junit5-platform-launcher.version>
<dependency.log4j2.version>2.20.0</dependency.log4j2.version>
<dependency.moxy.version>3.0.3</dependency.moxy.version>
<dependency.plexus-utils.version>4.0.0</dependency.plexus-utils.version>
<dependency.plexus-build-api.version>0.0.7</dependency.plexus-build-api.version>
<dependency.saxon.version>12.2</dependency.saxon.version>
<dependency.spotbugs-annotations.version>4.7.2</dependency.spotbugs-annotations.version>
<dependency.stax2-api.version>4.2.1</dependency.stax2-api.version>
Expand Down

0 comments on commit f6cb524

Please sign in to comment.