Merge pull request #1964 from aml-org/bump-amf-model

bump amf model
aml-org · Apr 8, 2024 · 6c4fd75 · 6c4fd75
2 parents cc3cf96 + a44dca4
commit 6c4fd75
Show file tree

Hide file tree

Showing 1,113 changed files with 3,110 additions and 1,284 deletions.
diff --git a/amf-apicontract.versions b/amf-apicontract.versions
@@ -1,6 +1,6 @@
-amf.apicontract=5.5.0-RC.2
+amf.apicontract=5.5.0-RC.3
 amf.aml=6.5.0-RC.1
-amf.model=3.8.2
+amf.model=3.9.0
 antlr4Version=0.7.25
 amf.validation.profile.dialect=1.6.0
 amf.validation.report.dialect=1.2.0
diff --git a/amf-cli/shared/src/test/resources/configuration/async-model.jsonld b/amf-cli/shared/src/test/resources/configuration/async-model.jsonld
@@ -5,7 +5,7 @@
 "@type": [
 "http://a.ml/vocabularies/document#APIContractProcessingData"
 ],
-"http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2"
+"http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0"
 },
 {
 "@id": "root/async-api",

diff --git a/amf-cli/shared/src/test/resources/configuration/webapi-model.jsonld b/amf-cli/shared/src/test/resources/configuration/webapi-model.jsonld
@@ -5,7 +5,7 @@
 "@type": [
 "http://a.ml/vocabularies/document#APIContractProcessingData"
 ],
-"http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2"
+"http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0"
 },
 {
 "@id": "root/web-api",

diff --git a/...d/src/test/resources/graphql-federation/tck/apis/transformation/introspected-types.jsonld b/...d/src/test/resources/graphql-federation/tck/apis/transformation/introspected-types.jsonld
@@ -23,7 +23,7 @@
       "@type": [
         "doc:APIContractProcessingData"
       ],
-      "apiContract:modelVersion": "3.8.2",
+      "apiContract:modelVersion": "3.9.0",
       "doc:transformed": true,
       "doc:sourceSpec": "GraphQLFederation"
     },

