From 328a60705e0431ad66eb01d3da5951e6019cd1d6 Mon Sep 17 00:00:00 2001 From: Simon Martinelli Date: Mon, 13 Jun 2022 15:17:35 +0200 Subject: [PATCH 01/36] Update for next development version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f322df9..b52b2d2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.utplsql cli - 3.1.9 + 3.1.10-SNAPSHOT utPLSQL CLI CLI for running Unit Tests with utPLSQL v3+. From 2551303b337b84afd0b92d21525be71b9b26cd27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Fri, 15 Jul 2022 07:15:00 +0100 Subject: [PATCH 02/36] Update README.md --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ba9fe0f..fcb6dee 100644 --- a/README.md +++ b/README.md @@ -116,9 +116,11 @@ utplsql run "my/Username"/"myP@ssword"@connectstring If only schema is provided, then all suites owner by that schema are executed. If -p is omitted, the current schema is used. ---tags=tags - A comma separated list of tags to run. - Format: --tags=tag1[,tag2[,tag3]] - +--tags=tags - A comma separated list of tags to include or exclude in the run. + The excluded tags must be preceeded by a `-` (minus) sign and the entire expression must be surrounded by escaped doubleqotes in command line. + Format: --tags=tag1[,tag2,...,tagN] + or + Format: --tags=\"-tag1\"[,\"-tag2\",...,tagN] -f=format - A reporter to be used for reporting. (--format) If no -f option is provided, the default ut_documentation_reporter is used. See reporters command for possible values From c43d7897138a8bbbac54c01d735b78b4c78792b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Dec 2023 22:12:21 +0000 Subject: [PATCH 03/36] Bump ch.qos.logback:logback-classic from 1.2.11 to 1.2.13 Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.2.11 to 1.2.13. - [Commits](https://github.com/qos-ch/logback/compare/v_1.2.11...v_1.2.13) --- updated-dependencies: - dependency-name: ch.qos.logback:logback-classic dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b52b2d2..3a22ed2 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ ch.qos.logback logback-classic - 1.2.11 + 1.2.13 info.picocli From 87dbd2cb2a96c94d177487a754576f0231aac159 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Mon, 16 Mar 2026 16:02:17 +0200 Subject: [PATCH 04/36] Update of Github action Actions versions --- .github/workflows/build.yml | 6 +++--- .github/workflows/release.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9540ee2..01131b1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,7 +40,7 @@ jobs: utplsql_file: "utPLSQLv3.0.0" services: oracle: - image: gvenzl/oracle-xe:18.4.0-slim + image: gvenzl/ooci-oracle-free:slim-faststart env: ORACLE_PASSWORD: oracle ports: @@ -53,10 +53,10 @@ jobs: --name oracle steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v5 with: distribution: 'adopt' java-version: ${{matrix.jdk}} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bf6c098..b2e8c1b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,10 +14,10 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v5 with: distribution: 'adopt' java-version: 8 @@ -26,7 +26,7 @@ jobs: run: mvn package appassembler:assemble assembly:single checksum:files -DskipTests - name: Release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2.6 with: files: | target/utPLSQL-cli.zip From d6d337944942651be27bc89f49713380c13c205b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Mon, 16 Mar 2026 16:19:36 +0200 Subject: [PATCH 05/36] Update of docker DB version --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 01131b1..759c094 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,7 +40,7 @@ jobs: utplsql_file: "utPLSQLv3.0.0" services: oracle: - image: gvenzl/ooci-oracle-free:slim-faststart + image: gvenzl/oracle-free:23-slim-faststart env: ORACLE_PASSWORD: oracle ports: From 5f8ebdb5217e7e2b6a8afd2702a3d4227fed7190 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Mon, 16 Mar 2026 16:35:44 +0200 Subject: [PATCH 06/36] Update of deployment scripts --- .../scripts}/create_api_user.sh | 0 .../scripts}/create_release.sh | 0 .../scripts}/install_demo_project.sh | 0 .../scripts}/install_utplsql.sh | 0 .github/workflows/build.yml | 9 +- .travis.yml | 87 ------------------- .travis/start_db.sh | 14 --- 7 files changed, 4 insertions(+), 106 deletions(-) rename {.travis => .github/scripts}/create_api_user.sh (100%) rename {.travis => .github/scripts}/create_release.sh (100%) rename {.travis => .github/scripts}/install_demo_project.sh (100%) rename {.travis => .github/scripts}/install_utplsql.sh (100%) delete mode 100644 .travis.yml delete mode 100755 .travis/start_db.sh diff --git a/.travis/create_api_user.sh b/.github/scripts/create_api_user.sh similarity index 100% rename from .travis/create_api_user.sh rename to .github/scripts/create_api_user.sh diff --git a/.travis/create_release.sh b/.github/scripts/create_release.sh similarity index 100% rename from .travis/create_release.sh rename to .github/scripts/create_release.sh diff --git a/.travis/install_demo_project.sh b/.github/scripts/install_demo_project.sh similarity index 100% rename from .travis/install_demo_project.sh rename to .github/scripts/install_demo_project.sh diff --git a/.travis/install_utplsql.sh b/.github/scripts/install_utplsql.sh similarity index 100% rename from .travis/install_utplsql.sh rename to .github/scripts/install_utplsql.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 759c094..d194de9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,11 +20,9 @@ jobs: 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_URL: "127.0.0.1:1521:FREEPDB1" DB_USER: app DB_PASS: app @@ -43,6 +41,7 @@ jobs: image: gvenzl/oracle-free:23-slim-faststart env: ORACLE_PASSWORD: oracle + SERVICE_NAME: FREEPDB1 ports: - 1521:1521 options: >- @@ -62,10 +61,10 @@ jobs: java-version: ${{matrix.jdk}} - name: Install utplsql - run: .travis/install_utplsql.sh + run: .github/scripts/install_utplsql.sh - name: Install demo project - run: .travis/install_demo_project.sh + run: .github/scripts/install_demo_project.sh - name: Build and Test run: mvn verify jar:jar appassembler:assemble diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 76b64a0..0000000 --- a/.travis.yml +++ /dev/null @@ -1,87 +0,0 @@ -sudo: required -language: java - -services: - - docker - -jdk: - - openjdk8 - -env: - global: - - DOCKER_CFG=$HOME/.docker - - DOCKER_REPO="utplsqlv3/oracledb" - - CACHE_DIR=$HOME/.cache - - MAVEN_HOME=/usr/local/maven - - MAVEN_CFG=$HOME/.m2 - - DB_URL="127.0.0.1:1521:XE" - - DB_USER=app - - 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: - - $DOCKER_CFG - - $CACHE_DIR - - $MAVEN_CFG - -install: - - bash .travis/start_db.sh - - bash .travis/install_utplsql.sh - - bash .travis/install_demo_project.sh - -script: - - mvn package -DskipTests - - mvn package verify jar:jar appassembler:assemble - -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 - - 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} - key: ${BINTRAY_API_KEY} - dry-run: false - skip_cleanup: true - on: - repository: utPLSQL/utPLSQL-cli - branch: develop - # Use only first job "#xxx.1" to publish artifacts - condition: "${TRAVIS_JOB_NUMBER} =~ \\.1$" - -notifications: - slack: - rooms: - - secure: "jTPq4AcWQdWp1rB175c05ei/1lXZF1DBoqiKl9PPe7f8vqXS2QLPXMwGTEkZ1YnqL2MPZMB+50Gw5RhLKQ+t+9pN7ejLO0D8ULi1e96PDU5ZL5pNvRglH6U/lR5iT1CjELUuraDXDJ98Vu4gluLMiwTtFYQhNrOoA2V84L+8fF7rGjbGl4/zOXA9RQ4YAcOomJesb4vE7BCjhDjUuMW43xjNWg2s0WAiF+fC1HY/tsBMb1CGfpVULnO5ES5bKtUv/aGtySzH0vXilGDUvhZ/8mdaRn6uxpzcqrFdAyW8elSD28CypcYoxy6Myudw3SFiRPs0/Z02VXvm8DQtU/lcFEnaO7dMG+FpFhsWbrEjcRS6R7ve8uc7e/WuaQhtNVzSTOzRe+JFPGP9FOcYN+AcW2NJFILV9yT7+X/MPIB0OMxuwaPmVgtoyx0oec2nw05azmDr76P2e1XLnKtxa8ouwvPx8EMgApnXSR6VmLGu/w8nmtvIWjEAJ88cdGhwBagtyAsn2frzHq8aKpMziDRYvw4ivwGAeHJFsDtdRXzSbxhxmjl6+is3P0g0iAfojQ/Pzd4GugSYwqRQLLE7dUE0FAKXhKAAQAkjRZxik2+w6jgG8PuLuHdR4pm7C9srL+WAX8aFq/RQXE7BoIdqiZ5TMekw8d6eCRTjcRHsa3pPAd0=" - on_success: change - on_failure: always diff --git a/.travis/start_db.sh b/.travis/start_db.sh deleted file mode 100755 index 2367d64..0000000 --- a/.travis/start_db.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -set -ev - -# If docker credentials are not cached, do the login. -if [ ! -f $DOCKER_CFG/config.json ]; then - docker login -u "$DOCKER_USER" -p "$DOCKER_PASSWORD" -else - echo "Using docker login from cache..." -fi - -# Pull the specified db version from docker hub. -docker pull $DOCKER_REPO:$ORACLE_VERSION -docker run -d --name $ORACLE_VERSION $DOCKER_OPTIONS -p 1521:1521 $DOCKER_REPO:$ORACLE_VERSION -docker logs -f $ORACLE_VERSION | grep -m 1 "DATABASE IS READY TO USE!" --line-buffered From abad5e99d42800c138defa847e83ef1e19314143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Mon, 16 Mar 2026 16:37:12 +0200 Subject: [PATCH 07/36] Update of deployment scripts --- .github/scripts/create_api_user.sh | 2 +- .github/scripts/install_demo_project.sh | 6 +++--- .github/scripts/install_utplsql.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/scripts/create_api_user.sh b/.github/scripts/create_api_user.sh index c898f15..bc8edde 100755 --- a/.github/scripts/create_api_user.sh +++ b/.github/scripts/create_api_user.sh @@ -1,7 +1,7 @@ #!/bin/bash set -ev -sqlplus -S -L sys/oracle@//127.0.0.1:1521/xe AS SYSDBA < demo_project.sh.tmp < install.sh.tmp < Date: Mon, 16 Mar 2026 16:54:27 +0200 Subject: [PATCH 08/36] Update of deployment scripts --- .github/scripts/create_api_user.sh | 2 +- .github/scripts/install_demo_project.sh | 6 +++--- .github/scripts/install_utplsql.sh | 2 +- .github/workflows/build.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/scripts/create_api_user.sh b/.github/scripts/create_api_user.sh index bc8edde..853a1a6 100755 --- a/.github/scripts/create_api_user.sh +++ b/.github/scripts/create_api_user.sh @@ -1,7 +1,7 @@ #!/bin/bash set -ev -sqlplus -S -L sys/oracle@//127.0.0.1:1521/${SERVICE_NAME} AS SYSDBA < demo_project.sh.tmp < install.sh.tmp < Date: Mon, 16 Mar 2026 17:07:23 +0200 Subject: [PATCH 09/36] Update of deployment scripts --- .github/scripts/install_demo_project.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/scripts/install_demo_project.sh b/.github/scripts/install_demo_project.sh index 4a98b2e..0acb2f2 100755 --- a/.github/scripts/install_demo_project.sh +++ b/.github/scripts/install_demo_project.sh @@ -7,6 +7,7 @@ git clone -b develop --single-branch https://github.com/utPLSQL/utPLSQL-demo-pro cat > demo_project.sh.tmp < Date: Mon, 16 Mar 2026 17:11:51 +0200 Subject: [PATCH 10/36] Update of deployment scripts --- .github/workflows/build.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4026c3e..d198cd8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,19 +23,15 @@ jobs: UTPLSQL_VERSION: ${{matrix.utplsql_version}} UTPLSQL_FILE: ${{matrix.utplsql_file}} DB_URL: "localhost:1521/FREEPDB1" - DB_USER: app - DB_PASS: app + 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_version: ["v3.1.11","v3.1.12","v3.1.13","v3.1.14","develop"] utplsql_file: ["utPLSQL"] jdk: ['8'] - include: - - utplsql_version: "v3.0.0" - jdk: '8' - utplsql_file: "utPLSQLv3.0.0" services: oracle: image: gvenzl/oracle-free:23-slim-faststart From 36dd7911c689193f1784dc8a36147a5578a835a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Mon, 16 Mar 2026 17:19:30 +0200 Subject: [PATCH 11/36] Update of deployment scripts --- .github/scripts/install_demo_project.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/scripts/install_demo_project.sh b/.github/scripts/install_demo_project.sh index 0acb2f2..9a83ed0 100755 --- a/.github/scripts/install_demo_project.sh +++ b/.github/scripts/install_demo_project.sh @@ -8,8 +8,13 @@ git clone -b develop --single-branch https://github.com/utPLSQL/utPLSQL-demo-pro cat > demo_project.sh.tmp < Date: Tue, 14 Apr 2026 11:30:02 +0300 Subject: [PATCH 12/36] Fixing build pipeline. --- .github/scripts/install_demo_project.sh | 56 ++++++++++++------------- .github/workflows/build.yml | 2 +- pom.xml | 7 ---- 3 files changed, 29 insertions(+), 36 deletions(-) diff --git a/.github/scripts/install_demo_project.sh b/.github/scripts/install_demo_project.sh index 9a83ed0..e244f55 100755 --- a/.github/scripts/install_demo_project.sh +++ b/.github/scripts/install_demo_project.sh @@ -5,36 +5,36 @@ cd $(dirname $(readlink -f $0)) PROJECT_FILE="utPLSQL-demo-project" git clone -b develop --single-branch https://github.com/utPLSQL/utPLSQL-demo-project.git -cat > demo_project.sh.tmp < demo_project.sh.tmp <<- EOF + sqlplus -S -L sys/oracle@//localhost:1521/${SERVICE_NAME} AS SYSDBA <<- SQL + PROMPT Creating Database User ${DB_USER} + PROMPT create user ${DB_USER} identified by ${DB_PASS} quota unlimited on USERS default tablespace USERS; + PROMPT grant create session, create procedure, create type, create table, create sequence, create view to ${DB_USER}; + PROMPT grant connect to ${DB_USER}; + PROMPT grant select any dictionary to ${DB_USER}; + create user ${DB_USER} identified by ${DB_PASS} quota unlimited on USERS default tablespace USERS; + grant create session, create procedure, create type, create table, create sequence, create view to ${DB_USER}; + grant connect to ${DB_USER}; + grant select any dictionary to ${DB_USER}; + exit + SQL -cd /${PROJECT_FILE} -sqlplus -S -L ${DB_USER}/${DB_PASS}@//localhost:1521/${SERVICE_NAME} < org.apache.maven.plugins maven-failsafe-plugin - - - ${dbUrl} - ${dbUser} - ${dbPass} - - From 322c6d2bc4f89a5c0042d66f2ef44e751cf87e48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Tue, 14 Apr 2026 11:55:51 +0300 Subject: [PATCH 13/36] Fixing build pipeline. --- .github/scripts/create_api_user.sh | 2 +- .github/scripts/install_demo_project.sh | 6 +++--- .github/scripts/install_utplsql.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/scripts/create_api_user.sh b/.github/scripts/create_api_user.sh index 853a1a6..16328cd 100755 --- a/.github/scripts/create_api_user.sh +++ b/.github/scripts/create_api_user.sh @@ -1,7 +1,7 @@ #!/bin/bash set -ev -sqlplus -S -L sys/oracle@//localhost:1521/${SERVICE_NAME} AS SYSDBA < demo_project.sh.tmp <<- EOF - sqlplus -S -L sys/oracle@//localhost:1521/${SERVICE_NAME} AS SYSDBA <<- SQL + sqlplus -S -L sys/oracle@${DB_URL} AS SYSDBA <<- SQL PROMPT Creating Database User ${DB_USER} PROMPT create user ${DB_USER} identified by ${DB_PASS} quota unlimited on USERS default tablespace USERS; PROMPT grant create session, create procedure, create type, create table, create sequence, create view to ${DB_USER}; @@ -20,7 +20,7 @@ cat > demo_project.sh.tmp <<- EOF SQL cd /${PROJECT_FILE} - sqlplus -S -L ${DB_USER}/${DB_PASS}@//localhost:1521/${SERVICE_NAME} <<- SQL + sqlplus -S -L ${DB_USER}/${DB_PASS}@${DB_URL} <<- SQL whenever sqlerror exit failure rollback whenever oserror exit failure rollback PROMPT Installing sources of demo project into schema ${DB_USER} @@ -28,7 +28,7 @@ cat > demo_project.sh.tmp <<- EOF exit SQL - sqlplus -S -L ${DB_USER}/${DB_PASS}@//localhost:1521/${SERVICE_NAME} <<- SQL + sqlplus -S -L ${DB_USER}/${DB_PASS}@${DB_URL} <<- SQL whenever sqlerror exit failure rollback whenever oserror exit failure rollback PROMPT Installing tests for demo project into schema ${DB_USER} diff --git a/.github/scripts/install_utplsql.sh b/.github/scripts/install_utplsql.sh index a2943b3..8aee546 100755 --- a/.github/scripts/install_utplsql.sh +++ b/.github/scripts/install_utplsql.sh @@ -15,7 +15,7 @@ chmod -R go+w ./${UTPLSQL_FILE}/{source,examples} # Create a temporary install script. cat > install.sh.tmp < Date: Tue, 14 Apr 2026 12:03:38 +0300 Subject: [PATCH 14/36] Investigation of pipeline issue --- .github/scripts/create_api_user.sh | 9 ++------- .github/scripts/install_demo_project.sh | 3 +++ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/scripts/create_api_user.sh b/.github/scripts/create_api_user.sh index 16328cd..b9452e2 100755 --- a/.github/scripts/create_api_user.sh +++ b/.github/scripts/create_api_user.sh @@ -1,17 +1,12 @@ #!/bin/bash set -ev +echo Running command: sqlplus -S -L sys/oracle@${DB_URL} AS SYSDBA sqlplus -S -L sys/oracle@${DB_URL} AS SYSDBA < demo_project.sh.tmp <<- EOF sqlplus -S -L sys/oracle@${DB_URL} AS SYSDBA <<- SQL + PROMPT Connected to ${DB_URL} PROMPT Creating Database User ${DB_USER} PROMPT create user ${DB_USER} identified by ${DB_PASS} quota unlimited on USERS default tablespace USERS; PROMPT grant create session, create procedure, create type, create table, create sequence, create view to ${DB_USER}; @@ -23,6 +24,7 @@ cat > demo_project.sh.tmp <<- EOF sqlplus -S -L ${DB_USER}/${DB_PASS}@${DB_URL} <<- SQL whenever sqlerror exit failure rollback whenever oserror exit failure rollback + PROMPT Connected to ${DB_URL} PROMPT Installing sources of demo project into schema ${DB_USER} @source/install.sql exit @@ -31,6 +33,7 @@ cat > demo_project.sh.tmp <<- EOF sqlplus -S -L ${DB_USER}/${DB_PASS}@${DB_URL} <<- SQL whenever sqlerror exit failure rollback whenever oserror exit failure rollback + PROMPT Connected to ${DB_URL} PROMPT Installing tests for demo project into schema ${DB_USER} @test/install.sql exit From 51066dd098f0151d5efa31d93455db238f79b403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Tue, 14 Apr 2026 12:09:35 +0300 Subject: [PATCH 15/36] Investigation of pipeline issue --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1827681..facbb04 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,9 @@ jobs: image: gvenzl/oracle-free:23-slim-faststart env: ORACLE_PASSWORD: oracle - SERVICE_NAME: FREEPDB1 + DB_URL: "//localhost:1521/FREEPDB1" + DB_USER: APP + DB_PASS: APP ports: - 1521:1521 options: >- From 16bc3350298fb50f68204ab7432dfecbd0a99e38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Tue, 14 Apr 2026 12:23:02 +0300 Subject: [PATCH 16/36] Fixing issue with install script --- .github/scripts/install_demo_project.sh | 60 ++++++++++++------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/.github/scripts/install_demo_project.sh b/.github/scripts/install_demo_project.sh index 38754e5..360943c 100755 --- a/.github/scripts/install_demo_project.sh +++ b/.github/scripts/install_demo_project.sh @@ -6,38 +6,38 @@ PROJECT_FILE="utPLSQL-demo-project" git clone -b develop --single-branch https://github.com/utPLSQL/utPLSQL-demo-project.git cat > demo_project.sh.tmp <<- EOF - sqlplus -S -L sys/oracle@${DB_URL} AS SYSDBA <<- SQL - PROMPT Connected to ${DB_URL} - PROMPT Creating Database User ${DB_USER} - PROMPT create user ${DB_USER} identified by ${DB_PASS} quota unlimited on USERS default tablespace USERS; - PROMPT grant create session, create procedure, create type, create table, create sequence, create view to ${DB_USER}; - PROMPT grant connect to ${DB_USER}; - PROMPT grant select any dictionary to ${DB_USER}; - create user ${DB_USER} identified by ${DB_PASS} quota unlimited on USERS default tablespace USERS; - grant create session, create procedure, create type, create table, create sequence, create view to ${DB_USER}; - grant connect to ${DB_USER}; - grant select any dictionary to ${DB_USER}; - exit - SQL +sqlplus -S -L sys/oracle@${DB_URL} AS SYSDBA <<- SQL + PROMPT Connected to ${DB_URL} + PROMPT Creating Database User ${DB_USER} + PROMPT create user ${DB_USER} identified by ${DB_PASS} quota unlimited on USERS default tablespace USERS; + PROMPT grant create session, create procedure, create type, create table, create sequence, create view to ${DB_USER}; + PROMPT grant connect to ${DB_USER}; + PROMPT grant select any dictionary to ${DB_USER}; + create user ${DB_USER} identified by ${DB_PASS} quota unlimited on USERS default tablespace USERS; + grant create session, create procedure, create type, create table, create sequence, create view to ${DB_USER}; + grant connect to ${DB_USER}; + grant select any dictionary to ${DB_USER}; + exit +SQL - cd /${PROJECT_FILE} - sqlplus -S -L ${DB_USER}/${DB_PASS}@${DB_URL} <<- SQL - whenever sqlerror exit failure rollback - whenever oserror exit failure rollback - PROMPT Connected to ${DB_URL} - PROMPT Installing sources of demo project into schema ${DB_USER} - @source/install.sql - exit - SQL +cd /${PROJECT_FILE} +sqlplus -S -L ${DB_USER}/${DB_PASS}@${DB_URL} <<- SQL + whenever sqlerror exit failure rollback + whenever oserror exit failure rollback + PROMPT Connected to ${DB_URL} + PROMPT Installing sources of demo project into schema ${DB_USER} + @source/install.sql + exit +SQL - sqlplus -S -L ${DB_USER}/${DB_PASS}@${DB_URL} <<- SQL - whenever sqlerror exit failure rollback - whenever oserror exit failure rollback - PROMPT Connected to ${DB_URL} - PROMPT Installing tests for demo project into schema ${DB_USER} - @test/install.sql - exit - SQL +sqlplus -S -L ${DB_USER}/${DB_PASS}@${DB_URL} <<- SQL + whenever sqlerror exit failure rollback + whenever oserror exit failure rollback + PROMPT Connected to ${DB_URL} + PROMPT Installing tests for demo project into schema ${DB_USER} + @test/install.sql +exit +SQL EOF docker cp ./${PROJECT_FILE} oracle:/${PROJECT_FILE} From 9ffe1dcd3336bca3cb78fa2efe6ef2304cbeff65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Tue, 14 Apr 2026 13:00:56 +0300 Subject: [PATCH 17/36] Fixing issue with build process --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index facbb04..01ab755 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -65,7 +65,7 @@ jobs: run: .github/scripts/install_demo_project.sh - name: Build and Test - run: mvn verify jar:jar appassembler:assemble + run: mvn verify appassembler:assemble slack-workflow-status: if: always() From e2d5697098ca3f9cd4ec5f4e2c919449a42ee27b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Tue, 14 Apr 2026 13:53:48 +0300 Subject: [PATCH 18/36] Adding JDK 11 and 17 to build and test process --- .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 01ab755..0a3211f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: matrix: utplsql_version: ["v3.1.11","v3.1.12","v3.1.13","v3.1.14","develop"] utplsql_file: ["utPLSQL"] - jdk: ['8'] + jdk: ['8', '11', '17'] services: oracle: image: gvenzl/oracle-free:23-slim-faststart diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b2e8c1b..bd819e2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,7 @@ name: Release on: push: tags: - - "*.*.*" + - "v*.*.*" workflow_dispatch: From 43effbeb15f834f7f77043882089c18e5de6359f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Tue, 14 Apr 2026 13:58:45 +0300 Subject: [PATCH 19/36] Update JDBC version to 19.6.0.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a07e501..72c2cab 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ 1.8 1.8 5.5.2 - 19.3.0.0 + 19.6.0.0 local From 68958d50fca0031f1543f0cccc10d2ffe0bf1f66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Tue, 14 Apr 2026 14:01:09 +0300 Subject: [PATCH 20/36] Update JDBC version to 21.9.0.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 72c2cab..d637161 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ 1.8 1.8 5.5.2 - 19.6.0.0 + 21.9.0.0 local From 2d08c432564740fcad9b75419d6d672cbd191ecb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Tue, 14 Apr 2026 14:09:36 +0300 Subject: [PATCH 21/36] Switching to newer java versions --- .github/workflows/build.yml | 4 ++-- pom.xml | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0a3211f..b0af34d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,9 +29,9 @@ jobs: strategy: fail-fast: false matrix: - utplsql_version: ["v3.1.11","v3.1.12","v3.1.13","v3.1.14","develop"] + utplsql_version: ["v3.1.14","develop"] utplsql_file: ["utPLSQL"] - jdk: ['8', '11', '17'] + jdk: ['8', '11', '17','21','25'] services: oracle: image: gvenzl/oracle-free:23-slim-faststart diff --git a/pom.xml b/pom.xml index d637161..4225ade 100644 --- a/pom.xml +++ b/pom.xml @@ -12,8 +12,7 @@ UTF-8 - 1.8 - 1.8 + 11 5.5.2 21.9.0.0 local From d37d7853625d7fb62228a5124708d7d390708295 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Tue, 14 Apr 2026 14:50:29 +0300 Subject: [PATCH 22/36] Attempting to fix Java11+ compatibility issue. --- .../InitializableOracleDataSource.java | 92 +++++++++++++++++-- 1 file changed, 82 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/utplsql/cli/datasource/InitializableOracleDataSource.java b/src/main/java/org/utplsql/cli/datasource/InitializableOracleDataSource.java index db32b1a..711e115 100644 --- a/src/main/java/org/utplsql/cli/datasource/InitializableOracleDataSource.java +++ b/src/main/java/org/utplsql/cli/datasource/InitializableOracleDataSource.java @@ -2,31 +2,103 @@ import oracle.jdbc.pool.OracleDataSource; +import javax.sql.DataSource; +import java.io.PrintWriter; import java.sql.CallableStatement; import java.sql.Connection; +import java.sql.ConnectionBuilder; import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; +import java.util.logging.Logger; -public class InitializableOracleDataSource extends OracleDataSource { +public class InitializableOracleDataSource implements DataSource { + private final OracleDataSource delegate; private String initSql; public InitializableOracleDataSource() throws SQLException { + this.delegate = new OracleDataSource(); } + // --- URL / credentials passthrough (mirrors what callers used before) --- + + public void setURL(String url) throws SQLException { + delegate.setURL(url); + } + + public void setUser(String user) { + delegate.setUser(user); + } + + public void setPassword(String password) { + delegate.setPassword(password); + } + + // --- Core DataSource methods --- + @Override public Connection getConnection() throws SQLException { - Connection con = super.getConnection(); - - if ( initSql != null && !initSql.isEmpty() ) { - try (CallableStatement stmt = con.prepareCall(initSql)) { - stmt.execute(); - } - } + Connection con = delegate.getConnection(); + runInitSql(con); + return con; + } + @Override + public Connection getConnection(String username, String password) throws SQLException { + Connection con = delegate.getConnection(username, password); + runInitSql(con); return con; } - public void setConnectionInitSql( String sql ) { + public void setConnectionInitSql(String sql) { this.initSql = sql; } -} + + // --- DataSource boilerplate --- + + @Override + public PrintWriter getLogWriter() throws SQLException { + return delegate.getLogWriter(); + } + + @Override + public void setLogWriter(PrintWriter out) throws SQLException { + delegate.setLogWriter(out); + } + + @Override + public void setLoginTimeout(int seconds) throws SQLException { + delegate.setLoginTimeout(seconds); + } + + @Override + public int getLoginTimeout() throws SQLException { + return delegate.getLoginTimeout(); + } + + @Override + public Logger getParentLogger() throws SQLFeatureNotSupportedException { + return delegate.getParentLogger(); + } + + @Override + public T unwrap(Class iface) throws SQLException { + if (iface.isInstance(delegate)) return iface.cast(delegate); + return delegate.unwrap(iface); + } + + @Override + public boolean isWrapperFor(Class iface) throws SQLException { + return iface.isInstance(delegate) || delegate.isWrapperFor(iface); + } + + // --- Private helpers --- + + private void runInitSql(Connection con) throws SQLException { + if (initSql != null && !initSql.isEmpty()) { + try (CallableStatement stmt = con.prepareCall(initSql)) { + stmt.execute(); + } + } + } +} \ No newline at end of file From 805595ea2d8de70dd255c50ae7c35d0c2896840f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Tue, 14 Apr 2026 14:57:20 +0300 Subject: [PATCH 23/36] Attempting to fix Java11+ compatibility issue. --- .../utplsql/cli/datasource/InitializableOracleDataSource.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/utplsql/cli/datasource/InitializableOracleDataSource.java b/src/main/java/org/utplsql/cli/datasource/InitializableOracleDataSource.java index 711e115..0aa44fa 100644 --- a/src/main/java/org/utplsql/cli/datasource/InitializableOracleDataSource.java +++ b/src/main/java/org/utplsql/cli/datasource/InitializableOracleDataSource.java @@ -6,7 +6,6 @@ import java.io.PrintWriter; import java.sql.CallableStatement; import java.sql.Connection; -import java.sql.ConnectionBuilder; import java.sql.SQLException; import java.sql.SQLFeatureNotSupportedException; import java.util.logging.Logger; From 871c0e2cda1678b1d64aa4978c8df67ba500d7eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Tue, 14 Apr 2026 15:01:18 +0300 Subject: [PATCH 24/36] Attempting to fix Java11+ compatibility issue. --- .../org/utplsql/cli/datasource/TestedDataSourceProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java b/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java index 8f99cf3..74b2a54 100644 --- a/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java +++ b/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java @@ -46,7 +46,7 @@ public DataSource getDataSource() throws SQLException { return ds; } - private void setThickOrThinJdbcUrl(OracleDataSource ds) throws SQLException { + private void setThickOrThinJdbcUrl(InitializableOracleDataSource ds) throws SQLException { List errors = new ArrayList<>(); Throwable lastException = null; From 7b5f8709d69cdd93b459bee243bfd8f4ffaa9469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Tue, 14 Apr 2026 15:01:57 +0300 Subject: [PATCH 25/36] Cleanup imports --- .../org/utplsql/cli/datasource/TestedDataSourceProvider.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java b/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java index 74b2a54..34fbb4b 100644 --- a/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java +++ b/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java @@ -1,6 +1,5 @@ package org.utplsql.cli.datasource; -import oracle.jdbc.pool.OracleDataSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.utplsql.api.EnvironmentVariableUtil; From d144c850d97e5764f03e8a73743a13c7b7771277 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Wed, 22 Apr 2026 21:24:52 +0300 Subject: [PATCH 26/36] Update to latest utPLSQL-java-api version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c417838..37116a1 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ org.utplsql java-api - 3.1.9 + 3.2.2 compile From fdaeca7422f28e1cc6e4ac4d10d89c08b6e64a62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Wed, 22 Apr 2026 21:31:31 +0300 Subject: [PATCH 27/36] Update to latest utPLSQL-java-api version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 37116a1..5d36fe0 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.utplsql - java-api + utplsql-java-api 3.2.2 compile From 9b2caa0299692e79743149f5867d1f499a0617eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Wed, 22 Apr 2026 21:39:32 +0300 Subject: [PATCH 28/36] Remove JDK 8 from build process. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b0af34d..c654c37 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: matrix: utplsql_version: ["v3.1.14","develop"] utplsql_file: ["utPLSQL"] - jdk: ['8', '11', '17','21','25'] + jdk: ['11', '17', '21', '25'] services: oracle: image: gvenzl/oracle-free:23-slim-faststart From 1104e97585b8ab20252076de5624438e70074c36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Wed, 22 Apr 2026 21:40:33 +0300 Subject: [PATCH 29/36] Update pom dependencies --- pom.xml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 5d36fe0..cd07c75 100644 --- a/pom.xml +++ b/pom.xml @@ -13,8 +13,11 @@ UTF-8 11 - 5.5.2 - 21.9.0.0 + 5.12.2 + 21.18.0.0 + 4.7.7 + 1.2.11 + 2.2 local @@ -31,7 +34,6 @@ org.utplsql utplsql-java-api 3.2.2 - compile com.oracle.ojdbc @@ -55,18 +57,17 @@ ch.qos.logback logback-classic - 1.2.13 + ${logback.version} info.picocli picocli - 4.6.3 + ${picocli.version} com.oracle.database.jdbc - ojdbc8 + ojdbc11 ${oracle.jdbc.version} - compile com.oracle.database.jdbc @@ -78,7 +79,6 @@ com.oracle.database.nls orai18n ${oracle.jdbc.version} - compile @@ -91,7 +91,7 @@ org.hamcrest hamcrest - 2.1 + ${hamcrest.version} test @@ -101,7 +101,7 @@ org.codehaus.mojo appassembler-maven-plugin - 1.10 + 2.1.0 true true @@ -119,7 +119,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.0 + 3.5.5 **/*IT.java @@ -129,7 +129,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 2.22.0 + 3.5.5 @@ -142,7 +142,7 @@ org.apache.maven.plugins maven-assembly-plugin - 3.3.0 + 3.8.0 utPLSQL-cli false @@ -154,7 +154,7 @@ net.nicoulaj.maven.plugins checksum-maven-plugin - 1.10 + 1.11 @@ -172,7 +172,7 @@ com.amashchenko.maven.plugin gitflow-maven-plugin - 1.18.0 + 1.21.0 true From 35cb6473ff089a97ac5d50d38c984fc2c053bbe9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Wed, 22 Apr 2026 23:46:23 +0300 Subject: [PATCH 30/36] Removed explicit OJDBC dependency. The OJDBC is now brought with utPLSQL-java-api. Updated project version. Updated library dependencies. Update default values for local testing. --- .github/workflows/build.yml | 2 +- pom.xml | 77 +++++++++++-------- .../org/utplsql/cli/CliVersionInfoTest.java | 2 +- src/test/java/org/utplsql/cli/TestHelper.java | 6 +- 4 files changed, 48 insertions(+), 39 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c654c37..a80e7d7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,7 @@ jobs: ORACLE_PASSWORD: oracle DB_URL: "//localhost:1521/FREEPDB1" DB_USER: APP - DB_PASS: APP + DB_PASS: pass ports: - 1521:1521 options: >- diff --git a/pom.xml b/pom.xml index cd07c75..1a6796a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.utplsql cli - 3.1.10-SNAPSHOT + 3.2.01-SNAPSHOT utPLSQL CLI CLI for running Unit Tests with utPLSQL v3+. @@ -14,11 +14,13 @@ UTF-8 11 5.12.2 - 21.18.0.0 4.7.7 - 1.2.11 + 1.5.18 2.2 local + + utplsql + https://sonarcloud.io @@ -29,25 +31,44 @@ + + GitHub Issues + https://github.com/utPLSQL/utPLSQL-java-api/issues + + + + + Vinicius Avellar Moreira + utPLSQL.org + https://utplsql.org + amvinicius@gmail.com + + + Samuel Nitsche + utPLSQL.org + https://utplsql.org + derpesse@gmail.com + + + Jacek Gebal + utPLSQL.org + https://utplsql.org + jgebal@gmail.com + + + Simon Martinelli + utPLSQL.org + https://utplsql.org + simon@martineli.ch + https://martinelli.ch + + + org.utplsql utplsql-java-api 3.2.2 - - - com.oracle.ojdbc - ucp - - - com.oracle.ojdbc - ojdbc8 - - - com.oracle.ojdbc - orai18n - - javax.xml.bind @@ -64,23 +85,6 @@ picocli ${picocli.version} - - com.oracle.database.jdbc - ojdbc11 - ${oracle.jdbc.version} - - - com.oracle.database.jdbc - ucp - - - - - com.oracle.database.nls - orai18n - ${oracle.jdbc.version} - - org.junit.jupiter @@ -98,6 +102,11 @@ + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + org.codehaus.mojo appassembler-maven-plugin diff --git a/src/test/java/org/utplsql/cli/CliVersionInfoTest.java b/src/test/java/org/utplsql/cli/CliVersionInfoTest.java index 28db14c..4a89f27 100644 --- a/src/test/java/org/utplsql/cli/CliVersionInfoTest.java +++ b/src/test/java/org/utplsql/cli/CliVersionInfoTest.java @@ -8,6 +8,6 @@ class CliVersionInfoTest { @Test void getCliVersionInfo() { - assertTrue(CliVersionInfo.getVersion().startsWith("3.1")); + assertTrue(CliVersionInfo.getVersion().startsWith("3.2")); } } diff --git a/src/test/java/org/utplsql/cli/TestHelper.java b/src/test/java/org/utplsql/cli/TestHelper.java index 488654e..dddca1a 100644 --- a/src/test/java/org/utplsql/cli/TestHelper.java +++ b/src/test/java/org/utplsql/cli/TestHelper.java @@ -19,9 +19,9 @@ class TestHelper { private static String sPass; static { - sUrl = EnvironmentVariableUtil.getEnvValue("DB_URL", "192.168.99.100:1521:XE"); - sUser = EnvironmentVariableUtil.getEnvValue("DB_USER", "app"); - sPass = EnvironmentVariableUtil.getEnvValue("DB_PASS", "app"); + sUrl = EnvironmentVariableUtil.getEnvValue("DB_URL", "//localhost:1521/FREEPDB1"); + sUser = EnvironmentVariableUtil.getEnvValue("DB_USER", "APP"); + sPass = EnvironmentVariableUtil.getEnvValue("DB_PASS", "pass"); } static RunPicocliCommand createPicocliRunCommand(String... args ) { From 758059d3d81e10830be2bfad850211032a190ae5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Thu, 23 Apr 2026 12:31:26 +0300 Subject: [PATCH 31/36] Add check to see if assets are bundled in API. --- .../cli/reporters/LocalAssetsCoverageHTMLReporter.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/utplsql/cli/reporters/LocalAssetsCoverageHTMLReporter.java b/src/main/java/org/utplsql/cli/reporters/LocalAssetsCoverageHTMLReporter.java index 602ee7c..20483c1 100644 --- a/src/main/java/org/utplsql/cli/reporters/LocalAssetsCoverageHTMLReporter.java +++ b/src/main/java/org/utplsql/cli/reporters/LocalAssetsCoverageHTMLReporter.java @@ -29,13 +29,17 @@ public LocalAssetsCoverageHTMLReporter(String selfType, Object[] attributes) { public Reporter init(Connection con, CompatibilityProxy compatibilityProxy, ReporterFactory reporterFactory) throws SQLException { super.init(con, compatibilityProxy, reporterFactory); - if (hasOutputToFile()) { + if (hasOutputToFile() && assetsAreBundled()) { writeReportAssetsTo(getPhysicalAssetPath()); } return this; } + private static boolean assetsAreBundled() { + return CoverageHTMLReporter.class.getResource("/CoverageHTMLReporter") != null; + } + private String getNameOfOutputFile() { Path outputPath = Paths.get(options.getOutputFileName()); return outputPath.getName(outputPath.getNameCount() - 1).toString(); @@ -51,7 +55,7 @@ private Path getPhysicalAssetPath() { } private void setAssetsPathFromOptions() { - if (hasOutputToFile()) { + if (hasOutputToFile() && assetsAreBundled()) { setAssetsPath(getNameOfOutputFile() + "_assets/"); } } From 2f1528093fa668c4b050388d50c3b0846efb4b97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Thu, 23 Apr 2026 12:31:45 +0300 Subject: [PATCH 32/36] Update run action log info. --- src/main/java/org/utplsql/cli/RunAction.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/utplsql/cli/RunAction.java b/src/main/java/org/utplsql/cli/RunAction.java index de1be33..f79e63d 100644 --- a/src/main/java/org/utplsql/cli/RunAction.java +++ b/src/main/java/org/utplsql/cli/RunAction.java @@ -192,8 +192,8 @@ private void initDatabase(DataSource dataSource) throws SQLException { compatibilityProxy = checkFrameworkCompatibility(conn); - logger.info("Successfully connected to database. UtPLSQL core: {}", compatibilityProxy.getVersionDescription()); - logger.info("Oracle-Version: {}", new DefaultDatabaseInformation().getOracleVersion(conn)); + logger.info("Connected to Oracle database: {}", new DefaultDatabaseInformation().getOracleVersion(conn)); + logger.info("utPLSQL core: {}", compatibilityProxy.getVersionDescription()); } catch (SQLException e) { if (e.getErrorCode() == 1017 || e.getErrorCode() == 12514) { throw new DatabaseConnectionFailed(e); From 9d5e755f50628e72eacb192169bc6fef355005dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Thu, 23 Apr 2026 12:32:07 +0300 Subject: [PATCH 33/36] Update snapshot version to 3.2.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1a6796a..bef25e6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.utplsql cli - 3.2.01-SNAPSHOT + 3.2.0-SNAPSHOT utPLSQL CLI CLI for running Unit Tests with utPLSQL v3+. From 8876a0f294702d64a81b7d1a7a110358bbbb122b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Thu, 23 Apr 2026 12:52:51 +0300 Subject: [PATCH 34/36] Update utplsql-java-api dependency to 3.2.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bef25e6..7794397 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ org.utplsql utplsql-java-api - 3.2.2 + 3.2.3 javax.xml.bind From bfddc6f12b404490b63c160d68d67317fcb208a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Thu, 23 Apr 2026 13:23:34 +0300 Subject: [PATCH 35/36] Enable running the utPLSQL-cli build process directly from snapshot dependency. Fixed SNAPSHOTS repository. --- .github/workflows/api-snapshot-check.yml | 78 ++++++++++++++++++++++++ .github/workflows/build.yml | 1 + pom.xml | 16 ++--- 3 files changed, 84 insertions(+), 11 deletions(-) create mode 100644 .github/workflows/api-snapshot-check.yml diff --git a/.github/workflows/api-snapshot-check.yml b/.github/workflows/api-snapshot-check.yml new file mode 100644 index 0000000..7943180 --- /dev/null +++ b/.github/workflows/api-snapshot-check.yml @@ -0,0 +1,78 @@ +name: Test with utplsql-java-api snapshot + +on: + workflow_dispatch: + inputs: + api_version: + description: 'utplsql-java-api snapshot version (e.g. 3.2.4-SNAPSHOT)' + required: true + + repository_dispatch: + types: [utPLSQL-java-api-build] + +defaults: + run: + shell: bash + +jobs: + build: + name: Test with utplsql-java-api ${{ github.event.client_payload.api_version || inputs.api_version }} + runs-on: ubuntu-latest + env: + UTPLSQL_VERSION: develop + UTPLSQL_FILE: utPLSQL + DB_URL: "//localhost:1521/FREEPDB1" + DB_USER: APP + DB_PASS: APP + + services: + oracle: + image: gvenzl/oracle-free:23-slim-faststart + env: + ORACLE_PASSWORD: oracle + DB_URL: "//localhost:1521/FREEPDB1" + DB_USER: APP + DB_PASS: pass + ports: + - 1521:1521 + options: >- + --health-cmd healthcheck.sh + --health-interval 10s + --health-timeout 5s + --health-retries 10 + --name oracle + + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - uses: actions/setup-java@v5 + with: + distribution: 'adopt' + java-version: '17' + + - name: Install utplsql + run: .github/scripts/install_utplsql.sh + + - name: Install demo project + run: .github/scripts/install_demo_project.sh + + - name: Build and Test + run: | + API_VERSION="${{ github.event.client_payload.api_version || inputs.api_version }}" + mvn verify appassembler:assemble -Dutplsql-java-api.version="$API_VERSION" + + 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' diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a80e7d7..63d3a80 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,6 +2,7 @@ name: Build and test on: push: + branches: [ develop ] pull_request: branches: [ develop ] diff --git a/pom.xml b/pom.xml index 7794397..6888240 100644 --- a/pom.xml +++ b/pom.xml @@ -11,6 +11,7 @@ https://github.com/utPLSQL/utPLSQL-cli + 3.2.3 UTF-8 11 5.12.2 @@ -68,7 +69,7 @@ org.utplsql utplsql-java-api - 3.2.3 + ${utplsql-java-api.version} javax.xml.bind @@ -210,16 +211,9 @@ - utplsql-java-api - - https://packagecloud.io/utplsql/utplsql-java-api/maven2 - - - true - - - true - + central-snapshots + https://central.sonatype.com/repository/maven-snapshots/ + true From 63a2510c279b3b7e87f62669bf554b031d80c4f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Thu, 23 Apr 2026 13:25:12 +0300 Subject: [PATCH 36/36] Use utPLSQL v3.2.x for testing the cli. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 63d3a80..62f3368 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,7 +30,7 @@ jobs: strategy: fail-fast: false matrix: - utplsql_version: ["v3.1.14","develop"] + utplsql_version: ["v3.2.01","develop"] utplsql_file: ["utPLSQL"] jdk: ['11', '17', '21', '25'] services: