Include suggested changes of review

pesse · pesse · commit b79b5b817878 · 2017-11-24T14:27:08.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -46,7 +46,7 @@ env:
     - DOCKHER_HUB_REPO="${DOCKER_BASE_TAG:-$UT3_DOCKER_REPO}"
     #utPLSQL released version directory
     - UTPLSQL_DIR="utPLSQL_latest_release"
-    - UTPLSQL_CLI_FILE="utPLSQL-cli.zip"
+    - UTPLSQL_CLI_VERSION="3.0.4"
     # Maven
     - MAVEN_HOME=/usr/local/maven
     - MAVEN_CFG=$HOME/.m2
@@ -72,16 +72,14 @@ before_install:
   # download latest utPLSQL release
   #- curl -LOk $(curl --silent https://api.github.com/repos/utPLSQL/utPLSQL/releases/latest | awk '/browser_download_url/ { print $2 }' | grep ".zip" | sed 's/"//g')
   - git clone --depth=1 --branch=${SELFTESTING_BRANCH:-master} https://github.com/utPLSQL/utPLSQL.git $UTPLSQL_DIR
-  # download utPLSQL-cli develop
-  - curl -Lk -o utPLSQL-cli.zip https://github.com/utPLSQL/utPLSQL-cli/releases/download/v3.0.4/${UTPLSQL_CLI_FILE}
+  # download latest utPLSQL-cli release
+  - curl -Lk -o utPLSQL-cli.zip https://github.com/utPLSQL/utPLSQL-cli/releases/download/v${UTPLSQL_CLI_VERSION}/utPLSQL-cli.zip
 
 install:
   #- unzip utPLSQL.zip
   - unzip utPLSQL-cli.zip && chmod -R u+x utPLSQL-cli
-  - cp .travis/settings.xml $MAVEN_CFG/settings.xml
-  # Install maven wagon
+  # Get ojdbc via maven
   - bash .travis/maven_cfg.sh
-  - mvn dependency:copy-dependencies -DoutputDirectory=utPLSQL-cli/lib
   - pip install mkdocs
   - bash .travis/install_sqlcl.sh
   - sudo mkdir -p /dev/pdbs
diff --git a/.travis/maven_cfg.sh b/.travis/maven_cfg.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 set -ev
+cp .travis/settings.xml $MAVEN_CFG/settings.xml
+
 cd $(dirname $(readlink -f $0))
 
 # Download wagon-http recommended by Oracle.
@@ -12,3 +14,5 @@ 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
diff --git a/.travis/pom.xml b/.travis/pom.xml
diff --git a/utPLSQL b/utPLSQL
@@ -0,0 +1 @@
+Subproject commit d21a0fdc98830b5ba012663602d98c48718322c4

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Subproject commit d21a0fdc98830b5ba012663602d98c48718322c4`