utPLSQL
diff --git a/‎.github/ISSUE_TEMPLATE/bug_report.md‎
Lines changed: 50 additions & 0 deletions b/‎.github/ISSUE_TEMPLATE/bug_report.md‎
Lines changed: 50 additions & 0 deletions
diff --git a/‎.github/ISSUE_TEMPLATE/feature_request.md‎
Lines changed: 26 additions & 0 deletions b/‎.github/ISSUE_TEMPLATE/feature_request.md‎
Lines changed: 26 additions & 0 deletions
diff --git a/‎.gitignore‎
Lines changed: 12 additions & 0 deletions b/‎.gitignore‎
Lines changed: 12 additions & 0 deletions
diff --git a/‎.travis.yml‎
Lines changed: 56 additions & 42 deletions b/‎.travis.yml‎
Lines changed: 56 additions & 42 deletions
diff --git a/‎.travis/build_docs.sh‎
100644100755 b/‎.travis/build_docs.sh‎
100644100755
diff --git a/‎.travis/build_release_archive.sh‎
100644100755 b/‎.travis/build_release_archive.sh‎
100644100755
diff --git a/‎.travis/coveralls_uploader.sh‎
100644100755 b/‎.travis/coveralls_uploader.sh‎
100644100755
diff --git a/‎.travis/create_additional_grants_for_old_tests.sh‎
Lines changed: 0 additions & 23 deletions b/‎.travis/create_additional_grants_for_old_tests.sh‎
Lines changed: 0 additions & 23 deletions
diff --git a/‎.travis/download.js‎
Lines changed: 3 additions & 1 deletion b/‎.travis/download.js‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎.travis/download.sh‎
100644100755
Lines changed: 4 additions & 3 deletions b/‎.travis/download.sh‎
100644100755
Lines changed: 4 additions & 3 deletions
@@ -0,0 +1,50 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Provide version info**
+Information about utPLSQL and Database version, 
+```sql
+set serveroutput on
+declare
+  l_version varchar2(255);
+  l_compatibility varchar2(255);
+begin
+  dbms_utility.db_version( l_version, l_compatibility );
+  dbms_output.put_line( l_version );
+  dbms_output.put_line( l_compatibility );
+end;
+/
+select substr(ut.version(),1,60) as ut_version from dual;
+select * from v$version;
+select * from nls_session_parameters;
+select substr(dbms_utility.port_string,1,60) as port_string from dual;
+```
+
+**Information about client software**
+What client was used to run utPLSQL tests? Was it from TOAD, SQLDeveloper, SQLPlus, PLSQL Developer etc...
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Example code**
+If applicable, add sample code to help explain your problem.
+Please avoid putting your company private/protected code in an issue, as it might violate your company's privacy and security policies.
+
+**Additional context**
+Add any other context about the problem here.
@@ -0,0 +1,26 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
+
+**Note**
+> Please do not create issues for generic SQL or PL/SQL questions. There are other forums and communities to help you with those. See [ASKTom](https://asktom.oracle.com) for example.
+
+**Want to discuss**
+If you want to discuss your issue, join [our SLACK chat](http://utplsql-slack-invite.herokuapp.com/).
@@ -15,4 +15,16 @@ node_modules/
 utPLSQL_latest_release/
 utPLSQL-cli/
 development/env.sh
+development/*.jar
 *.log
+
+# exclusions based on artifacts created via actions documented in CONTRIBUTING.md
+test/dummy.sql
+coverage.html_assets/
+coverage.html
+coverage.json
+coverage.xml
+tfs_test_results.xml
+junit_test_results.xml
+test_results.xml
+*debug*.xml
@@ -5,16 +5,13 @@ addons:
   apt:
     packages:
       - unzip
-      # Java8 Required for Sonar and SQLCL
-      - oracle-java8-installer
-      - oracle-java8-set-default
+      # Java9 Required for Sonar and SQLCL
+      - oracle-java9-installer
+      - oracle-java9-set-default
   sonarcloud:
     organization: utplsql
     token:
       secure: ${SONAR_TOKEN}
-    branches:
-      - develop
-      - master
 
 services:
   - docker
@@ -28,6 +25,8 @@ env:
     - UT3_USER_PASSWORD=ut3
     - UT3_TESTER=ut3_tester
     - UT3_TESTER_PASSWORD=ut3
+    - UT3_TESTER_HELPER=ut3_tester_helper
+    - UT3_TESTER_HELPER_PASSWORD=ut3
     - UT3_TABLESPACE=users
     # Environment for building a release
     - CURRENT_BRANCH=${TRAVIS_BRANCH}
@@ -41,35 +40,40 @@ env:
     - CACHE_DIR=$HOME/.cache
     # Database Env
     - SQLCLI="$HOME/sqlcl/bin/sql"
+    - OJDBC_HOME="$HOME/sqlcl/lib"
     - ORACLE_PWD="oracle"
     - UT3_DOCKER_REPO="utplsqlv3/oracledb"
     - DOCKHER_HUB_REPO="${DOCKER_BASE_TAG:-$UT3_DOCKER_REPO}"
     #utPLSQL released version directory
     - UTPLSQL_DIR="utPLSQL_latest_release"
-    - SELFTESTING_BRANCH="develop"
-    - UTPLSQL_CLI_VERSION="3.1.0"
+    - SELFTESTING_BRANCH=${TRAVIS_BRANCH}
+    - UTPLSQL_CLI_VERSION="3.1.6"
     # Maven
     - MAVEN_HOME=/usr/local/maven
     - MAVEN_CFG=$HOME/.m2
   matrix:
-    - ORACLE_VERSION="${DOCKER_TAG_11G:-11g-r2-xe}"  CONNECTION_STR='127.0.0.1:1521/XE'       DOCKER_OPTIONS='--shm-size=1g'
-    - ORACLE_VERSION="${DOCKER_TAG_12C:-12c-r1-se2}" CONNECTION_STR='127.0.0.1:1521/ORCLPDB1' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs"
-    - ORACLE_VERSION="${DOCKER_TAG_12C2:-12c-r2-se2}" CONNECTION_STR='127.0.0.1:1521/ORCLPDB1' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs"
+    - ORACLE_VERSION="${DOCKER_TAG_11G:-11g-r2-xe}"         CONNECTION_STR='127.0.0.1:1521/XE'       DOCKER_OPTIONS='--shm-size=1g'
+    - ORACLE_VERSION="${DOCKER_TAG_12C:-12c-r1-se2-small}"  CONNECTION_STR='127.0.0.1:1521/ORCLCDB'  DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs"
+    - ORACLE_VERSION="${DOCKER_TAG_12C2:-12c-r2-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB'  DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs"
+    - ORACLE_VERSION="${DOCKER_TAG_18:-18c-se2-small}"      CONNECTION_STR='127.0.0.1:1521/ORCLCDB'  DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs"
+    - ORACLE_VERSION="${DOCKER_TAG_19:-19c-se2-small}"      CONNECTION_STR='127.0.0.1:1521/ORCLCDB'  DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs"
 
 cache:
   pip: true
   directories:
     - $CACHE_DIR
+    - /home/travis/.sonar/cache
     - node_modules
     - $MAVEN_CFG
 
 before_install:
-  #The update_project_version is done before deployment to validate that the change of project files does not break installation
+  #cache to be used between stages. Based on https://github.com/travis-ci/docs-travis-ci-com/issues/1329
+  #delete all files in cache that are older than 5 days
+  - mkdir -p $CACHE_DIR/stages_cache; find $CACHE_DIR/stages_cache/ -mtime +5 -exec rm {} \;
+  #The update_project_version.sh is done before deployment to validate that the change of project files does not break installation
   - bash .travis/update_project_version.sh
-  - git config --global user.email "[email protected]"
-  - git config --global user.name "${UTPLSQL_BUILD_USER_NAME}"
-  - git remote rm origin
-  - git remote add origin https://${github_api_token}@github.com/${UTPLSQL_REPO}
+  #Allow for sonar to blame issues
+  - git fetch --unshallow
   # 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
@@ -81,49 +85,59 @@ install:
   - unzip utPLSQL-cli.zip && chmod -R u+x utPLSQL-cli
   # Get ojdbc via maven
   - bash .travis/maven_cfg.sh
-  - pip install mkdocs
   - bash .travis/install_sqlcl.sh
   - sudo mkdir -p /dev/pdbs
   - sudo chmod -R 777 /dev/pdbs
   - if [[ ! $TRAVIS_TAG ]]; then bash .travis/start_db.sh; fi
-  - df -h
 
 before_script:
   - if [[ ! $TRAVIS_TAG ]]; then bash .travis/install.sh; fi
   - if [[ ! $TRAVIS_TAG ]]; then bash .travis/install_utplsql_release.sh; fi
-  - if [[ ! $TRAVIS_TAG ]]; then bash .travis/create_additional_grants_for_old_tests.sh; fi
   - if [[ ! $TRAVIS_TAG ]]; then bash .travis/run_examples.sh; fi
-  - if [[ ! $TRAVIS_TAG ]]; then bash .travis/run_old_tests.sh; fi
 
 script:
   - if [[ ! $TRAVIS_TAG ]]; then bash test/install_and_run_tests.sh; fi
-  - if [[ ! $TRAVIS_TAG ]] && [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then sonar-scanner; fi
+  - if [[ ! $TRAVIS_TAG ]]; then bash .travis/validate_report_files.sh; fi
+  - if [[ ! $TRAVIS_TAG ]] && [[ ("${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" && "${TRAVIS_PULL_REQUEST}" == false) || ("${TRAVIS_PULL_REQUEST_SLUG}" = "${UTPLSQL_REPO}") ]]; then bash .travis/run_sonar_scanner.sh; fi
   - if [[ ! $TRAVIS_TAG ]]; then bash .travis/coveralls_uploader.sh; fi
-  - bash .travis/build_docs.sh
-  - if [[ ! $TRAVIS_TAG ]]; then bash .travis/push_release_version.sh; fi
-  - bash .travis/push_docs_to_gh_pages.sh
-
-before_deploy:
-  - bash .travis/build_release_archive.sh
-
-deploy:
-  provider: releases
-  api_key: $github_api_token
-  file:
-     - utPLSQL.zip
-     - utPLSQL.tar.gz
-     - utPLSQL.zip.md5
-     - utPLSQL.tar.gz.md5
-  skip_cleanup: true
-  on:
-     repo: ${UTPLSQL_REPO}
-     tags: true
-     # when building from a release tag, use only first job "#xxx.1" to publish artifacts
-     condition: "${TRAVIS_JOB_NUMBER} =~ \\.1$"
 
 notifications:
   slack:
     rooms:
       - secure: "nemt9n2y5sVCAKqa/s7JDQ8AcM59Xu/XbH/RkMOXvPgc+KtR8lBtVD1LkvJ5BaQhqgjuDT7DNt/uisQJ7k6a2OsrVFbnkypZ1hCvntOBpJyoSpD/YL1X8a9GbGojuJcph0BX76KN21LaOVdyOfY0TSlw53XiYWS8iL5HtjpWCbIwHL1SJ8JT8mhdT4hDoUWZjcZ4s4bLH6BQm4un/bMQOmB4sDoCeg4CllJwxgkswVF7OHpOFjgPetvUp7ps8b/Rj8en6zCj9drb0SVbXFgumo2Wd1bC3HHZB8MAZU0kuEV5VgUdum6EelUL5yfB72hssNQA0+CaT3HjBFkTlqWYJmjC4/xyGN3sseiW82T9FDY0g0GAGayNRW+QSiTQ1hbJEcAnNe0GrBUdRsgXdI6COd76YP5VxzRSF6H7niLfgCZdKbIivKUd1o+wBhuyJmqCFIkRWmT38tMGJqJAzbY1jq5gQXbb6E7gt+KdTjlSjcnJYf7XI7zqm+BRr+fbA0ixfXHvfqOBgZN6g08y9nPlDnIjtSF2NSdrj2zqYQAtKuWSOD1bnTyfDJyrtK7OLffZcMYD5Bcss4c8op8tP7MGTjt1S046SJocboh6H4c/nTokpoMRsWs6MKRdebl8C2RObGf5FebSOJg+oh2ZYS5Z/G9GshiY2BD/81+Hc4Miacc="
     on_success: change
     on_failure: always
+
+jobs:
+  include:
+    - stage: deploy
+      env: ORACLE_VERSION="none"
+      before_install: skip
+      install:
+        - pip install mkdocs
+      before_script: skip
+      script: 
+        - if [[ ($TRAVIS_BRANCH == develop) && ($TRAVIS_PULL_REQUEST == false) ]]; then bash .travis/trigger_travis.sh $TRAVIS_ACCESS_TOKEN; fi
+        - #The update_project_version.sh needs to be done before pushing changes to develop branch
+        - bash .travis/update_project_version.sh
+        - git config --global user.email "[email protected]"
+        - git config --global user.name "${UTPLSQL_BUILD_USER_NAME}"
+        - git remote rm origin
+        - git remote add origin https://${github_api_token}@github.com/${UTPLSQL_REPO}
+        - if [[ ! $TRAVIS_TAG ]]; then bash .travis/push_release_version.sh; fi
+        - bash .travis/build_docs.sh
+        - bash .travis/push_docs_to_gh_pages.sh
+      before_deploy:
+        - bash .travis/build_release_archive.sh
+      deploy:
+        provider: releases
+        api_key: $github_api_token
+        file:
+           - utPLSQL.zip
+           - utPLSQL.tar.gz
+           - utPLSQL.zip.md5
+           - utPLSQL.tar.gz.md5
+        skip_cleanup: true
+        on:
+           repo: ${UTPLSQL_REPO}
+           tags: true
@@ -17,6 +17,7 @@ var paramUsername = casper.cli.get(0);
 var paramPassword = casper.cli.get(1);
 var agreementUrl  = casper.cli.get(2);
 var downloadUrl   = casper.cli.get(3);
+var downloaded    = false;
 
 casper.start();
 // TODO: Error handling.
@@ -41,10 +42,11 @@ casper.thenOpen(downloadUrl).waitForUrl(/signon\.jsp$/, function (re) {
 });
 
 casper.on("resource.received", function (resource) {
-   if (resource.url.indexOf("AuthParam") !== -1) {
+   if (resource.url.indexOf("AuthParam") !== -1 && !downloaded) {
       // this.echo("DownloadUrl:");
       // Print the download url.
       this.echo(resource.url);
+      downloaded = true;
       // TODO: Try to download file from here. this.download is not working because of cross site request.
    }
 });
 
@@ -12,8 +12,9 @@ PRODUCT=""
 # Then download the file using curl.
 downloadFile() {
     downloadUrl=$(exec casperjs download.js $ORACLE_OTN_USER $ORACLE_OTN_PASSWORD $1 $2)
+    downloadUrl=${downloadUrl%$'\r'}
     echo "DownloadURL: $downloadUrl"
-    curl $downloadUrl -o $3
+    curl -o $3 -L "$downloadUrl"
 }
 
 #############################
@@ -60,8 +61,8 @@ fi
 
 if [ "$PRODUCT" == "sqlcl" ]; then
     agreementUrl="http://www.oracle.com/technetwork/developer-tools/sqlcl/downloads/index.html"
-    downloadUrl="http://download.oracle.com/otn/java/sqldeveloper/sqlcl-4.2.0.17.073.1038-no-jre.zip"
-    outputFile=sqlcl-4.2.0.17.073.1038-no-jre.zip
+    downloadUrl="https://download.oracle.com/otn/java/sqldeveloper/sqlcl-18.3.0.259.2029.zip"
+    outputFile=sqlcl-18.3.0.259.2029.zip
     downloadFile $agreementUrl $downloadUrl $outputFile
     exit 0
 fi