From 97b9fc39cf39bee29e426c9fda5a29724288cbc3 Mon Sep 17 00:00:00 2001
From: Nebil Kisa <TheOutsSeeker@users.noreply.github.com>
Date: Tue, 2 Feb 2021 13:36:06 +0000
Subject: [PATCH] ATS-851: Improve build reliability (#329)

- Add Maven Central to top of repo search list
- Disable Maven connection pool
- Fixed formatting
---
 .travis.yml      |  4 ++--
 _ci/build.sh     |  3 +--
 _ci/release.sh   |  2 +-
 _ci/settings.xml | 11 ++++++++++-
 _ci/test.sh      |  5 ++---
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d3992d98..0ac5ea7b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,8 +36,8 @@ jobs:
       name: "Core & Base Snapshot deployment" # This is to separate the snapshot deployment from the following jobs, to prevent duplication on nexus
       if: branch = master AND type != pull_request
       before_script: travis_wait bash _ci/cache_artifacts.sh
-      install: travis_wait 20 mvn -B -U -q clean install -DadditionalOption=-Xdoclint:none -DskipTests -Dmaven.javadoc.skip=true -Pbase
-      script: mvn -B -U clean deploy -DadditionalOption=-Xdoclint:none -Dmaven.javadoc.skip=true -Pbase
+      install: travis_wait 20 mvn -B -U -q clean install -DadditionalOption=-Xdoclint:none -DskipTests -Dmaven.javadoc.skip=true -Dmaven.wagon.http.pool=false -Pbase
+      script: mvn -B -U clean deploy -DadditionalOption=-Xdoclint:none -Dmaven.javadoc.skip=true -Dmaven.wagon.http.pool=false -Pbase
     - name: "ImageMagick"
       if: branch NOT IN (company_release)
       before_script: travis_wait bash _ci/cache_artifacts.sh
diff --git a/_ci/build.sh b/_ci/build.sh
index 9bf63b36..f7b477fc 100755
--- a/_ci/build.sh
+++ b/_ci/build.sh
@@ -5,7 +5,7 @@ PS4="\[\e[35m\]+ \[\e[m\]"
 set -vex
 pushd "$(dirname "${BASH_SOURCE[0]}")/../"
 
-mvn -B -U \
+mvn -B -U -Dmaven.wagon.http.pool=false \
     clean install \
     -DadditionalOption=-Xdoclint:none -Dmaven.javadoc.skip=true \
     -DskipTests \
@@ -14,4 +14,3 @@ mvn -B -U \
 popd
 set +vex
 echo "=========================== Finishing Build Script =========================="
-
diff --git a/_ci/release.sh b/_ci/release.sh
index 11344097..64ae64db 100644
--- a/_ci/release.sh
+++ b/_ci/release.sh
@@ -14,7 +14,7 @@ git checkout -B "${TRAVIS_BRANCH}"
 git config user.email "build@alfresco.com"
 
 # Run the release plugin - with "[skip ci]" in the release commit message
-mvn -B \
+mvn -B -Dmaven.wagon.http.pool=false \
     ${DRY_RUN} \
     -Prelease \
     "-Darguments=-Prelease -DskipTests -Dmaven.javadoc.skip -Dadditionalparam=-Xdoclint:none" \
diff --git a/_ci/settings.xml b/_ci/settings.xml
index ccec1b18..6a23a33a 100644
--- a/_ci/settings.xml
+++ b/_ci/settings.xml
@@ -6,6 +6,15 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <repositories>
+                <repository>
+                    <id>central</id>
+                    <name>Central Repository</name>
+                    <url>https://repo.maven.apache.org/maven2</url>
+                    <layout>default</layout>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                </repository>
                 <repository>
                     <id>alfresco-internal</id>
                     <name>Alfresco Internal Repository</name>
@@ -69,7 +78,7 @@
             <username>bamboo</username>
             <password>${env.NEXUS_PASSWORD}</password>
         </server>
-        
+
         <!-- private docker registry-->
         <server>
             <id>quay.io</id>
diff --git a/_ci/test.sh b/_ci/test.sh
index f7d27ce7..999b9734 100755
--- a/_ci/test.sh
+++ b/_ci/test.sh
@@ -12,15 +12,14 @@ pushd "$(dirname "${BASH_SOURCE[0]}")/../"
 [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "master" ] && DEPLOY="deploy" || DEPLOY="verify"
 
 # Do not deploy snapshots for alfresco-transform-core and alfresco-transformer-base
-mvn -B -U \
+mvn -B -U -Dmaven.wagon.http.pool=false \
     clean ${DEPLOY} \
     -DadditionalOption=-Xdoclint:none -Dmaven.javadoc.skip=true \
     -Dparent.core.deploy.skip=true -Dtransformer.base.deploy.skip=true \
-    "-P${PROFILE},docker-it-setup,${1}" 
+    "-P${PROFILE},docker-it-setup,${1}"
 
 docker ps -a -q | xargs -r -l docker stop ; docker ps -a -q | xargs -r -l docker rm
 
 popd
 set +vex
 echo "=========================== Finishing Test&Deploy Script =========================="
-