Merge branch 'develop'

Author: simasch

.github/workflows/build.yml

@@ -0,0 +1,85 @@
+name: Build and test
+
+on:
+  push:
+
+  pull_request:
+    branches: [ develop ]
+
+  workflow_dispatch:
+
+  repository_dispatch:
+    types: [utPLSQL-build,utPLSQL-java-api-build]
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  build:
+    name: Test on JDK ${{ matrix.jdk }} with utPLSQL ${{ matrix.utplsql_version }}
+    runs-on: ubuntu-latest
+    env:
+      ORACLE_VERSION: "gvenzl/oracle-xe:18.4.0-slim"
+      UTPLSQL_VERSION: ${{matrix.utplsql_version}}
+      UTPLSQL_FILE: ${{matrix.utplsql_file}}
+      ORACLE_PASSWORD: oracle
+      DB_URL: "127.0.0.1:1521:XE"
+      DB_USER: app
+      DB_PASS: app
+
+    strategy:
+      fail-fast: false
+      matrix:
+        utplsql_version: ["v3.0.1","v3.0.2","v3.0.3","v3.0.4","v3.1.1","v3.1.2","v3.1.3","v3.1.6","v3.1.7","v3.1.8","v3.1.9","v3.1.10","v3.1.11","develop"]
+        utplsql_file: ["utPLSQL"]
+        jdk: ['8']
+        include:
+          - utplsql_version: "v3.0.0"
+            jdk: '8'
+            utplsql_file: "utPLSQLv3.0.0"
+    services:
+      oracle:
+        image: gvenzl/oracle-xe:18.4.0-slim
+        env:
+          ORACLE_PASSWORD: oracle
+        ports:
+          - 1521:1521
+        options: >-
+          --health-cmd healthcheck.sh
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 10
+          --name oracle
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-java@v2
+        with:
+          distribution: 'adopt'
+          java-version: ${{matrix.jdk}}
+
+      - name: Install utplsql
+        run:  .travis/install_utplsql.sh
+
+      - name: Install demo project
+        run:  .travis/install_demo_project.sh
+
+      - name: Build and Test
+        run:  mvn verify jar:jar appassembler:assemble
+
+  slack-workflow-status:
+    if: always()
+    name: Post Workflow Status To Slack
+    needs: [ build ]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Slack Workflow Notification
+        uses: Gamesight/slack-workflow-status@master
+        with:
+          repo_token: ${{secrets.GITHUB_TOKEN}}
+          slack_webhook_url: ${{secrets.SLACK_WEBHOOK_URL}}
+          name: 'Github Actions[bot]'
+          icon_url: 'https://octodex.github.com/images/mona-the-rivetertocat.png'

.github/workflows/release.yml

@@ -0,0 +1,47 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - "v*.*.*"
+
+  workflow_dispatch:
+
+jobs:
+
+  release:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-java@v2
+        with:
+          distribution: 'adopt'
+          java-version: ${{matrix.jdk}}
+          cache: 'maven'
+
+      - name: Build Release
+        run: mvn package appassembler:assemble assembly:single -DskipTests
+
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        with:
+          files: |
+            target/utPLSQL-cli.zip
+
+  slack-workflow-status:
+    if: always()
+    name: Post Workflow Status To Slack
+    needs: [ build ]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Slack Workflow Notification
+        uses: Gamesight/slack-workflow-status@master
+        with:
+          repo_token: ${{secrets.GITHUB_TOKEN}}
+          slack_webhook_url: ${{secrets.SLACK_WEBHOOK_URL}}
+          name: 'Github Actions[bot]'
+          icon_url: 'https://octodex.github.com/images/mona-the-rivetertocat.png'

.gitignore

@@ -15,3 +15,8 @@ buildNumber.properties
 
 # Avoid ignoring Maven wrapper jar file (.jar files are usually ignored)
 !/.mvn/wrapper/maven-wrapper.jar
+
+# Project exclude paths
+/.gradle/
+/build/
+/out/

.idea/codeStyles/Project.xml

@@ -5,7 +5,7 @@ services:
   - docker
 
 jdk:
-  - oraclejdk8
+  - openjdk8
 
 env:
   global:
@@ -19,6 +19,22 @@ env:
     - DB_PASS=app
     - ORACLE_VERSION="11g-r2-xe"
     - DOCKER_OPTIONS="--shm-size=1g"
+    - UTPLSQL_FILE="utPLSQL"
+  matrix:
+    - UTPLSQL_VERSION="v3.0.0"
+      UTPLSQL_FILE="utPLSQLv3.0.0"
+    - UTPLSQL_VERSION="v3.0.1"
+    - UTPLSQL_VERSION="v3.0.2"
+    - UTPLSQL_VERSION="v3.0.3"
+    - UTPLSQL_VERSION="v3.0.4"
+    - UTPLSQL_VERSION="v3.1.1"
+    - UTPLSQL_VERSION="v3.1.2"
+    - UTPLSQL_VERSION="v3.1.3"
+    - UTPLSQL_VERSION="v3.1.6"
+    - UTPLSQL_VERSION="v3.1.7"
+    - UTPLSQL_VERSION="v3.1.8"
+    - UTPLSQL_VERSION="develop"
+      UTPLSQL_FILE="utPLSQL"
 
 cache:
   directories:
