[ignite] branch master updated: IGNITE-11175 Add support for maven local xml config file - Fixes #5944.

[dg...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dgovorukhin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new d7c717c  IGNITE-11175 Add support for maven local xml config file - Fixes #5944.
d7c717c is described below

commit d7c717c7b7834dbbd82ebdf232e9da1bb59b6abe
Author: Andrey Kalinin <pr...@gmail.com>
AuthorDate: Tue Dec 25 14:01:50 2018 +0500

    IGNITE-11175 Add support for maven local xml config file - Fixes #5944.
    
    Signed-off-by: Dmitriy Govorukhin <dm...@gmail.com>
---
 .../testframework/util/MavenUtils.java             | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/util/MavenUtils.java b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/util/MavenUtils.java
index a05cfd9..acf4490 100644
--- a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/util/MavenUtils.java
+++ b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/util/MavenUtils.java
@@ -22,12 +22,16 @@ import com.google.common.io.CharStreams;
 import java.io.File;
 import java.io.InputStreamReader;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
+
+import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.SB;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -148,8 +152,22 @@ public class MavenUtils {
     private static void downloadArtifact(String artifact) throws Exception {
         X.println("Downloading artifact... Identifier: " + artifact);
 
-        exec(buildMvnCommand() + " org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=" + artifact +
-            (useGgRepo ? " -DremoteRepositories=" + GG_MVN_REPO : ""));
+        // Default platform independ path for maven settings file.
+        Path localProxyMavenSettings = Paths.get(System.getProperty("user.home"), ".m2", "local-proxy.xml");
+
+        String localProxyMavenSettingsFromEnv = System.getenv("LOCAL_PROXY_MAVEN_SETTINGS");
+
+        SB mavenCommandArgs = new SB(" org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=" + artifact);
+
+        if (!F.isEmpty(localProxyMavenSettingsFromEnv))
+            localProxyMavenSettings = Paths.get(localProxyMavenSettingsFromEnv);
+
+        if (Files.exists(localProxyMavenSettings))
+            mavenCommandArgs.a(" -s " + localProxyMavenSettings.toString());
+        else
+            mavenCommandArgs.a(useGgRepo ? " -DremoteRepositories=" + GG_MVN_REPO : "");
+
+        exec(buildMvnCommand() + mavenCommandArgs.toString());
 
         X.println("Download is finished");
     }