Pull versions up to parent activemq 5.15.0 commons-logging 1.2 Remove BeanValidationAppendixInterceptor ref Prefer maven settings.xml values #TOMEE-2121 - properties
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/57b6dd80 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/57b6dd80 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/57b6dd80 Branch: refs/heads/fb_tomee8 Commit: 57b6dd805065451115ace93d0cd7d667deaf4572 Parents: 050f087 Author: andygumbrecht <andy...@gmx.de> Authored: Wed Sep 13 20:31:12 2017 +0200 Committer: andygumbrecht <andy...@gmx.de> Committed: Wed Sep 13 20:31:12 2017 +0200 ---------------------------------------------------------------------- .../openejb/loader/provisining/MavenResolver.java | 8 ++++---- .../openejb/loader/provisining/MavenResolverTest.java | 12 ++++++++++-- 2 files changed, 14 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/57b6dd80/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/MavenResolver.java ---------------------------------------------------------------------- diff --git a/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/MavenResolver.java b/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/MavenResolver.java index d5d1a9f..b335614 100644 --- a/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/MavenResolver.java +++ b/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/MavenResolver.java @@ -40,8 +40,8 @@ import java.util.Properties; import java.util.concurrent.atomic.AtomicReference; public class MavenResolver implements ArchiveResolver, ProvisioningResolverAware { - private static final String REPO1 = System.getProperty("openejb.deployer.repository", "http://repo1.maven.org/maven2/"); - private static final String APACHE_SNAPSHOT = System.getProperty("openejb.deployer.repository.snapshots", "https://repository.apache.org/snapshots/"); + private static final String REPO1 = "http://repo1.maven.org/maven2/"; + private static final String APACHE_SNAPSHOT = "https://repository.apache.org/snapshots/"; private static final String SNAPSHOT_SUFFIX = "-SNAPSHOT"; private static final AtomicReference<DocumentBuilder> BUILDER = new AtomicReference<>(null); @@ -96,9 +96,9 @@ public class MavenResolver implements ArchiveResolver, ProvisioningResolverAware public String quickMvnUrl(final String raw) throws MalformedURLException { final String base; if (raw.contains(SNAPSHOT_SUFFIX) && raw.contains("apache")) { - base = APACHE_SNAPSHOT; + base = System.getProperty("openejb.deployer.snapshot.repository", APACHE_SNAPSHOT); } else { - base = REPO1; + base = System.getProperty("openejb.deployer.repository", REPO1); } final StringBuilder builder = new StringBuilder(); http://git-wip-us.apache.org/repos/asf/tomee/blob/57b6dd80/container/openejb-loader/src/test/java/org/apache/openejb/loader/provisining/MavenResolverTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-loader/src/test/java/org/apache/openejb/loader/provisining/MavenResolverTest.java b/container/openejb-loader/src/test/java/org/apache/openejb/loader/provisining/MavenResolverTest.java index 4d96b72..ce1b95e 100644 --- a/container/openejb-loader/src/test/java/org/apache/openejb/loader/provisining/MavenResolverTest.java +++ b/container/openejb-loader/src/test/java/org/apache/openejb/loader/provisining/MavenResolverTest.java @@ -42,7 +42,7 @@ public class MavenResolverTest { @Test public void local() throws Exception { - try(InputStream is = resolver.resolve("mvn:junit:junit:4.12:jar")) { + try (InputStream is = resolver.resolve("mvn:junit:junit:4.12:jar")) { Assert.assertNotNull(is); // use version of the pom to ensure it is local } } @@ -59,7 +59,7 @@ public class MavenResolverTest { return file; } - public void resolveCommon(String path) throws Exception { + public void resolveCommon(final String path) throws Exception { final File file = getAvailableFile(); final FileOutputStream to = new FileOutputStream(file); IO.copy(resolver.resolve(path), to); @@ -74,4 +74,12 @@ public class MavenResolverTest { resolveCommon("mvn:http://repo1.maven.org/maven2/!junit:junit:4.12:jar"); resolveCommon("mvn:http://repo1.maven.org/maven2/!junit:junit:LATEST:jar"); } + + @Test + public void overrideRepo() throws Exception { + System.setProperty("openejb.deployer.repository", "https://bob.smith/repo/"); + final String url = resolver.quickMvnUrl("!junit/junit/4.12/jar"); + assertEquals("https://bob.smith/repo/junit/junit/4.12/junit-4.12.jar", url); + System.clearProperty("openejb.deployer.repository"); + } }