Merge branch 'master' into dev

bonitasoft · Feb 7, 2024 · 00fad9a · 00fad9a
2 parents a8f6ed7 + 5d8600b
commit 00fad9a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/bonita-engine/build.gradle b/bonita-engine/build.gradle
@@ -97,7 +97,10 @@ dependencyManagement {
         dependency("org.restlet.jee:org.restlet.ext.servlet:${Deps.restletVersion}") {
             exclude "org.restlet.jee:org.restlet"
         }
-        dependency "org.restlet.jse:org.restlet.ext.jackson:${Deps.restletVersion}"
+        dependency("org.restlet.jse:org.restlet.ext.jackson:${Deps.restletVersion}") {
+            exclude "org.codehaus.woodstox:woodstox-core-asl"
+            exclude "org.codehaus.woodstox:stax2-api"
+        }
         // Specify woodstox version to override the version pulled by jackson-dataformat-xml (transitive dep of restlet)
         dependency "com.fasterxml.woodstox:woodstox-core:${Deps.woodstoxCoreVersion}"
         dependency "com.googlecode.json-simple:json-simple:${Deps.jsonSimpleVersion}"

diff --git a/bonita-integration-tests/bonita-integration-tests-web/build.gradle b/bonita-integration-tests/bonita-integration-tests-web/build.gradle
@@ -19,12 +19,6 @@ dependencies {
     testImplementation "org.restlet.jse:org.restlet:${Deps.restletVersion}"
 }
 
-configurations {
-    configureEach {
-        resolutionStrategy.force "org.codehaus.woodstox:stax2-api:${Deps.woodstoxStax2ApiVersion}"
-    }
-}
-
 java {
     withSourcesJar()
 }

diff --git a/bpm/bonita-web-server/build.gradle b/bpm/bonita-web-server/build.gradle
@@ -25,7 +25,11 @@ dependencies {
     implementation("org.restlet.jee:org.restlet.ext.servlet:${Deps.restletVersion}") {
         exclude(group: "org.restlet.jee", module: "org.restlet")
     }
-    implementation "org.restlet.jse:org.restlet.ext.jackson:${Deps.restletVersion}"
+    implementation("org.restlet.jse:org.restlet.ext.jackson:${Deps.restletVersion}") {
+        exclude(group: "org.codehaus.woodstox", module: "woodstox-core-asl")
+        exclude(group: "org.codehaus.woodstox", module: "stax2-api")
+    }
+    implementation "com.fasterxml.woodstox:woodstox-core:${Deps.woodstoxCoreVersion}"
     implementation "org.codehaus.groovy:groovy:${Deps.groovyVersion}"
     implementation "org.apache.xbean:xbean-classloader:${Deps.xbeanClassloaderVersion}"
     implementation "org.springframework:spring-core:${Deps.springVersion}"

diff --git a/buildSrc/src/main/groovy/Deps.groovy b/buildSrc/src/main/groovy/Deps.groovy
@@ -68,7 +68,6 @@ class Deps {
     public static String jgettextVersion = "0.13"
     public static String hamcrestVersion = "2.1"
     public static String woodstoxCoreVersion = "6.4.0"
-    public static String woodstoxStax2ApiVersion = "3.1.4"
     public static String keycloakVersion = "21.1.2"
     public static String xmlsecVersion = "2.2.6"
     public static String bouncyCastleVersion = "1.77"