@@ -27,7 +43,6 @@ cache:
     - $MAVEN_CFG
 
 install:
-  - bash .travis/maven_cfg.sh
   - bash .travis/start_db.sh
   - bash .travis/install_utplsql.sh
   - bash .travis/install_demo_project.sh
@@ -43,11 +58,15 @@ before_deploy:
 deploy:
   - provider: releases
     api_key: $GITHUB_API_TOKEN
-    file: utPLSQL-cli.zip
+    file:
+      - utPLSQL-cli.zip
+      - utPLSQL-cli.zip.md5
     skip_cleanup: true
     on:
       repository: utPLSQL/utPLSQL-cli
       tags: true
+      # Use only first job "#xxx.1" to publish artifacts
+      condition: "${TRAVIS_JOB_NUMBER} =~ \\.1$"
   - provider: bintray
     file: bintray.json
     user: ${BINTRAY_USER}
@@ -57,6 +76,8 @@ deploy:
     on:
       repository: utPLSQL/utPLSQL-cli
       branch: develop
+      # Use only first job "#xxx.1" to publish artifacts
+      condition: "${TRAVIS_JOB_NUMBER} =~ \\.1$"
 
 notifications:
   slack:

.idea/codeStyles/codeStyleConfig.xml

@@ -2,19 +2,19 @@
 set -ev
 
 VERSION=`date +%Y%m%d%H%M`
+MVN_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+# Strip -SNAPSHOT if exists
+MVN_VERSION=${MVN_VERSION/-SNAPSHOT/}
 
 #overcome maven assemble issue: https://github.com/mojohaus/appassembler/issues/61
 sed -i '/CYGWIN\*) cygwin=true/c\  CYGWIN*|MINGW*) cygwin=true ;;' target/appassembler/bin/utplsql
 
 mkdir dist
 mv target/appassembler utPLSQL-cli
-# Remove Oracle libraries du to licensing problems
-rm -f utPLSQL-cli/lib/ucp*.jar
-rm -f utPLSQL-cli/lib/ojdbc8*.jar
-rm -f utPLSQL-cli/lib/orai18n*.jar
 
 zip -r -q dist/utPLSQL-cli-${TRAVIS_BRANCH}-${VERSION}.zip utPLSQL-cli
 zip -r -q utPLSQL-cli.zip utPLSQL-cli
+md5sum utPLSQL-cli.zip  --tag > utPLSQL-cli.zip.md5
 
 cat > bintray.json <<EOF
 {
@@ -26,7 +26,7 @@ cat > bintray.json <<EOF
     "vcs_url": "https://github.com/utPLSQL/utPLSQL-cli.git",
     "licenses": [ "MIT" ]
   },
-  "version": { "name": "${TRAVIS_BRANCH}" },
+  "version": { "name": "${MVN_VERSION}" },
   "files": [ { "includePattern": "dist/(.*)", "uploadPattern": "\$1" } ],
   "publish": true
 }

.idea/dictionaries/utPLSQL.xml

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -ev
+set -evx
 cd $(dirname $(readlink -f $0))
 
 PROJECT_FILE="utPLSQL-demo-project"
@@ -13,32 +13,22 @@ grant select any dictionary to ${DB_USER};
 exit
 SQL
 
-cd ${PROJECT_FILE}
+cd /${PROJECT_FILE}
 sqlplus -S -L ${DB_USER}/${DB_PASS}@//127.0.0.1:1521/xe <<SQL
 whenever sqlerror exit failure rollback
 whenever oserror  exit failure rollback
+@source/install.sql
+exit
+SQL
 
-@source/award_bonus/employees_test.sql
-@source/award_bonus/award_bonus.prc
-
-@source/between_string/betwnstr.fnc
-
-@source/remove_rooms_by_name/rooms.sql
-@source/remove_rooms_by_name/remove_rooms_by_name.prc
-
-@test/award_bonus/test_award_bonus.pks
-@test/award_bonus/test_award_bonus.pkb
-
-@test/between_string/test_betwnstr.pks
-@test/between_string/test_betwnstr.pkb
-
-@test/remove_rooms_by_name/test_remove_rooms_by_name.pks
-@test/remove_rooms_by_name/test_remove_rooms_by_name.pkb
-
+sqlplus -S -L ${DB_USER}/${DB_PASS}@//127.0.0.1:1521/xe <<SQL
+whenever sqlerror exit failure rollback
+whenever oserror  exit failure rollback
+@test/install.sql
 exit
 SQL
 EOF
 
-docker cp ./$PROJECT_FILE $ORACLE_VERSION:/$PROJECT_FILE
-docker cp ./demo_project.sh.tmp $ORACLE_VERSION:/demo_project.sh
-docker exec $ORACLE_VERSION bash demo_project.sh
+docker cp ./${PROJECT_FILE} oracle:/${PROJECT_FILE}
+docker cp ./demo_project.sh.tmp oracle:/demo_project.sh
+docker exec oracle bash /demo_project.sh