Skip to content

Commit 90ca89d

Browse files
authored
Merge pull request #326 from aml-org/publish-5.7.2
W-18635564: publish 5.7.2
2 parents d141108 + fa7da9f commit 90ca89d

File tree

6 files changed

+27
-6
lines changed

6 files changed

+27
-6
lines changed

exporters/src/test/scala/amf/exporters/VocabularyPropertiesTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ class VocabularyPropertiesTest extends AsyncFunSuite with VocabularyTest {
3838
}
3939

4040
test("Vocabularies parsing data_shapes") {
41-
testVocabulary(data_shapes, 22, 65)
41+
testVocabulary(data_shapes, 22, 66)
4242
}
4343

4444
test("Vocabularies parsing security_model") {
45-
testVocabulary(security_model, 13, 19)
45+
testVocabulary(security_model, 14, 19)
4646
}
4747
}

transform/dependencies.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Leave here for the publication process to detect if amf-transform has to be published!
22
# Because we publish a version of amf-transform for each version of amf-client publish.
3-
amf.apicontract=5.7.1
4-
amf.rdf=6.7.1
3+
amf.apicontract=5.7.2
4+
amf.rdf=6.7.2

versions.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
amf.vocabulary: 58.0.0
2-
amf.transform: 2.42.0
1+
amf.vocabulary: 59.0.0
2+
amf.transform: 2.43.0

vocabulary/src/main/resources/dialects/canonical_webapi_spec.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -786,6 +786,9 @@ nodeMappings:
786786
comment:
787787
propertyTerm: core.comment
788788
range: string
789+
SchemaVersion:
790+
propertyTerm: raml-shapes.schemaVersion
791+
range: string
789792
examples:
790793
propertyTerm: apiContract.examples
791794
range: Example
@@ -2468,6 +2471,16 @@ nodeMappings:
24682471
allowMultiple: true
24692472

24702473

2474+
MutualTLSSettings:
2475+
classTerm: security.MutualTLSSettings
2476+
extends: Settings
2477+
mapping:
2478+
scope:
2479+
propertyTerm: security.scope
2480+
range: Scope
2481+
allowMultiple: true
2482+
2483+
24712484
NamedExampleFragment:
24722485
classTerm: apiContract.NamedExampleFragment
24732486
extends: Fragment

vocabulary/src/main/resources/vocabularies/data_shapes.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,10 @@ propertyTerms:
297297
displayName: schemaTarget
298298
description: Target applied shape in the dependency
299299
range: shacl.Shape
300+
schemaVersion:
301+
displayName: SchemaVersion
302+
description: Determine which dialect should be used when processing the schema
303+
range: string
300304
serializationOrder:
301305
displayName: serializationOrder
302306
description: position in the set of properties for a shape used to serialize this property on the wire

vocabulary/src/main/resources/vocabularies/security.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ classTerms:
1818
displayName: HttpSettings
1919
description: Settings for an HTTP security scheme
2020
extends: Settings
21+
MutualTLSSettings:
22+
displayName: MutualTLSSettings
23+
description: Settings for an Mutual TLS security scheme
24+
extends: Settings
2125
OAuth1Settings:
2226
displayName: OAuth1Settings
2327
description: Settings for an OAuth1 security scheme

0 commit comments

Comments
 (0)