diff --git a/amf-apicontract.versions b/amf-apicontract.versions index c79afa6e6f..665b8160d2 100644 --- a/amf-apicontract.versions +++ b/amf-apicontract.versions @@ -1,4 +1,4 @@ -amf.apicontract=5.4.9-RC.0 +amf.apicontract=5.4.9-RC.1 amf.aml=6.4.9-RC.0 amf.model=3.8.2 antlr4Version=0.7.25 diff --git a/build.sbt b/build.sbt index 3fe18b171d..3f8a8a8ea7 100644 --- a/build.sbt +++ b/build.sbt @@ -71,9 +71,11 @@ lazy val shapes = crossProject(JSPlatform, JVMPlatform) .settings(commonSettings) .jvmSettings( libraryDependencies += "org.scala-js" %% "scalajs-stubs" % "1.1.0" % "provided", - libraryDependencies += "com.github.everit-org.json-schema" % "org.everit.json.schema" % "1.12.2", - libraryDependencies += "org.json" % "json" % "20231013", - excludeDependencies += "com.fasterxml.jackson.core" % "jackson-databind", // transitive from everit + libraryDependencies += "com.github.everit-org.json-schema" % "org.everit.json.schema" % "1.12.2" excludeAll ( + ExclusionRule(organization = "org.json", name = "json") + ), + excludeDependencies += "com.fasterxml.jackson.core" % "jackson-databind", // transitive from everit + libraryDependencies += "org.json" % "json" % "20231013", Compile / packageDoc / artifactPath := baseDirectory.value / "target" / "artifact" / "amf-shapes-javadoc.jar" ) .jsSettings(