This is an automated email from the ASF dual-hosted git repository. dblevins pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 9151672cac422bbc718c51315aede4a3b43b8968 Author: David Blevins <[email protected]> AuthorDate: Sat Jan 25 22:06:09 2020 -0800 TOMEE-2765 ShrinkWrap Maven Resolver 3.1.4 Upgrade ShrinkWrap Resolver to leverage https://repo1.maven.org/maven2 url --- arquillian/arquillian-openejb-embedded/pom.xml | 2 +- .../openejb/arquillian/openejb/SWMavenWarTest.java | 6 +----- .../arquillian/tests/jaxws/EarClassLoaderTest.java | 6 +++--- .../tests/jaxws/EarWebAppFirstClassLoaderTest.java | 8 ++++---- .../arquillian/tests/hibernate/HibernateTest.java | 20 ++++++++++++++------ arquillian/arquillian-tomee-tests/pom.xml | 2 +- arquillian/ziplock/pom.xml | 2 +- .../java/org/superbiz/enricher/maven/Enrichers.java | 4 ++-- pom.xml | 2 +- 9 files changed, 28 insertions(+), 24 deletions(-) diff --git a/arquillian/arquillian-openejb-embedded/pom.xml b/arquillian/arquillian-openejb-embedded/pom.xml index 378cb90..433b224 100644 --- a/arquillian/arquillian-openejb-embedded/pom.xml +++ b/arquillian/arquillian-openejb-embedded/pom.xml @@ -114,7 +114,7 @@ <dependency> <groupId>org.jboss.shrinkwrap.resolver</groupId> <artifactId>shrinkwrap-resolver-impl-maven</artifactId> - <version>2.0.0</version> + <version>${version.shrinkwrap.resolver.bom}</version> <scope>test</scope> </dependency> diff --git a/arquillian/arquillian-openejb-embedded/src/test/java/org/apache/openejb/arquillian/openejb/SWMavenWarTest.java b/arquillian/arquillian-openejb-embedded/src/test/java/org/apache/openejb/arquillian/openejb/SWMavenWarTest.java index ff9d6fa..2bdd28b 100644 --- a/arquillian/arquillian-openejb-embedded/src/test/java/org/apache/openejb/arquillian/openejb/SWMavenWarTest.java +++ b/arquillian/arquillian-openejb-embedded/src/test/java/org/apache/openejb/arquillian/openejb/SWMavenWarTest.java @@ -22,7 +22,6 @@ import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.resolver.api.maven.Maven; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -34,9 +33,6 @@ import javax.ejb.TransactionManagementType; import static org.hamcrest.CoreMatchers.instanceOf; import static org.junit.Assert.assertThat; -@Ignore("org.jboss.shrinkwrap.resolver.impl.maven.MavenWorkingSessionImpl " + - "has a hardcoded reference to 'http://repo1.maven.org/maven2', " + - "which is now unsupportd by Maven Central.") @RunWith(Arquillian.class) public class SWMavenWarTest { @Deployment @@ -45,7 +41,7 @@ public class SWMavenWarTest { .addClass(SWBean.class) .addAsLibraries(Maven.resolver() .loadPomFromFile("src/test/resources/a-pom.xml") - .importRuntimeAndTestDependencies().resolve().withTransitivity().asFile()); + .importCompileAndRuntimeDependencies().resolve().withTransitivity().asFile()); } @Singleton 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 4b75d78..6266113 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 @@ -45,10 +45,10 @@ public class EarClassLoaderTest { ShrinkWrap.create(WebArchive.class, "broken-web.war") .addClasses(LoadJodaFromTheWebAppResource.class) .addAsLibraries( - Maven.resolver() - .offline() - .resolve("joda-time:joda-time:2.5") + Maven.configureResolver() + .workOffline() .withClassPathResolution(true) + .resolve("joda-time:joda-time:2.5") .using(new AcceptScopesStrategy(ScopeType.COMPILE, ScopeType.RUNTIME)) .asFile() ) 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 3ebfb91..12fd1a4 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 @@ -45,10 +45,10 @@ import static org.junit.Assume.assumeFalse; public class EarWebAppFirstClassLoaderTest { @Deployment(testable = false) public static Archive<?> ear() { - final File[] joda = Maven.resolver() - .offline() - .resolve("joda-time:joda-time:2.5") + final File[] joda = Maven.configureResolver() + .workOffline() .withClassPathResolution(true) + .resolve("joda-time:joda-time:2.5") .using(new AcceptScopesStrategy(ScopeType.COMPILE, ScopeType.RUNTIME)) .asFile(); return ShrinkWrap.create(EnterpriseArchive.class, "broken.ear") @@ -59,7 +59,7 @@ public class EarWebAppFirstClassLoaderTest { "<Context>" + "<Loader className=\"" + TomEEWebappLoader.class.getName() + "\" loaderClass=\"" + WebAppFirstEarClassLoader.class.getName() + "\" />" + - "</Context>"), "context.xml") + "</Context>"), "context.xml") .addAsLibraries(joda)); } diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/hibernate/HibernateTest.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/hibernate/HibernateTest.java index 8c5094d..10416f7 100644 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/hibernate/HibernateTest.java +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/hibernate/HibernateTest.java @@ -30,8 +30,7 @@ import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.resolver.api.ResolutionException; import org.jboss.shrinkwrap.resolver.api.maven.Maven; -import org.jboss.shrinkwrap.resolver.api.maven.ScopeType; -import org.jboss.shrinkwrap.resolver.api.maven.strategy.AcceptScopesStrategy; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -41,21 +40,30 @@ import java.io.File; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +@Ignore @RunWith(Arquillian.class) public class HibernateTest { + + public static void main(String[] args) { + final File[] files = Maven.resolver() + .loadPomFromFile("src/test/resources/hibernate-pom.xml") + .importCompileAndRuntimeDependencies().resolve().withTransitivity() + .asFile(); + } + @Deployment public static WebArchive war() { File[] hibernate; try { // try offline first since it is generally faster - hibernate = Maven.resolver() - .offline(true) + hibernate = Maven.configureResolver() + .workOffline() .loadPomFromFile("src/test/resources/hibernate-pom.xml") - .importRuntimeAndTestDependencies().resolve().withTransitivity() + .importCompileAndRuntimeDependencies().resolve().withTransitivity() .asFile(); } catch (ResolutionException re) { // try on central hibernate = Maven.resolver() .loadPomFromFile("src/test/resources/hibernate-pom.xml") - .importRuntimeAndTestDependencies().resolve().withTransitivity() + .importCompileAndRuntimeDependencies().resolve().withTransitivity() .asFile(); } diff --git a/arquillian/arquillian-tomee-tests/pom.xml b/arquillian/arquillian-tomee-tests/pom.xml index 7d765c9..b7831f8 100644 --- a/arquillian/arquillian-tomee-tests/pom.xml +++ b/arquillian/arquillian-tomee-tests/pom.xml @@ -42,7 +42,7 @@ <dependency> <groupId>org.jboss.shrinkwrap.resolver</groupId> <artifactId>shrinkwrap-resolver-impl-maven</artifactId> - <version>2.0.0</version> + <version>${version.shrinkwrap.resolver.bom}</version> <scope>test</scope> <exclusions> <exclusion> diff --git a/arquillian/ziplock/pom.xml b/arquillian/ziplock/pom.xml index 7f4b9be..162ced6 100644 --- a/arquillian/ziplock/pom.xml +++ b/arquillian/ziplock/pom.xml @@ -41,7 +41,7 @@ <dependency> <groupId>org.jboss.shrinkwrap.resolver</groupId> <artifactId>shrinkwrap-resolver-impl-maven</artifactId> - <version>2.1.0</version> + <version>${version.shrinkwrap.resolver.bom}</version> <scope>provided</scope> </dependency> diff --git a/examples/multi-jpa-provider-testing/src/test/java/org/superbiz/enricher/maven/Enrichers.java b/examples/multi-jpa-provider-testing/src/test/java/org/superbiz/enricher/maven/Enrichers.java index ab7f85b..0a2c401 100644 --- a/examples/multi-jpa-provider-testing/src/test/java/org/superbiz/enricher/maven/Enrichers.java +++ b/examples/multi-jpa-provider-testing/src/test/java/org/superbiz/enricher/maven/Enrichers.java @@ -40,12 +40,12 @@ public final class Enrichers { CACHE.put(pom, Maven.resolver() .offline(true) .loadPomFromFile(pom) - .importRuntimeAndTestDependencies().resolve().withTransitivity() + .importCompileAndRuntimeDependencies().resolve().withTransitivity() .asFile()); } catch (ResolutionException re) { // try on central CACHE.put(pom, Maven.resolver() .loadPomFromFile(pom) - .importRuntimeAndTestDependencies().resolve().withTransitivity() + .importCompileAndRuntimeDependencies().resolve().withTransitivity() .asFile()); } } diff --git a/pom.xml b/pom.xml index 040b6e6..aa36aef 100644 --- a/pom.xml +++ b/pom.xml @@ -208,7 +208,7 @@ <!-- arquillian related --> <version.arquillian.bom>1.1.13.Final</version.arquillian.bom> - <version.shrinkwrap.resolver.bom>2.1.0</version.shrinkwrap.resolver.bom> + <version.shrinkwrap.resolver.bom>3.1.4</version.shrinkwrap.resolver.bom> <!-- Micro Profile --> <microprofile.version>2.0</microprofile.version>
