This is an automated email from the ASF dual-hosted git repository. rzo1 pushed a commit to branch tomee-10.x in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 9cc64d96a4d495d7c3e32ea9a812b9b48b27bfcb Author: Mark Struberg <[email protected]> AuthorDate: Mon Jul 6 00:24:40 2026 +0200 fix broken dependency setup for joda Caused by bloody dependabot which messes up our build each time :( (cherry picked from commit a92a8a283bd7ce8f9ecb28008afb03f521c5db89) --- .../arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml | 2 +- .../apache/openejb/arquillian/tests/jaxws/EarClassLoaderTest.java | 4 ++-- .../arquillian/tests/jaxws/EarWebAppFirstClassLoaderTest.java | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml index 2b9ebc94e8..b5381ce784 100644 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml @@ -38,8 +38,8 @@ <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> <version>2.14.2</version> - <scope>provided</scope> </dependency> + </dependencies> <properties> diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/EarClassLoaderTest.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/EarClassLoaderTest.java index 8aa61fd20d..51b532315c 100644 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/EarClassLoaderTest.java +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/EarClassLoaderTest.java @@ -48,7 +48,7 @@ public class EarClassLoaderTest { Maven.configureResolver() .workOffline() .withClassPathResolution(true) - .resolve("joda-time:joda-time:2.13.0") + .resolve("joda-time:joda-time:2.14.2") .using(new AcceptScopesStrategy(ScopeType.COMPILE, ScopeType.RUNTIME)) .asFile() ) @@ -63,6 +63,6 @@ public class EarClassLoaderTest { // embedded case uses the classpath for a lot of reasons assumeFalse(System.getProperty("openejb.arquillian.adapter", "embedded").contains("embedded")); final String slurp = IO.slurp(new URL(url.toExternalForm() + (url.getPath().isEmpty() ? "/broken-web/" : "") + "joda")); - assertTrue(slurp.endsWith("broken-web/WEB-INF/lib/joda-time-2.13.0.jar")); + assertTrue(slurp.endsWith("broken-web/WEB-INF/lib/joda-time-2.14.2.jar")); } } diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/EarWebAppFirstClassLoaderTest.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/EarWebAppFirstClassLoaderTest.java index 6f006cac2f..f1c2e4c5a3 100644 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/EarWebAppFirstClassLoaderTest.java +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/EarWebAppFirstClassLoaderTest.java @@ -48,7 +48,7 @@ public class EarWebAppFirstClassLoaderTest { final File[] joda = Maven.configureResolver() .workOffline() .withClassPathResolution(true) - .resolve("joda-time:joda-time:2.13.0") + .resolve("joda-time:joda-time:2.14.2") .using(new AcceptScopesStrategy(ScopeType.COMPILE, ScopeType.RUNTIME)) .asFile(); return ShrinkWrap.create(EnterpriseArchive.class, "broken.ear") @@ -70,7 +70,7 @@ public class EarWebAppFirstClassLoaderTest { public void checkIfWasCorretlyLoaded() throws IOException { assumeFalse(System.getProperty("openejb.arquillian.adapter", "embedded").contains("embedded")); final String slurp = IO.slurp(new URL(url.toExternalForm() + (url.getPath().isEmpty() ? "/broken-web/" : "") + "joda")); - assertTrue(slurp.endsWith("broken-web/WEB-INF/lib/joda-time-2.13.0.jar")); - assertFalse(slurp.endsWith("broken/lib/joda-time-2.13.0.jar")); // useless cause of the previous but to make it obvious + assertTrue(slurp.endsWith("broken-web/WEB-INF/lib/joda-time-2.14.2.jar")); + assertFalse(slurp.endsWith("broken/lib/joda-time-2.14.2.jar")); // useless cause of the previous but to make it obvious } }
