Merge pull request #538 from aml-org/publish-6.0.10

Publish 6.0.10
aml-org · Jun 28, 2022 · 36164ac · 36164ac
2 parents c31648c + f665c03
commit 36164ac
Show file tree

Hide file tree

Showing 20 changed files with 104 additions and 371 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
     stage('Test') {
       steps {
         wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'XTerm']) {
-          sh 'sbt -mem 4096 -Dfile.encoding=UTF-8 clean coverage test coverageReport'
+          sh 'sbt -mem 4096 -Dfile.encoding=UTF-8 clean coverage test coverageAggregate'
         }
       }
     }
@@ -53,6 +53,22 @@ pipeline {
         }
       }
     }
+    stage('Triggers') {
+      when {
+        anyOf {
+          branch 'develop'
+        }
+      }
+      steps {
+        script {
+          echo "Triggering amf on develop branch"
+          build job: 'application/AMF/amf/develop', wait: false
+
+          echo "Triggering amf-custom-validator-scalajs on develop branch"
+          build job: 'application/AMF/amf-custom-validator-scalajs/develop', wait: false
+        }
+      }
+    }
     stage('Tag version') {
       when {
         anyOf {

diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/semantic/SemanticExtensionParser.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/semantic/SemanticExtensionParser.scala
@@ -48,8 +48,8 @@ class SemanticExtensionParser(finder: ExtensionDialectFinder, specAnnotationVali
 
     val instanceElement: DialectDomainElement = parseAnnotation(mapping, ast, extensionId)
 
-    val property                   = createCustomDomainProperty(instanceElement, extensionName, value)
-    val extension: DomainExtension = createDomainExtension(extensionName, value, extensionId, property)
+    val property                   = createCustomDomainProperty(instanceElement, extensionName, ast)
+    val extension: DomainExtension = createDomainExtension(extensionName, ast, extensionId, property)
     mergeAnnotationIntoExtension(instanceElement, extension)
   }
 
@@ -65,7 +65,7 @@ class SemanticExtensionParser(finder: ExtensionDialectFinder, specAnnotationVali
     }
   }
 
-  private def createDomainExtension(key: String, value: YNode, id: String, property: CustomDomainProperty) = {
+  private def createDomainExtension(key: String, value: YMapEntry, id: String, property: CustomDomainProperty) = {
     val extension = DomainExtension()
       .withId(id)
       .withDefinedBy(property)
@@ -74,8 +74,8 @@ class SemanticExtensionParser(finder: ExtensionDialectFinder, specAnnotationVali
     extension
   }
 
-  private def createCustomDomainProperty(instanceElement: DialectDomainElement, key: String, value: YNode) = {
-    CustomDomainProperty(Annotations(value)).withId(instanceElement.id).withName(key, Annotations())
+  private def createCustomDomainProperty(instanceElement: DialectDomainElement, key: String, ast: YMapEntry) = {
+    CustomDomainProperty(Annotations(ast)).withId(instanceElement.id).withName(key, Annotations())
   }
 
   private def parseAnnotation(mapping: AnnotationMapping, ast: YMapEntry, extensionId: String)(implicit

diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/validate/ValidationDialectText.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/validate/ValidationDialectText.scala
diff --git a/...rc/test/resources/vocabularies2/dialects/additional-properties/dialect.cycled.jsonld.yaml b/...rc/test/resources/vocabularies2/dialects/additional-properties/dialect.cycled.jsonld.yaml
@@ -3,7 +3,7 @@ dialect: Mapping Additional properties
 version: "1.0"
 documents:
   root:
-    encodes: "#/declarations/Person"
+    encodes: Person
 nodeMappings:
   Person:
     mapping: