use local repo to download mod files

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
jetty · Jan 26, 2021 · b214837 · b214837
1 parent 59bf0f9
commit b214837
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 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/...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");