publish 5.0.3-RC.1

Jenkinsfile

@@ -64,6 +64,7 @@ pipeline {
         anyOf {
           branch 'master'
           branch 'develop'
+          branch 'release/*'
         }
       }
       steps {

amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/common/WebApiDeclarations.scala

@@ -638,6 +638,7 @@ object OasWebApiDeclarations {
     declarations.traits = d.traits
     declarations.securitySchemes = d.securitySchemes
     declarations.responses = d.responses
+    declarations.annotations = d.annotations // FOR OAS -> RAML CONVERSION
     declarations // add withs methods?
   }
 }

amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/emitter/context/OasSpecEmitterContext.scala

@@ -21,7 +21,12 @@ import amf.core.internal.plugins.render.RenderConfiguration
 import amf.core.internal.remote.{Oas20, Oas30, Spec}
 import amf.core.internal.render.SpecOrdering
 import amf.core.internal.render.emitters._
-import amf.shapes.internal.spec.common.emitter.annotations.{FacetsInstanceEmitter, OasFacetsInstanceEmitter}
+import amf.shapes.internal.spec.common.emitter.annotations.{
+  AnnotationEmitter,
+  FacetsInstanceEmitter,
+  OasAnnotationEmitter,
+  OasFacetsInstanceEmitter
+}
 import amf.shapes.internal.spec.common.emitter._
 import amf.shapes.internal.spec.common.{OAS20SchemaVersion, OAS30SchemaVersion, SchemaPosition, SchemaVersion}
 import amf.shapes.internal.spec.contexts.emitter.oas.{CompactableEmissionContext, OasCompactEmitterFactory}

amf-apicontract.versions

@@ -1,3 +1,3 @@
-amf.apicontract=5.1.0-SNAPSHOT
-amf.aml=6.1.0-SNAPSHOT
+amf.apicontract=5.0.3-RC.1
+amf.aml=6.0.3-RC.0
 amf.model=3.2.0

amf-cli/shared/src/test/resources/compatibility/oas20/tags-nested-annotations.json

@@ -0,0 +1,18 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "BulkSMS JSON",
+    "version": "1.0.0"
+  },
+  "tags": [
+    {
+      "name": "Message",
+      "x-displayName": "Messages"
+    },
+    {
+      "name": "Profile",
+      "x-displayName": "Profile"
+    }
+  ],
+  "paths": {}
+}

amf-cli/shared/src/test/resources/validations/raml/merge-resourceType.raml

@@ -0,0 +1,27 @@
+#%RAML 1.0
+title: EWB Api
+version: v1
+
+types:
+  Customer:
+    type: object
+    properties:
+      firstName: string
+    example:
+      firstName: asdf
+
+resourceTypes:
+  collection:
+    post?:
+      body:
+        application/json:
+          type: <<item>>
+
+/customers:
+  type:
+    collection:
+      item: Customer
+  post:
+    body:
+      application/json:
+        type:

amf-cli/shared/src/test/scala/amf/validation/AMFModelAssertionTest.scala

@@ -25,11 +25,11 @@ class AMFModelAssertionTest extends AsyncFunSuite with Matchers {
   val oasConfig: AMFConfiguration     = OASConfiguration.OAS30().withRenderOptions(ro)
   val oasClient: AMFBaseUnitClient    = oasConfig.baseUnitClient()
 
-  def modelAssertion(path: String, pipelineId: String = PipelineId.Default, parseOnly: Boolean = false)(
+  def modelAssertion(path: String, pipelineId: String = PipelineId.Default, transform: Boolean = true)(
       assertion: BaseUnit => Assertion): Future[Assertion] = {
     val parser = APIConfiguration.API().baseUnitClient()
     parser.parse(path) flatMap { parseResult =>
-      if (parseOnly) assertion(parseResult.baseUnit)
+      if (!transform) assertion(parseResult.baseUnit)
       else {
         val specificClient  = configFor(parseResult.sourceSpec).baseUnitClient()
         val transformResult = specificClient.transform(parseResult.baseUnit, pipelineId)
@@ -144,7 +144,7 @@ class AMFModelAssertionTest extends AsyncFunSuite with Matchers {
   // github issue #1121
   test("Declared Raml type with Json Schema should inherit type from it") {
     val ramlApi = s"$basePath/raml/json-schema-scalar-type/json-schema-with-scalar-type.raml"
-    modelAssertion(ramlApi, parseOnly = true) { bu =>
+    modelAssertion(ramlApi, transform = false) { bu =>
       val jsonSchemaType = "http://www.w3.org/2001/XMLSchema#string"
       val declaredTypeWithJsonSchemaNode =
         bu.asInstanceOf[Document].declares.head.asInstanceOf[ScalarShape]
@@ -154,7 +154,7 @@ class AMFModelAssertionTest extends AsyncFunSuite with Matchers {
 
   test("Declared Raml type with Json Schema in external file should inherit type from it") {
     val ramlApi = s"$basePath/raml/json-schema-scalar-type/json-schema-with-scalar-type-in-external-file.raml"
-    modelAssertion(ramlApi, parseOnly = true) { bu =>
+    modelAssertion(ramlApi, transform = false) { bu =>
       val jsonSchemaType = "http://www.w3.org/2001/XMLSchema#string"
       val declaredTypeWithJsonSchemaNode =
         bu.asInstanceOf[Document].declares.head.asInstanceOf[ScalarShape]
@@ -196,4 +196,13 @@ class AMFModelAssertionTest extends AsyncFunSuite with Matchers {
       }
     }
   }
+
+  test("different datatypes should not fall under simple inheritance") {
+    val api = s"$basePath/raml/merge-resourceType.raml"
+    ramlClient.parse(api) flatMap { parseResult =>
+      val transformResult = ramlClient.transform(parseResult.baseUnit, PipelineId.Editing)
+      // parsing or resolution results are not relevant
+      ramlClient.validate(transformResult.baseUnit) map (report => report.results.size shouldBe 0)
+    }
+  }
 }

amf-shapes/shared/src/main/scala/amf/shapes/internal/domain/resolution/shape_normalization/ShapeCanonizer.scala

@@ -243,8 +243,7 @@ sealed case class ShapeCanonizer()(implicit val context: NormalizationContext) e
             ShapeModel.Description,
             AnyShapeModel.Examples,
             AnyShapeModel.Documentation,
-            AnyShapeModel.Comment,
-            ScalarShapeModel.DataType
+            AnyShapeModel.Comment
           )
         fieldsPresentInSuperType(shape, superType, ignoredFields)
       case _ => false