Merge branch 'develop' into feature/minor_doc_udpates

Author: jgebal

.travis.yml

@@ -38,20 +38,24 @@ script:
 
 before_deploy:
   - bash .travis/create_release.sh
+  - if [ ! -z "$TRAVIS_TAG" ]; then VERSION=$(tr -d "/v/" <<<$TRAVIS_TAG); mvn org.codehaus.mojo:versions-maven-plugin:2.1:set -DnewVersion=${VERSION}; fi
 
 deploy:
   - provider: releases
     api_key: $GITHUB_API_TOKEN
     file: utPLSQL-cli.zip
     skip_cleanup: true
     on:
+      repository: utPLSQL/utPLSQL-cli
       tags: true
   - provider: bintray
     file: bintray.json
-    user: $BINTRAY_USER
-    key: $BINTRAY_API_KEY
+    user: ${BINTRAY_USER}
+    key: ${BINTRAY_API_KEY}
     dry-run: false
-    on: develop
+    on:
+      repository: utPLSQL/utPLSQL-cli
+      branch: develop
 
 notifications:
   slack: $SLACK_API_TOKEN

.travis/maven_cfg.sh

@@ -13,17 +13,5 @@ else
     sudo cp $CACHE_DIR/wagon-http-2.8-shaded.jar $MAVEN_HOME/lib/ext/
 fi
 
-# Create the settings file with oracle server config.
-# If file already exists, Oracle dependencies were cached on previous build.
-if [ ! -f $MAVEN_CFG/.cached ]; then
-    cp settings.xml $MAVEN_CFG/settings.xml
-    touch $MAVEN_CFG/.cached
-else
-    echo "Using cached maven settings..."
-fi
+cp settings.xml $MAVEN_CFG/settings.xml
 
-# The Java API is not available on a public repository yet, we need to download and install it locally.
-# Always downloading the latest development version.
-git clone https://github.com/utPLSQL/utPLSQL-java-api.git
-cd utPLSQL-java-api
-mvn package install -DskipTests

pom.xml

@@ -20,7 +20,7 @@
     <dependency>
       <groupId>org.utplsql</groupId>
       <artifactId>java-api</artifactId>
-      <version>3.0.4-SNAPSHOT</version>
+      <version>3.0.4</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -59,4 +59,19 @@
     </plugins>
   </build>
 
+  <repositories>
+    <repository>
+      <id>utplsql-java-api</id>
+      <url>
+        https://packagecloud.io/utplsql/utplsql-java-api/maven2
+      </url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+
 </project>