Merge branch 'jetty-10.0.x' into jetty-11.0.x

jetty · Jan 26, 2021 · a2270fe · a2270fe
2 parents 2a37eb8 + b214837
commit a2270fe
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/demos/embedded/src/main/java/org/eclipse/jetty/demos/JettyDemoBase.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/JettyDemoBase.java
@@ -87,6 +87,7 @@ public class JettyDemoBase
                     "jetty.version=" + jettyVersion,
                     "jetty.home=" + jettyHome.toString(),
                     "jetty.base=" + jettyBase.toString(),
+                    "maven.local.repo=" + System.getProperty("mavenRepoPath"),
                     "--add-modules=logging-jetty,demo"
                 };
 

diff --git a/...rt/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java b/...rt/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java
@@ -27,6 +27,7 @@
 import org.eclipse.jetty.toolchain.test.jupiter.WorkDir;
 import org.eclipse.jetty.toolchain.test.jupiter.WorkDirExtension;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
@@ -172,7 +173,8 @@ public void testGetCoordinateTestMavenBaseUri()
     }
 
     @Test
-    public void testDownloadDefaultRepo()
+    @Tag("external")
+    public void testDownloadUnspecifiedRepo()
         throws Exception
     {
         MavenLocalRepoFileInitializer repo =

diff --git a/...test-distribution/src/main/java/org/eclipse/jetty/tests/distribution/JettyHomeTester.java b/...test-distribution/src/main/java/org/eclipse/jetty/tests/distribution/JettyHomeTester.java
@@ -61,6 +61,7 @@
 import org.eclipse.jetty.toolchain.test.FS;
 import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
 import org.eclipse.jetty.util.IO;
+import org.eclipse.jetty.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -155,10 +156,12 @@ public JettyHomeTester.Run start(List<String> args) throws Exception
 
         args = new ArrayList<>(args);
 
-        args.add("maven.local.repo=" + config.mavenLocalRepository);
-
-        // we get artifacts from local repo first
-        args.add("maven.local.repo=" + System.getProperty("mavenRepoPath"));
+        if (StringUtil.isNotBlank( config.mavenLocalRepository)) {
+            args.add("maven.local.repo=" + config.mavenLocalRepository);
+        } else if (StringUtil.isNotBlank(System.getProperty("mavenRepoPath"))){
+            // we get artifacts from local repo first
+            args.add("maven.local.repo=" + System.getProperty("mavenRepoPath"));
+        }
 
         // if this JVM has `maven.repo.uri` defined, make sure to propagate it to child
         String remoteRepoUri = System.getProperty("maven.repo.uri");