From f0cef587e015580ffb8cde026d79c9230ded1e09 Mon Sep 17 00:00:00 2001 From: nschejtman Date: Fri, 27 May 2022 11:57:07 -0300 Subject: [PATCH 1/4] W-10674627: add isExtension field to shapes --- .../test/scala/amf/exporters/VocabularyPropertiesTest.scala | 2 +- .../src/main/resources/dialects/canonical_webapi_spec.yaml | 3 +++ vocabulary/src/main/resources/vocabularies/data_shapes.yaml | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/exporters/src/test/scala/amf/exporters/VocabularyPropertiesTest.scala b/exporters/src/test/scala/amf/exporters/VocabularyPropertiesTest.scala index e9f9b22..0245005 100644 --- a/exporters/src/test/scala/amf/exporters/VocabularyPropertiesTest.scala +++ b/exporters/src/test/scala/amf/exporters/VocabularyPropertiesTest.scala @@ -38,7 +38,7 @@ class VocabularyPropertiesTest extends AsyncFunSuite with VocabularyTest { } test("Vocabularies parsing data_shapes") { - testVocabulary(data_shapes, 21, 57) + testVocabulary(data_shapes, 21, 58) } test("Vocabularies parsing security_model") { diff --git a/vocabulary/src/main/resources/dialects/canonical_webapi_spec.yaml b/vocabulary/src/main/resources/dialects/canonical_webapi_spec.yaml index 2d76e72..1e50d75 100644 --- a/vocabulary/src/main/resources/dialects/canonical_webapi_spec.yaml +++ b/vocabulary/src/main/resources/dialects/canonical_webapi_spec.yaml @@ -2303,6 +2303,9 @@ nodeMappings: deprecated: propertyTerm: raml-shapes.deprecated range: boolean + isExtension: + propertyTerm: raml-shapes.isExtension + range: boolean designLink: propertyTerm: doc.design-link-target range: link diff --git a/vocabulary/src/main/resources/vocabularies/data_shapes.yaml b/vocabulary/src/main/resources/vocabularies/data_shapes.yaml index b27b323..2ee7e3e 100644 --- a/vocabulary/src/main/resources/vocabularies/data_shapes.yaml +++ b/vocabulary/src/main/resources/vocabularies/data_shapes.yaml @@ -189,6 +189,10 @@ propertyTerms: displayName: isAbstract description: Marks this shape as an abstract node shape declared for pure re-use range: boolean + isExtension: + displayName: isExtension + description: Indicates if a Shape is an extension of another shape or a standalone shape + range: boolean items: displayName: items description: Shapes contained in the Tuple Shape From 48dd3f149e5eb593e6e8b3740a5419c3ba3d81f1 Mon Sep 17 00:00:00 2001 From: hghianni Date: Wed, 1 Jun 2022 12:32:18 -0300 Subject: [PATCH 2/4] Publish 24.1.0-SNAPSHOT and 2.9.0-SNAPSHOT --- transform/dependencies.properties | 4 ++-- versions.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/transform/dependencies.properties b/transform/dependencies.properties index 9be823a..08048b4 100644 --- a/transform/dependencies.properties +++ b/transform/dependencies.properties @@ -1,4 +1,4 @@ # Leave here for the publication process to detect if amf-transform has to be published! # Because we publish a version of amf-transform for each version of amf-client publish. -amf.apicontract=5.0.9 -amf.rdf=6.0.9 +amf.apicontract=5.1.0-SNAPSHOT +amf.rdf=6.1.0-SNAPSHOT diff --git a/versions.yaml b/versions.yaml index 81dcbc4..0f40e1c 100644 --- a/versions.yaml +++ b/versions.yaml @@ -1,2 +1,2 @@ -amf.vocabulary: 24.0.0 -amf.transform: 2.8.0 \ No newline at end of file +amf.vocabulary: 24.1.0-SNAPSHOT +amf.transform: 2.9.0-SNAPSHOT \ No newline at end of file From 48d7c09ddeea289133dd32c065775f362be861c0 Mon Sep 17 00:00:00 2001 From: hghianni Date: Thu, 23 Jun 2022 15:46:04 -0300 Subject: [PATCH 3/4] Publish 2.9.0-RC.0 and 25.0.0-RC.0 --- Jenkinsfile | 2 ++ transform/dependencies.properties | 4 ++-- versions.yaml | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e900d12..9a21df8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -67,6 +67,7 @@ pipeline { anyOf { branch 'master' branch 'develop' + branch 'release/*' } // expression { hasChangesIn("vocabulary", "vocabulary") || isDevelop() } } @@ -93,6 +94,7 @@ pipeline { anyOf { branch 'master' branch 'develop' + branch 'release/*' } // expression { hasChangesIn("transform", "transform") || isDevelop() } } diff --git a/transform/dependencies.properties b/transform/dependencies.properties index 08048b4..da250e7 100644 --- a/transform/dependencies.properties +++ b/transform/dependencies.properties @@ -1,4 +1,4 @@ # Leave here for the publication process to detect if amf-transform has to be published! # Because we publish a version of amf-transform for each version of amf-client publish. -amf.apicontract=5.1.0-SNAPSHOT -amf.rdf=6.1.0-SNAPSHOT +amf.apicontract=5.0.10-RC.0 +amf.rdf=6.0.10-RC.0 diff --git a/versions.yaml b/versions.yaml index 0f40e1c..f1ac605 100644 --- a/versions.yaml +++ b/versions.yaml @@ -1,2 +1,2 @@ -amf.vocabulary: 24.1.0-SNAPSHOT -amf.transform: 2.9.0-SNAPSHOT \ No newline at end of file +amf.vocabulary: 25.0.0-RC.0 +amf.transform: 2.9.0-RC.0 \ No newline at end of file From 9f1c92fd78f020d1e973844b771d6908cee61993 Mon Sep 17 00:00:00 2001 From: hghianni Date: Wed, 29 Jun 2022 08:43:14 -0300 Subject: [PATCH 4/4] Publish 25.0.0-2.9.0 --- Jenkinsfile | 2 -- transform/dependencies.properties | 4 ++-- versions.yaml | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9a21df8..e900d12 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -67,7 +67,6 @@ pipeline { anyOf { branch 'master' branch 'develop' - branch 'release/*' } // expression { hasChangesIn("vocabulary", "vocabulary") || isDevelop() } } @@ -94,7 +93,6 @@ pipeline { anyOf { branch 'master' branch 'develop' - branch 'release/*' } // expression { hasChangesIn("transform", "transform") || isDevelop() } } diff --git a/transform/dependencies.properties b/transform/dependencies.properties index da250e7..569ed4c 100644 --- a/transform/dependencies.properties +++ b/transform/dependencies.properties @@ -1,4 +1,4 @@ # Leave here for the publication process to detect if amf-transform has to be published! # Because we publish a version of amf-transform for each version of amf-client publish. -amf.apicontract=5.0.10-RC.0 -amf.rdf=6.0.10-RC.0 +amf.apicontract=5.0.10 +amf.rdf=6.0.10 diff --git a/versions.yaml b/versions.yaml index f1ac605..c73aefe 100644 --- a/versions.yaml +++ b/versions.yaml @@ -1,2 +1,2 @@ -amf.vocabulary: 25.0.0-RC.0 -amf.transform: 2.9.0-RC.0 \ No newline at end of file +amf.vocabulary: 25.0.0 +amf.transform: 2.9.0 \ No newline at end of file