Revert "Disabling maven wagon-http"

jgebal · jgebal · commit c40f8376568e · 2018-07-29T17:04:28.000+01:00
This reverts commit 110bfa7
diff --git a/.travis/maven_cfg.sh b/.travis/maven_cfg.sh
@@ -2,20 +2,17 @@
 set -ev
 cp .travis/settings.xml $MAVEN_CFG/settings.xml
 
-############################################
-# disabling all the below to check if it's still needed with maven 3.5.2 on Travis
-############################################
-#cd $(dirname $(readlink -f $0))
-#
-## Download wagon-http recommended by Oracle.
-## On maven latest version this is not needed, but travis doesn't have it.
-#if [ ! -f $CACHE_DIR/wagon-http-2.8-shaded.jar ]; then
-#    curl -L -O "http://central.maven.org/maven2/org/apache/maven/wagon/wagon-http/2.8/wagon-http-2.8-shaded.jar"
-#    mv wagon-http-2.8-shaded.jar $CACHE_DIR/
-#    sudo cp $CACHE_DIR/wagon-http-2.8-shaded.jar $MAVEN_HOME/lib/ext/
-#else
-#    echo "Using cached wagon-http..."
-#    sudo cp $CACHE_DIR/wagon-http-2.8-shaded.jar $MAVEN_HOME/lib/ext/
-#fi
-#
-#mvn dependency:copy-dependencies -DoutputDirectory=../utPLSQL-cli/lib
+cd $(dirname $(readlink -f $0))
+
+# Download wagon-http recommended by Oracle.
+# On maven latest version this is not needed, but travis doesn't have it.
+if [ ! -f $CACHE_DIR/wagon-http-2.8-shaded.jar ]; then
+    curl -L -O "http://central.maven.org/maven2/org/apache/maven/wagon/wagon-http/2.8/wagon-http-2.8-shaded.jar"
+    mv wagon-http-2.8-shaded.jar $CACHE_DIR/
+    sudo cp $CACHE_DIR/wagon-http-2.8-shaded.jar $MAVEN_HOME/lib/ext/
+else
+    echo "Using cached wagon-http..."
+    sudo cp $CACHE_DIR/wagon-http-2.8-shaded.jar $MAVEN_HOME/lib/ext/
+fi
+
+mvn dependency:copy-dependencies -DoutputDirectory=../utPLSQL-cli/lib
