Using http-wagon recommended by oracle

viniciusam · viniciusam · commit 9162ffac9bfc · 2017-04-07T14:53:44.000-03:00
diff --git a/.travis.yml b/.travis.yml
@@ -12,7 +12,8 @@ env:
   global:
     - DOCKER_CFG=$HOME/.docker
     - DOCKER_REPO="viniciusam/oracledb"
-    - MAVEN_HOME=$HOME/apache-maven
+    # - MAVEN_HOME=$HOME/apache-maven
+    - MAVEN_HOME=/usr/local/maven
     - UTPLSQL_VERSION="v3.0.0-beta"
     - UTPLSQL_FILE="utPLSQLv3.0.0.562-beta"
   matrix:
@@ -21,12 +22,13 @@ env:
 cache:
   directories:
     - $DOCKER_CFG
-    - $MAVEN_HOME
+    - $HOME/.m2
+    - $MAVEN_HOME/lib/ext
 
 install:
   - bash .travis/maven_cfg.sh
   # - bash .travis/start_db.sh
   # - bash .travis/install_utplsql.sh
 
 script:
-  - $MAVEN_HOME/bin/mvn test -B
+  - mvn test -B
diff --git a/.travis/maven_cfg.sh b/.travis/maven_cfg.sh
@@ -2,9 +2,10 @@
 set -ev
 cd $(dirname $(readlink -f $0))
 
-if [ -d $MAVEN_HOME ]; then
-    echo "Using cached maven install..."
-    $MAVEN_HOME/bin/mvn -v
+mavenSettings=$HOME/.m2/settings.xml
+
+if [ -d $mavenSettings ]; then
+    echo "Using cached maven user config..."
     exit 0
 fi
 
@@ -15,14 +16,17 @@ fi
 
 # If not cached, download and install maven.
 # Then create the settings file, with username/password for oracle server.
-curl -L -O "http://mirror.nbtelecom.com.br/apache/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz"
-tar -xzf apache-maven-3.3.9-bin.tar.gz
-mv apache-maven-3.3.9 $MAVEN_HOME
-rm apache-maven-3.3.9-bin.tar.gz
+# curl -L -O "http://mirror.nbtelecom.com.br/apache/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz"
+# tar -xzf apache-maven-3.3.9-bin.tar.gz
+# mv apache-maven-3.3.9 $MAVEN_HOME
+# rm apache-maven-3.3.9-bin.tar.gz
+
+curl -L -O "http://central.maven.org/maven2/org/apache/maven/wagon/wagon-http/2.8/wagon-http-2.8-shaded.jar"
+sudo mv wagon-http-2.8-shaded.jar $MAVEN_HOME/lib/ext/
 
-settingsFile=$MAVEN_HOME/conf/settings.xml
-cp settings.tmpl.xml $settingsFile
-sed -i -e "s|###USERNAME###|$ORACLE_OTN_USER|g" $settingsFile
-sed -i -e "s|###PASSWORD###|$ORACLE_OTN_PASSWORD|g" $settingsFile
+# MAVEN_CFG=$MAVEN_HOME/conf/settings.xml
+cp settings.tmpl.xml $mavenSettings
+sed -i -e "s|###USERNAME###|$ORACLE_OTN_USER|g" $mavenSettings
+sed -i -e "s|###PASSWORD###|$ORACLE_OTN_PASSWORD|g" $mavenSettings
 
-$MAVEN_HOME/bin/mvn -v
+# $MAVEN_HOME/bin/mvn -v
