From 8589e51a923c0de0723a1d0f7c0dafb1edff4921 Mon Sep 17 00:00:00 2001 From: Richard Zowalla <13417392+rzo1@users.noreply.github.com> Date: Fri, 2 Feb 2024 20:50:42 +0100 Subject: [PATCH] Fix toggling tests due to dependency changes a few months ago. Resolver repo isn't accessible anymore, so lib cannot be found: Could not find artifact joda-time:joda-time:jar:2.5, try downloading from http://oss.sonatype.org/content/repositories/joda-releases (cherry picked from commit 1ea09796e53e85fbda041ab042faa7542c838953) --- .../openejb/arquillian/tests/jaxws/EarClassLoaderTest.java | 4 ++-- .../tests/jaxws/EarWebAppFirstClassLoaderTest.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) 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 62661137d4a..30f5ac1b662 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 static Archive ear() { Maven.configureResolver() .workOffline() .withClassPathResolution(true) - .resolve("joda-time:joda-time:2.5") + .resolve("joda-time:joda-time:2.10.10") .using(new AcceptScopesStrategy(ScopeType.COMPILE, ScopeType.RUNTIME)) .asFile() ) @@ -63,6 +63,6 @@ public void checkIfWasCorretlyLoaded() throws IOException { // 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.5.jar")); + assertTrue(slurp.endsWith("broken-web/WEB-INF/lib/joda-time-2.10.10.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 12fd1a4c375..c7fcb6ed70b 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 static Archive ear() { final File[] joda = Maven.configureResolver() .workOffline() .withClassPathResolution(true) - .resolve("joda-time:joda-time:2.5") + .resolve("joda-time:joda-time:2.10.10") .using(new AcceptScopesStrategy(ScopeType.COMPILE, ScopeType.RUNTIME)) .asFile(); return ShrinkWrap.create(EnterpriseArchive.class, "broken.ear") @@ -70,7 +70,7 @@ public static Archive ear() { 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.5.jar")); - assertFalse(slurp.endsWith("broken/lib/joda-time-2.5.jar")); // useless cause of the previous but to make it obvious + assertTrue(slurp.endsWith("broken-web/WEB-INF/lib/joda-time-2.10.10.jar")); + assertFalse(slurp.endsWith("broken/lib/joda-time-2.10.10.jar")); // useless cause of the previous but to make it obvious } }