diff --git a/Jenkinsfile b/Jenkinsfile index 5d2c224834..cb3b4e2f4c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -58,6 +58,7 @@ pipeline { anyOf { branch 'master' branch 'develop' + branch 'support/*' } } steps { diff --git a/amf-webapi.versions b/amf-webapi.versions index c831744140..d74c2fd52a 100644 --- a/amf-webapi.versions +++ b/amf-webapi.versions @@ -1,4 +1,4 @@ -amf.webapi=4.7.3 +amf.webapi=4.7.3-0 amf.core=4.1.214 amf.custom.validations=5.1.5 amf.model=3.1.0 diff --git a/documentation/model.md b/documentation/model.md index 8c789bd172..45e0414ede 100644 --- a/documentation/model.md +++ b/documentation/model.md @@ -1195,7 +1195,7 @@ Shape that validates a record of fields, like a JS object | additionalPropertiesSchema | [Shape](#shape) | Additional properties schema | http://www.w3.org/ns/shacl#additionalPropertiesSchema | | discriminator | string | Discriminator property | http://a.ml/vocabularies/shapes#discriminator | | discriminatorValue | string | Values for the discriminator property | http://a.ml/vocabularies/shapes#discriminatorValue | - | discriminatorMapping | [[DiscriminatorValueMapping](#discriminatorvaluemapping)] | Mapping of acceptable values for the node discriminator | http://a.ml/vocabularies/shapes#discriminatorMapping | + | discriminatorMapping | [[IriTemplateMapping](#iritemplatemapping)] | Mapping of acceptable values for the node discriminator | http://a.ml/vocabularies/shapes#discriminatorMapping | | discriminatorValueMapping | [[DiscriminatorValueMapping](#discriminatorvaluemapping)] | Mapping of acceptable values for the node discriminator | http://a.ml/vocabularies/shapes#discriminatorValueMapping | | property | [[PropertyShape](#propertyshape)] | Properties associated to this node | http://www.w3.org/ns/shacl#property | | propertyNames | [Shape](#shape) | Property names schema | http://www.w3.org/ns/shacl#propertyNames |