From b359c5b3d9e6934b7c448488fe58f4b6f0122d44 Mon Sep 17 00:00:00 2001
From: Chi Cao Minh <chi.caominh@imply.io>
Date: Thu, 8 Aug 2019 18:13:18 -0700
Subject: [PATCH] Fix SIGAR dependency connection timeout (#8258)

After enabling parallel builds for "mvn install", the sigar dependency
would sometimes resolve to the incorrect artifact repo for some of the
maven modules. This issue seems to be fixed by moving the definition of
the sigar dependency's artifact repo to the root POM.

Also, depending on network speeds, "mvn -q install" may take longer than
the default 10 minute timeout to print any output. Use travis_wait to
extend the timeout to 15 minutes.
---
 .travis.yml  | 5 +++--
 core/pom.xml | 7 -------
 pom.xml      | 6 ++++++
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ebfa4067531..9a4fce41816 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,8 +42,9 @@ env:
       "
 
 # Add various options to make 'mvn install' fast and skip javascript compile (-Ddruid.console.skip=true) since it is not
-# needed. Use travis_retry to address intermittent connection timeouts when resolving the SIGAR dependency.
-install: MAVEN_OPTS='-Xmx3000m' travis_retry $MVN clean install -q -ff ${MAVEN_SKIP} -DskipTests -T1.0C
+# needed. Depending on network speeds, "mvn -q install" may take longer than the default 10 minute timeout to print any
+# output.  To compensate, use travis_wait to extend the timeout.
+install: MAVEN_OPTS='-Xmx3000m' travis_wait 15 $MVN clean install -q -ff ${MAVEN_SKIP} -DskipTests -T1.0C
 
 matrix:
   include:
diff --git a/core/pom.xml b/core/pom.xml
index 1f7cd6bc247..776f5109869 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -363,13 +363,6 @@
     </resources>
   </build>
 
-  <repositories>
-    <repository>
-      <id>sigar</id>
-      <url>https://repository.jboss.org/nexus/content/repositories/thirdparty-uploads/</url>
-    </repository>
-  </repositories>
-
   <profiles>
     <profile>
       <id>strict</id>
diff --git a/pom.xml b/pom.xml
index f5271d70c6c..dcebf1a075a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -182,6 +182,12 @@
             <name>${repoOrgName}</name>
             <url>${repoOrgUrl}</url>
         </repository>
+
+        <!-- Only used by core, but moved to root for parallel build dependency resolution -->
+        <repository>
+          <id>sigar</id>
+          <url>https://repository.jboss.org/nexus/content/repositories/thirdparty-uploads/</url>
+        </repository>
     </repositories>
 
     <dependencyManagement>