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 01/11] 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 02/11] 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 03/11] 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 04/11] 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 05/11] 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 06/11] 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 07/11] 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 08/11] 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 09/11] 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 10/11] 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 11/11] 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: