Merge pull request #1088 from aml-org/r/v6.3.4

R/v6.3.4

Dockerfile

@@ -57,6 +57,12 @@ ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 ENV JAVA_TOOL_OPTIONS -Dfile.encoding=UTF8
 
+COPY certs/ /usr/local/share/ca-certificates/
+#Import certs to java keystore for sonar cli
+RUN keytool -import -trustcacerts -alias salesforce_internal_root_ca_1  -file /usr/local/share/ca-certificates/Salesforce_Internal_GIA_Root_CA_1.pem  -keystore $JAVA_HOME/lib/security/cacerts -storepass changeit -noprompt
+RUN keytool -import -trustcacerts -alias salesforce_internal_root_ca_4  -file /usr/local/share/ca-certificates/Salesforce_Internal_Root_CA_4.pem  -keystore $JAVA_HOME/lib/security/cacerts -storepass changeit -noprompt
+RUN keytool -import -trustcacerts -alias salesforce_internal_root_ca_3  -file /usr/local/share/ca-certificates/Salesforce_Internal_Root_CA_3.pem  -keystore $JAVA_HOME/lib/security/cacerts -storepass changeit -noprompt
+
 # Final user and home config
 RUN useradd --create-home --shell /bin/bash jenkins
 USER jenkins

Jenkinsfile

@@ -104,7 +104,7 @@ pipeline {
             }
             steps {
                 wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'XTerm']) {
-                    withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'sonarqube-official', passwordVariable: 'SONAR_SERVER_TOKEN', usernameVariable: 'SONAR_SERVER_URL']]) {
+                    withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'sf-sonarqube-official', passwordVariable: 'SONAR_SERVER_TOKEN', usernameVariable: 'SONAR_SERVER_URL']]) {
                         script {
                             try {
                                 if (failedStage.isEmpty()) {

als-common/shared/src/main/scala/org/mulesoft/amfintegration/Specs.scala

@@ -7,6 +7,7 @@ case object Specs {
     Spec.RAML08,
     Spec.RAML10,
     Spec.OAS30,
+    Spec.OAS31,
     Spec.OAS20,
     Spec.ASYNC20,
     Spec.AML,

als-common/shared/src/main/scala/org/mulesoft/amfintegration/amfconfiguration/ProfileMatcher.scala

@@ -27,10 +27,12 @@ object ProfileMatcher {
 
   def profile(spec: Spec): ProfileName =
     spec match {
-      case Spec.RAML10      => ProfileNames.RAML10
-      case Spec.RAML08      => ProfileNames.RAML08
-      case Spec.OAS20       => ProfileNames.OAS20
-      case Spec.OAS30       => ProfileNames.OAS30
+      case Spec.RAML10 => ProfileNames.RAML10
+      case Spec.RAML08 => ProfileNames.RAML08
+      case Spec.OAS20  => ProfileNames.OAS20
+      case Spec.OAS30  => ProfileNames.OAS30
+      // TODO Implement OAS31 dialect
+      case Spec.OAS31       => ProfileNames.OAS31
       case Spec.ASYNC20     => ProfileNames.ASYNC20
       case Spec.ASYNC21     => ProfileNames.ASYNC20
       case Spec.ASYNC22     => ProfileNames.ASYNC20

als-common/shared/src/main/scala/org/mulesoft/amfintegration/override/OverrideProfileNames.scala

@@ -11,6 +11,7 @@ object ProfileNames {
   val AMF: ProfileName                = AmfProfile
   val OAS20: ProfileName              = Oas20Profile
   val OAS30: ProfileName              = Oas30Profile
+  val OAS31: ProfileName              = Oas31Profile
   val RAML10: ProfileName             = Raml10Profile
   val RAML08: ProfileName             = Raml08Profile
   val ASYNC: ProfileName              = AsyncProfile
@@ -29,6 +30,7 @@ object ProfileNames {
       AmfProfile,
       Oas20Profile,
       Oas30Profile,
+      Oas31Profile,
       Raml08Profile,
       Raml10Profile,
       AsyncProfile,
@@ -65,6 +67,10 @@ object Oas30Profile extends ProfileName(Oas30.id, OASStyle) {
   override def isOas(): Boolean = true
 }
 
+object Oas31Profile extends ProfileName(Oas31.id, OASStyle) {
+  override def isOas(): Boolean = true
+}
+
 object Raml08Profile extends ProfileName(Raml08.id, RAMLStyle) {
   override def isRaml(): Boolean = true
 }
@@ -107,6 +113,7 @@ object ProfileName {
     name match {
       case AmfProfile.p               => Some(AmfProfile)
       case Oas30Profile.p             => Some(Oas30Profile)
+      case Oas31Profile.p             => Some(Oas31Profile)
       case Raml08Profile.p            => Some(Raml08Profile)
       case AsyncProfile.p             => Some(AsyncProfile)
       case Async20Profile.p           => Some(Async20Profile)
@@ -123,6 +130,7 @@ object ProfileName {
     case Amf.id               => AmfProfile
     case "OAS" | Oas20.id     => Oas20Profile  // for compatibility
     case Oas30.id             => Oas30Profile
+    case Oas31.id             => Oas31Profile
     case Raml08.id            => Raml08Profile
     case "RAML" | Raml10.id   => Raml10Profile // for compatibility
     case AsyncApi.id          => AsyncProfile
@@ -144,8 +152,8 @@ object ProfileName {
 
 object MessageStyle {
   def apply(name: String): MessageStyle = name match {
-    case Raml10.id | Raml08.id => RAMLStyle
-    case Oas20.id | Oas30.id   => OASStyle
+    case Raml10.id | Raml08.id          => RAMLStyle
+    case Oas20.id | Oas30.id | Oas31.id => OASStyle
     case AsyncApi.id | AsyncApi20.id | AsyncApi21.id | AsyncApi22.id | AsyncApi23.id | AsyncApi24.id | AsyncApi25.id |
         AsyncApi26.id =>
       OASStyle

build.sbt

@@ -418,7 +418,7 @@ lazy val branch = sys.env.getOrElse("BRANCH_NAME", "devel")
 
 sonarProperties ++= Map(
   "sonar.login"             -> token,
-  "sonar.projectKey"        -> "mulesoft.als",
+  "sonar.projectKey"        -> "mulesoft.als.gec",
   "sonar.projectName"       -> "ALS",
   "sonar.projectVersion"    -> "1.0.0",
   "sonar.sourceEncoding"    -> "UTF-8",

certs/Salesforce_Internal_GIA_Root_CA_1.pem

@@ -0,0 +1,34 @@
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+

certs/Salesforce_Internal_Root_CA_3.pem

@@ -0,0 +1,34 @@
+-----BEGIN CERTIFICATE-----
+MIIF0DCCA7igAwIBAgIIW6vDkGPKX68wDQYJKoZIhvcNAQENBQAwgYUxCzAJBgNV
+BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp
+c2NvMR0wGwYDVQQKDBRzYWxlc2ZvcmNlLmNvbSwgaW5jLjEqMCgGA1UEAwwhc2Fs
+ZXNmb3JjZS5jb20gSW50ZXJuYWwgUm9vdCBDQSAzMB4XDTE4MDkyNjE3MzYxNloX
+DTI4MDkyMzE3MzYxNlowgYUxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9y
+bmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMR0wGwYDVQQKDBRzYWxlc2ZvcmNl
+LmNvbSwgaW5jLjEqMCgGA1UEAwwhc2FsZXNmb3JjZS5jb20gSW50ZXJuYWwgUm9v
+dCBDQSAzMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAgtwwTEHIl/Ok
+v9hVHlJCGqxIxrzc6IokzThQSqo/ec21Q7C+dCnvX7d/iyQgviP5S256Jwx06WFT
+4IZH9CYyiLpE+/3NHc7ni//bQGCpt0+o+PHPyXwtEpnp+NZZnR1iHlVRoNYrJqoq
+r8ZPgbdC8m4e4xnrhleyAk3aTgzg88tcVKEmFi38rd3/5vMiZL6O/98HENwfrgIg
+pAwdEhdjxuzEMITPUrk0Lo/3SeCK249dv6EWM7RQfdnzy2zlMcROONXn1NMZ35hK
+SJ9DXc2M+hF5wNypGF3dyghQTdq/nxJkxFZIUkUcd0NzMpqjMoMrmsqv8qn4ZOWA
+EyfPckNHv27R+tSSo+ctTAulL1xrQn/M2CFlBfQmZkSFToEPoLOzABnBwkJpwFm9
+awPyaolf5l4Y/N9cZTcaG71SBf/yGcqzycgnujjBjJhRz0i2JE9s1a/NA0ALEe0m
+6JIfpu1eL0+qOMajeiHebs9hjCdFzWuX4LFO4k76U3d1WTtlnFtg/7FUFkHzMv46
+X6p9syjWfD7snU5hCD0N4037IeXzAV1zVnazbzzEP7dJDlJPivFw0DtCoQAsdK2V
+XWA3Q2daUYiS8zyFagzIbk7+TzqcGWGvZq4DfEmAISRrOQKbU27VybV8Qwf2xTLh
+CYHexYtC3XpO7lhdbjcBEQYNB47GtmcCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB
+/zAdBgNVHQ4EFgQUHdspGyq4y/PRIWJxYHVOMAoktwEwDgYDVR0PAQH/BAQDAgEG
+MA0GCSqGSIb3DQEBDQUAA4ICAQALlaByN29bU8w9ZbPsmQ8ow6ElybyU8sPNs1o7
+X2bxZRqHEWIbtirwYDFLaF93+qPdUrZ8F4Eckp6bHEmi7WF81xEHyL6rJ9SmTepm
+syEn2pbi/PV66JMlzReaAl2+n1Avy7G6Zvn7Mm7IgCQKqfwaiSYFmBK7vRskaK1N
++nZfs5z83K7FBur1SCkUcPaYz3UA/rtqBiG5g9q16jFp0LyWfbK5Vo1EwX0knb/3
+G7w0MDqrWehPIfrm2Jr+Sb4BOg7kItErVzu0D1EIiRJejvbYraeNKVQPXLHOqm5z
+9dGAmUk7434AXrJvD8edR8fBA12rzSm8X/Zj51qSYybvdRUXNUONxLW0v1flLoUh
+dUFXjcHVbcuDXWD1KYlf7u5AFUlN72jlk5RlJX5U71p+j/+1Wm/tHTG7sH7BmJlK
+VNuUSYMRZp5lq6KXG2Ifs9fulWLAIhhW8kgi0QGmMD0dsYZ1JG+bY2tj+Zr3YtvH
+GEBKux6nFFzq9IFsvwGrhI76Sx5hOiiRTXNxHxPB/oviZF4+GLS2IETjeQTQOU9D
+eDocv81UUn0C9ZEnHXYHr9UcGWDY0Iv4PJDRxm9h1DjK8kH9r7BFx40ZV1m/cy0P
+8hyDMT3LeuaTmBPf4uEqsXsk3c9Kjxn8KfrrTyzt+wYr2fVf613P+9SgVqglvN+G
+U7OoSA==
+-----END CERTIFICATE-----

certs/Salesforce_Internal_Root_CA_4.pem

@@ -0,0 +1,34 @@
+-----BEGIN CERTIFICATE-----
+MIIF0DCCA7igAwIBAgIIYBMskD1jKDAwDQYJKoZIhvcNAQENBQAwgYUxCzAJBgNV
+BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp
+c2NvMR0wGwYDVQQKDBRzYWxlc2ZvcmNlLmNvbSwgaW5jLjEqMCgGA1UEAwwhc2Fs
+ZXNmb3JjZS5jb20gSW50ZXJuYWwgUm9vdCBDQSA0MB4XDTIxMDEyODIxMjg0OFoX
+DTMxMDEyNjIxMjg0OFowgYUxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9y
+bmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMR0wGwYDVQQKDBRzYWxlc2ZvcmNl
+LmNvbSwgaW5jLjEqMCgGA1UEAwwhc2FsZXNmb3JjZS5jb20gSW50ZXJuYWwgUm9v
+dCBDQSA0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAx4fMsdFYDE9e
+etb2Zqlc93+Ggs0mH872Qu1b3I/a9b2bSN66T9sv4eaBqe4jjPkBKoxxacZEANkA
+1USa2CeTUPWeEBBQmO4pQBJSzzmJ5tjIvbVIMg07WBKMMNW5+QFGTQzGXhh51uid
+bNH0O7mkH39v5qC5U7cn9xT4UK5WsY9CqOXs2lxGPiTXrebFFzgJ7s6vPwn5CU48
+NZMKXb3oxI/KcCxUJ/oGhtrfAJawde0TCSRIq+V8iDdkHfJwy9DCPamdB/mqYTDZ
+SDY1rA9knwSPzEiBU5j4mRBCpp179cFrOfULd13rg5aQjzgeZmSOqKpgspMYbJzo
++CfnqJZLsKAvua5FI7f8MvVCh2co12716TtUR0aTo3dD86oL3HbE/3UIzlQiORdS
+ILhR7qdw6rJcnDRgFV/hNicDiAAwYjW4qLm2BitHs5XlYofF3jTpwaV70t8vv5WF
+Auk769E8LYQla3tTLKirnthmiBHua2lPYQbBfNBhr6EhdOVrr/3Qi5eJANjfmaeK
+9k8KvIcwX40o3yTyU7iqsBnwbM2D4+tKADEOOqMbtk5w0NdcNRyURwo4fyD6vAg/
+QYHOk12xqpTq0G4PMiky5XPb5USkwDWoqOYsKR4wCuouJCwJObIBtqD3vNRHQI5N
+YPMpMrI4xdwJwFvhd9j0p+xVXM5koL8CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB
+/zAdBgNVHQ4EFgQUatXozwmOt3FWTAjY3HYxjXcqbSYwDgYDVR0PAQH/BAQDAgEG
+MA0GCSqGSIb3DQEBDQUAA4ICAQChmrpL+MF3H939O9aY3yx0UNhAXXgtgudrhvLy
+d78cb1bkuBPD3IeW0rwTkQW/l2Df3OUEDl0jGmCKZQChhPBbSHl4dxkr+A+YhwJ8
+/xoqLbXF9zIkSslgphM6p3Ydn6mYwqCYg+9i4M3gfkIBBPXmK9S292dkjWKxTAN5
+SnzU2gHZNv1JyqVr9FkGARlfF7POymWog5eNGaMrE0hXiHKlIf223C6JVYLg8tGz
+Cq8ShIIgM55upxLxqDt81s803a45ZsT4isssIQB7LIum86+DXrpiL4EcP6NgAL3R
+mOQv8Esj/NThAQVEI57Aw68DFo7858ZFy50KoaJl5kOSfP8IInhp273CFWcAdiv6
+qJLzPmAyNCQP2DhseNIqvO7a+X9CMMU7WP8JF+FwI4vlJJ60H6nlxpWNYgbAZJzS
+osUsa4j8QEMy5ZTKsWIzh/QcIvGae37/k0WH3bNSc9VftWtTaWS27H5Tcv6cuUDA
+j+vB8L033j2NxPJCeBTfnTvA3p764k/VJc8SuW5+xrjB6TaKnv2nR+PC2pz+zvjR
+2FU+ZX/lxdlkwTqT+OGpGi9ok8VHqYAQce3qg05f+7wA3JyyPJGIXtOnjG7vHPMg
+G8PxBwbuKz1N4Bg9iuylY5KUFxqRJaCg2qGBMKFgleR+56+Gxm0j0jfS03vZOPGh
+gzTB7Q==
+-----END CERTIFICATE-----

dependencies.properties

@@ -1,5 +1,5 @@
-version=6.3.3
-amf=5.6.3
+version=6.3.4
+amf=5.6.4
 amf.custom-validator.js=1.7.2
-amf.custom-validator-scalajs=0.6.1
+amf.custom-validator-scalajs=0.6.2
 amf-antlr-parsers=0.7.27