diff --git a/...red/src/test/resources/graphql-federation/tck/apis/valid/directive-with-directives.jsonld b/...red/src/test/resources/graphql-federation/tck/apis/valid/directive-with-directives.jsonld
@@ -36,7 +36,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/...i/shared/src/test/resources/graphql-federation/tck/apis/valid/external-extend-type.jsonld b/...i/shared/src/test/resources/graphql-federation/tck/apis/valid/external-extend-type.jsonld
@@ -36,7 +36,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/external-type.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/external-type.jsonld
@@ -36,7 +36,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/.../shared/src/test/resources/graphql-federation/tck/apis/valid/federation-directives.jsonld b/.../shared/src/test/resources/graphql-federation/tck/apis/valid/federation-directives.jsonld
@@ -36,7 +36,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/...cli/shared/src/test/resources/graphql-federation/tck/apis/valid/graphql-directives.jsonld b/...cli/shared/src/test/resources/graphql-federation/tck/apis/valid/graphql-directives.jsonld
@@ -300,7 +300,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/.../shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-argument.jsonld b/.../shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-argument.jsonld
@@ -36,7 +36,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/...hared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-enum-value.jsonld b/...hared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-enum-value.jsonld
@@ -36,7 +36,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-enum.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-enum.jsonld
@@ -36,7 +36,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/.../test/resources/graphql-federation/tck/apis/valid/inaccessible-field-with-argument.jsonld b/.../test/resources/graphql-federation/tck/apis/valid/inaccessible-field-with-argument.jsonld
@@ -36,7 +36,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/...cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-field.jsonld b/...cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-field.jsonld
@@ -36,7 +36,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/...ared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-input-field.jsonld b/...ared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-input-field.jsonld
@@ -36,7 +36,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/...red/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-input-object.jsonld b/...red/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-input-object.jsonld
@@ -36,7 +36,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/...shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-interface.jsonld b/...shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-interface.jsonld
@@ -36,7 +36,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/...li/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-object.jsonld b/...li/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-object.jsonld
@@ -36,7 +36,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/...li/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-scalar.jsonld b/...li/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-scalar.jsonld
@@ -36,7 +36,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/...cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-union.jsonld b/...cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-union.jsonld
@@ -36,7 +36,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/...i/shared/src/test/resources/graphql-federation/tck/apis/valid/key-extend-interface.jsonld b/...i/shared/src/test/resources/graphql-federation/tck/apis/valid/key-extend-interface.jsonld
@@ -36,7 +36,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/...hared/src/test/resources/graphql-federation/tck/apis/valid/key-extend-type-complex.jsonld b/...hared/src/test/resources/graphql-federation/tck/apis/valid/key-extend-type-complex.jsonld
@@ -36,7 +36,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/...ed/src/test/resources/graphql-federation/tck/apis/valid/key-extend-type-resolvable.jsonld b/...ed/src/test/resources/graphql-federation/tck/apis/valid/key-extend-type-resolvable.jsonld
@@ -36,7 +36,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-extend-type.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-extend-type.jsonld
@@ -36,7 +36,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-interface.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-interface.jsonld
@@ -36,7 +36,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-type-complex.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-type-complex.jsonld
@@ -36,7 +36,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/...red/src/test/resources/graphql-federation/tck/apis/valid/key-type-multi-resolvable.jsonld b/...red/src/test/resources/graphql-federation/tck/apis/valid/key-type-multi-resolvable.jsonld
@@ -36,7 +36,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/...li/shared/src/test/resources/graphql-federation/tck/apis/valid/key-type-resolvable.jsonld b/...li/shared/src/test/resources/graphql-federation/tck/apis/valid/key-type-resolvable.jsonld
@@ -36,7 +36,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-type.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-type.jsonld
@@ -36,7 +36,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/link.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/link.jsonld
@@ -178,7 +178,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/override.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/override.jsonld
@@ -36,7 +36,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/provides.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/provides.jsonld
@@ -36,7 +36,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/requires.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/requires.jsonld
@@ -36,7 +36,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/.../shared/src/test/resources/graphql-federation/tck/apis/valid/root-field-directives.jsonld b/.../shared/src/test/resources/graphql-federation/tck/apis/valid/root-field-directives.jsonld
@@ -905,7 +905,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/.../shared/src/test/resources/graphql-federation/tck/apis/valid/root-innacessible-arg.jsonld b/.../shared/src/test/resources/graphql-federation/tck/apis/valid/root-innacessible-arg.jsonld
@@ -405,7 +405,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/shareable-field.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/shareable-field.jsonld
@@ -36,7 +36,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/shareable-object.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/shareable-object.jsonld
@@ -36,7 +36,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/amf-cli/shared/src/test/resources/graphql/corner-cases/recursion-with-query.jsonld b/amf-cli/shared/src/test/resources/graphql/corner-cases/recursion-with-query.jsonld
@@ -144,7 +144,7 @@
         ],
         "apiContract:modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "doc:sourceSpec": [

diff --git a/amf-cli/shared/src/test/resources/graphql/corner-cases/recursion-with-unions.jsonld b/amf-cli/shared/src/test/resources/graphql/corner-cases/recursion-with-unions.jsonld
@@ -160,7 +160,7 @@
         ],
         "apiContract:modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "doc:sourceSpec": [

diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-!-token.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-!-token.jsonld
@@ -37,7 +37,7 @@
         ],
         "apiContract:modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "doc:sourceSpec": [

diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-"-token.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-"-token.jsonld
@@ -37,7 +37,7 @@
         ],
         "apiContract:modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "doc:sourceSpec": [

diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-&-token.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-&-token.jsonld
@@ -37,7 +37,7 @@
         ],
         "apiContract:modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "doc:sourceSpec": [

diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-*-token.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-*-token.jsonld
@@ -160,7 +160,7 @@
         ],
         "apiContract:modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "doc:sourceSpec": [

diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous---token.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous---token.jsonld
@@ -37,7 +37,7 @@
         ],
         "apiContract:modelVersion": [
           {
-            "@value": "3.8.2"
+            "@value": "3.9.0"
           }
         ],
         "doc:sourceSpec": [