From 8ceee13351c9babeb6afa2ee994a8bc7b7a77f84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Thu, 23 Apr 2026 18:45:59 +0300 Subject: [PATCH 01/13] Update to Java 17. Update of utPLSQL-java-api version. Update of maven dependencies. Improved maintainability of tests - DB_URL and credentials are managed in env variables. --- .github/workflows/build.yml | 4 + README.md | 81 +++++++---------- pom.xml | 89 ++++++++++--------- scripts/0_start_db.sh | 1 - scripts/1_install_utplsql.sh | 2 +- scripts/2_install_demo_project.sh | 8 +- .../utplsql/maven/plugin/ReportChecker.java | 6 +- .../utplsql/maven/plugin/UtPlsqlMojoTest.java | 8 +- .../UtPlsqlMojoIT/exclude_object/pom.xml | 2 +- .../UtPlsqlMojoIT/exclude_object_expr/pom.xml | 2 +- .../UtPlsqlMojoIT/include_object/pom.xml | 2 +- .../UtPlsqlMojoIT/include_object_expr/pom.xml | 2 +- .../plugin/UtPlsqlMojoIT/minimalist/pom.xml | 2 +- .../UtPlsqlMojoIT/ora_stuck_timeout/pom.xml | 2 +- .../plugin/UtPlsqlMojoIT/owner_param/pom.xml | 2 +- .../maven/plugin/UtPlsqlMojoIT/regex/pom.xml | 2 +- .../maven/plugin/UtPlsqlMojoIT/simple/pom.xml | 2 +- .../maven/plugin/UtPlsqlMojoIT/skip/pom.xml | 2 +- .../maven/plugin/UtPlsqlMojoIT/tags/pom.xml | 2 +- .../plugin/UtPlsqlMojoIT/type_mapping/pom.xml | 2 +- .../db_config_using_system_properties/pom.xml | 2 +- .../resources/unit-tests/dbms_output/pom.xml | 4 +- .../default_console_output_behaviour/pom.xml | 2 +- .../unit-tests/default_reporter/pom.xml | 2 +- .../unit-tests/exclude_object/pom.xml | 4 +- .../unit-tests/exclude_object_expr/pom.xml | 4 +- .../unit-tests/exclude_schema_expr/pom.xml | 4 +- .../unit-tests/include_object/pom.xml | 4 +- .../unit-tests/include_object_expr/pom.xml | 4 +- .../unit-tests/include_schema_expr/pom.xml | 4 +- .../invalid_sources_directory/pom.xml | 2 +- .../invalid_tests_directory/pom.xml | 2 +- .../unit-tests/ora_stuck_timeout/pom.xml | 4 +- .../unit-tests/skip_utplsql_tests/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../sources_tests_parameters/pom.xml | 2 +- 39 files changed, 136 insertions(+), 141 deletions(-) delete mode 100644 scripts/0_start_db.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6c848b6..54289d3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,6 +15,10 @@ jobs: build: runs-on: ubuntu-latest + env: + DB_URL: "//localhost:1521/FREEPDB1" + DB_USER: UT3 + DB_PASS: UT3 services: oracle: diff --git a/README.md b/README.md index 20c9cf3..1844273 100644 --- a/README.md +++ b/README.md @@ -11,18 +11,8 @@ This plugin is compatible with utPLSQL 3.1.0+. ## Prerequisites -* Java SE Runtime Environment 8 -* Maven Version 3.5+ -* Oracle JDBC driver - -```xml - - - com.oracle.database.jdbc - ojdbc8 - 21.3.0.0 - -``` +* Java SE Runtime Environment 17 +* Maven Version 3.9.9+ ## Usage @@ -31,7 +21,6 @@ This plugin is compatible with utPLSQL 3.1.0+. To skip running the tests for a particular project, set the **skipUtplsqlTests** property to true. ```xml - true @@ -47,7 +36,6 @@ If you want to skip tests by default but want the ability to re-enable tests fro properties section in the pom: ```xml - true @@ -62,7 +50,6 @@ This will allow you to run with all tests disabled by default and to run them wi Please refer to the following usage example for the parameters descriptions: ```xml - @@ -267,35 +254,35 @@ directory: ## Comparison with utPLSQL CLI -| CLI short parameter | CLI long parameter | Maven XML path | -| --- | --- | --- | -| -c | --color | | -| | --failure-exit-code | | -| -p | --path | paths.path | -| -f | --format | reporters.reporter.name | -| -o | | reporters.reporter.fileOutput | -| -s | | reporters.reporter.consoleOutput | -| | | ignoreFailure | -| -scc | --skip-compatibility-check | skipCompatibilityCheck | -| | --tags | tags.tag | -| -D | --dbms_output | dbmsOutput | -| -r | --random-test-order | randomTestOrder | -| -seed | --random-test-order-seed | randomTestOrderSeed | -| -exclude | | excludeObject | -| -include | | includeObject | -| | | | -| -source_path | | sources.source.directory | -| -owner | | sourcesOwner | -| -regex_expression | | sourcesRegexExpression | -| -type_mapping | | list of testsCustomTypeMapping.customTypeMapping | -| -owner_subexpression | | sourcesOwnerSubexpression | -| -type_subexpression | | sourcesTypeSubexpression | -| -name_subexpression | | sourcesNameSubexpression | -| | | | -| -test_path | | tests.test.directory | -| -owner | | testsOwner | -| -regex_expression | | testsRegexExpression | -| -type_mapping | | list of testsCustomTypeMapping.customTypeMapping | -| -owner_subexpression | | testsOwnerSubexpression | -| -type_subexpression | | testsTypeSubexpression | -| -name_subexpression | | testsNameSubexpression | +| CLI short parameter | CLI long parameter | Maven XML path | +|----------------------|----------------------------|--------------------------------------------------| +| -c | --color | | +| | --failure-exit-code | | +| -p | --path | paths.path | +| -f | --format | reporters.reporter.name | +| -o | | reporters.reporter.fileOutput | +| -s | | reporters.reporter.consoleOutput | +| | | ignoreFailure | +| -scc | --skip-compatibility-check | skipCompatibilityCheck | +| | --tags | tags.tag | +| -D | --dbms_output | dbmsOutput | +| -r | --random-test-order | randomTestOrder | +| -seed | --random-test-order-seed | randomTestOrderSeed | +| -exclude | | excludeObject | +| -include | | includeObject | +| | | | +| -source_path | | sources.source.directory | +| -owner | | sourcesOwner | +| -regex_expression | | sourcesRegexExpression | +| -type_mapping | | list of testsCustomTypeMapping.customTypeMapping | +| -owner_subexpression | | sourcesOwnerSubexpression | +| -type_subexpression | | sourcesTypeSubexpression | +| -name_subexpression | | sourcesNameSubexpression | +| | | | +| -test_path | | tests.test.directory | +| -owner | | testsOwner | +| -regex_expression | | testsRegexExpression | +| -type_mapping | | list of testsCustomTypeMapping.customTypeMapping | +| -owner_subexpression | | testsOwnerSubexpression | +| -type_subexpression | | testsTypeSubexpression | +| -name_subexpression | | testsNameSubexpression | diff --git a/pom.xml b/pom.xml index f491c16..c1c5681 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.utplsql utplsql-maven-plugin - 3.1.12-SNAPSHOT + 3.2.0-SNAPSHOT maven-plugin utPLSQL Maven Plugin @@ -26,6 +26,11 @@ utPLSQL.org http://utplsql.org + + Jacek Gebal + utPLSQL.org + https://utplsql.org + Simon Martinelli utPLSQL.org @@ -40,29 +45,35 @@ - ossrh - https://oss.sonatype.org/content/repositories/snapshots + central + https://central.sonatype.com/repository/maven-snapshots/ - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + central + https://central.sonatype.com - 1.8 - 1.8 UTF-8 + 17 + + 3.2.3 - 3.5.2 - 0.11.0 - 5.8.1 + + 3.9.9 + + 3.15.2 + + 0.13.1 + 5.12.2 utplsql https://sonarcloud.io + org.apache.maven maven-core @@ -72,31 +83,27 @@ org.apache.maven.plugin-tools maven-plugin-annotations - ${maven.version} + ${maven.plugin.tools.version} provided org.apache.maven.shared maven-shared-utils - 3.3.4 - - - - org.utplsql - utplsql-java-api - 3.1.15 - - - - com.oracle.database.jdbc - ojdbc8 - 21.3.0.0 + 3.4.2 + org.codehaus.plexus plexus-utils 3.6.1 + provided + + + + org.utplsql + utplsql-java-api + ${utplsql-java-api.version} @@ -109,7 +116,7 @@ org.apache.maven.plugin-testing maven-plugin-testing-harness - 3.3.0 + 3.5.1 test @@ -142,22 +149,27 @@ org.slf4j slf4j-simple - 1.7.32 + 2.0.17 test + + org.apache.maven.plugins + maven-compiler-plugin + 3.14.0 + org.apache.maven.plugins maven-surefire-plugin - 2.22.2 + 3.5.5 org.apache.maven.plugins maven-failsafe-plugin - 2.22.2 + 3.5.5 @@ -185,7 +197,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.2.2 + 3.6.2 package @@ -194,18 +206,11 @@ - - - - org.utplsql:java-api - - - org.apache.maven.plugins maven-plugin-plugin - ${maven.version} + ${maven.plugin.tools.version} utplsql true @@ -228,7 +233,7 @@ com.amashchenko.maven.plugin gitflow-maven-plugin - 1.16.0 + 1.21.0 true @@ -247,7 +252,7 @@ org.jacoco jacoco-maven-plugin - 0.8.7 + 0.8.13 prepare-agent @@ -278,7 +283,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.1 + 3.12.0 attach-javadocs @@ -291,7 +296,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.4.0 attach-sources @@ -305,7 +310,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.0.1 + 3.2.8 sign-artifacts diff --git a/scripts/0_start_db.sh b/scripts/0_start_db.sh deleted file mode 100644 index d319407..0000000 --- a/scripts/0_start_db.sh +++ /dev/null @@ -1 +0,0 @@ -docker run -d --name ora-utplsql -p 1521:1521 -e ORACLE_PASSWORD=oracle gvenzl/oracle-xe:21-slim diff --git a/scripts/1_install_utplsql.sh b/scripts/1_install_utplsql.sh index bb6577c..e85d855 100644 --- a/scripts/1_install_utplsql.sh +++ b/scripts/1_install_utplsql.sh @@ -5,4 +5,4 @@ curl -Lk "${UTPLSQL_DOWNLOAD_URL}" -o utPLSQL.zip unzip -q utPLSQL.zip docker run --rm -v $(pwd)/utPLSQL:/utPLSQL -w /utPLSQL/source --network host \ - --entrypoint sqlplus truemark/sqlplus:19.8 sys/oracle@//127.0.0.1:1521/XE as sysdba @install_headless.sql UT3 UT3 users + --entrypoint sqlplus truemark/sqlplus:19.8 sys/oracle@${DB_URL} as sysdba @install_headless.sql UT3 UT3 users diff --git a/scripts/2_install_demo_project.sh b/scripts/2_install_demo_project.sh index a4089b1..a2a002d 100644 --- a/scripts/2_install_demo_project.sh +++ b/scripts/2_install_demo_project.sh @@ -1,11 +1,11 @@ docker run --rm -v $(pwd):/work -w /work/ --network host --entrypoint sqlplus truemark/sqlplus:19.8 \ - sys/oracle@//127.0.0.1:1521/XE as sysdba @scripts/sql/create_users.sql + sys/oracle@${DB_URL} as sysdba @scripts/sql/create_users.sql docker run --rm -v $(pwd):/work -w /work/ --network host --entrypoint sqlplus truemark/sqlplus:19.8 \ - app/pass@//127.0.0.1:1521/XE @scripts/sql/create_app_objects.sql + app/pass@${DB_URL} @scripts/sql/create_app_objects.sql docker run --rm -v $(pwd):/work -w /work/ --network host --entrypoint sqlplus truemark/sqlplus:19.8 \ - code_owner/pass@//127.0.0.1:1521/XE @scripts/sql/create_source_owner_objects.sql + code_owner/pass@${DB_URL} @scripts/sql/create_source_owner_objects.sql docker run --rm -v $(pwd):/work -w /work/ --network host --entrypoint sqlplus truemark/sqlplus:19.8 \ - tests_owner/pass@//127.0.0.1:1521/XE @scripts/sql/create_tests_owner_objects.sql + tests_owner/pass@${DB_URL} @scripts/sql/create_tests_owner_objects.sql diff --git a/src/test/java/org/utplsql/maven/plugin/ReportChecker.java b/src/test/java/org/utplsql/maven/plugin/ReportChecker.java index 3818674..9c8d815 100644 --- a/src/test/java/org/utplsql/maven/plugin/ReportChecker.java +++ b/src/test/java/org/utplsql/maven/plugin/ReportChecker.java @@ -28,8 +28,8 @@ private ReportChecker() { */ public static void assertThatReportsAreGeneratedAsExpected(MavenExecutionResult result, String... files) { for (String filename : files) { - File expectedOutputFile = new File(result.getMavenProjectResult().getTargetProjectDirectory(), "/expected-output/utplsql/" + filename); - File outputFile = new File(result.getMavenProjectResult().getTargetProjectDirectory(), "/target/utplsql/" + filename); + File expectedOutputFile = new File(result.getMavenProjectResult().getTargetProjectDirectory().toFile(), "/expected-output/utplsql/" + filename); + File outputFile = new File(result.getMavenProjectResult().getTargetProjectDirectory().toFile(), "/target/utplsql/" + filename); assertThat(result.getMavenProjectResult()).withFile("/utplsql/" + filename).exists(); @@ -60,7 +60,7 @@ public static void assertThatReportsAreGeneratedAsExpected(MavenExecutionResult * @return if report exits */ public static boolean reportWasGenerated(MavenExecutionResult result, String filename) { - File outputFile = new File(result.getMavenProjectResult().getTargetProjectDirectory(), "/target/utplsql/" + filename); + File outputFile = new File(result.getMavenProjectResult().getTargetProjectDirectory().toFile(), "/target/utplsql/" + filename); return outputFile.exists(); } } diff --git a/src/test/java/org/utplsql/maven/plugin/UtPlsqlMojoTest.java b/src/test/java/org/utplsql/maven/plugin/UtPlsqlMojoTest.java index 6315072..010bb38 100644 --- a/src/test/java/org/utplsql/maven/plugin/UtPlsqlMojoTest.java +++ b/src/test/java/org/utplsql/maven/plugin/UtPlsqlMojoTest.java @@ -308,7 +308,7 @@ public void dbms_output() throws Exception { */ @Test public void db_config_using_system_properties() throws Exception { - System.setProperty("dbUrl", "jdbc:oracle:thin:@localhost:1521:xe"); + System.setProperty("dbUrl", "jdbc:oracle:thin:@//localhost:1521/FREEPDB1"); System.setProperty("dbUser", "UT3"); System.setProperty("dbPass", "UT3"); @@ -317,9 +317,9 @@ public void db_config_using_system_properties() throws Exception { utPlsqlMojo.execute(); - System.setProperty("dbUrl", ""); - System.setProperty("dbUser", ""); - System.setProperty("dbPass", ""); + System.clearProperty("dbUrl"); + System.clearProperty("dbUser"); + System.clearProperty("dbPass"); } /** diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/exclude_object/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/exclude_object/pom.xml index 15411c2..9380999 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/exclude_object/pom.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/exclude_object/pom.xml @@ -9,7 +9,7 @@ pom - jdbc:oracle:thin:@localhost:1521:xe + jdbc:oracle:thin:@//localhost:1521/FREEPDB1 UT3 UT3 diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/exclude_object_expr/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/exclude_object_expr/pom.xml index 22d0869..b0468bd 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/exclude_object_expr/pom.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/exclude_object_expr/pom.xml @@ -9,7 +9,7 @@ pom - jdbc:oracle:thin:@localhost:1521:xe + jdbc:oracle:thin:@//localhost:1521/FREEPDB1 UT3 UT3 diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object/pom.xml index ee6d13f..e7fdcc9 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object/pom.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object/pom.xml @@ -9,7 +9,7 @@ pom - jdbc:oracle:thin:@localhost:1521:xe + jdbc:oracle:thin:@//localhost:1521/FREEPDB1 UT3 UT3 diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object_expr/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object_expr/pom.xml index e807d13..dc2e708 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object_expr/pom.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object_expr/pom.xml @@ -9,7 +9,7 @@ pom - jdbc:oracle:thin:@localhost:1521:xe + jdbc:oracle:thin:@//localhost:1521/FREEPDB1 UT3 UT3 diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/minimalist/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/minimalist/pom.xml index 40759d2..6232de0 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/minimalist/pom.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/minimalist/pom.xml @@ -9,7 +9,7 @@ pom - jdbc:oracle:thin:@localhost:1521:xe + jdbc:oracle:thin:@//localhost:1521/FREEPDB1 UT3 UT3 diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/ora_stuck_timeout/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/ora_stuck_timeout/pom.xml index f0c33da..5219fac 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/ora_stuck_timeout/pom.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/ora_stuck_timeout/pom.xml @@ -9,7 +9,7 @@ pom - jdbc:oracle:thin:@localhost:1521:xe + jdbc:oracle:thin:@//localhost:1521/FREEPDB1 UT3 UT3 diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/pom.xml index 961940b..b627c6d 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/pom.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/pom.xml @@ -9,7 +9,7 @@ pom - jdbc:oracle:thin:@localhost:1521:xe + jdbc:oracle:thin:@//localhost:1521/FREEPDB1 UT3 UT3 diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/regex/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/regex/pom.xml index 2620738..8da3e34 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/regex/pom.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/regex/pom.xml @@ -9,7 +9,7 @@ pom - jdbc:oracle:thin:@localhost:1521:xe + jdbc:oracle:thin:@//localhost:1521/FREEPDB1 UT3 UT3 diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/simple/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/simple/pom.xml index c174c87..aea7b77 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/simple/pom.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/simple/pom.xml @@ -9,7 +9,7 @@ pom - jdbc:oracle:thin:@localhost:1521:xe + jdbc:oracle:thin:@//localhost:1521/FREEPDB1 UT3 UT3 diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/skip/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/skip/pom.xml index f9264fb..5f2b9cf 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/skip/pom.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/skip/pom.xml @@ -9,7 +9,7 @@ pom - jdbc:oracle:thin:@localhost:1521:xe + jdbc:oracle:thin:@//localhost:1521/FREEPDB1 UT3 UT3 diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/tags/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/tags/pom.xml index 01150a1..61a46b9 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/tags/pom.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/tags/pom.xml @@ -9,7 +9,7 @@ pom - jdbc:oracle:thin:@localhost:1521:xe + jdbc:oracle:thin:@//localhost:1521/FREEPDB1 UT3 UT3 diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/type_mapping/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/type_mapping/pom.xml index 3cf0033..e93b79b 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/type_mapping/pom.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/type_mapping/pom.xml @@ -9,7 +9,7 @@ pom - jdbc:oracle:thin:@localhost:1521:xe + jdbc:oracle:thin:@//localhost:1521/FREEPDB1 UT3 UT3 diff --git a/src/test/resources/unit-tests/db_config_using_system_properties/pom.xml b/src/test/resources/unit-tests/db_config_using_system_properties/pom.xml index 814c181..a2c510f 100644 --- a/src/test/resources/unit-tests/db_config_using_system_properties/pom.xml +++ b/src/test/resources/unit-tests/db_config_using_system_properties/pom.xml @@ -14,7 +14,7 @@ org.utplsql utplsql-maven-plugin - @proj + @project.version@ test diff --git a/src/test/resources/unit-tests/dbms_output/pom.xml b/src/test/resources/unit-tests/dbms_output/pom.xml index 4f45635..2c70715 100644 --- a/src/test/resources/unit-tests/dbms_output/pom.xml +++ b/src/test/resources/unit-tests/dbms_output/pom.xml @@ -9,7 +9,7 @@ pom - jdbc:oracle:thin:@127.0.0.1:1521:xe + jdbc:oracle:thin:@//localhost:1521/FREEPDB1 UT3 UT3 @@ -20,7 +20,7 @@ org.utplsql utplsql-maven-plugin - @proj + @project.version@ test diff --git a/src/test/resources/unit-tests/default_console_output_behaviour/pom.xml b/src/test/resources/unit-tests/default_console_output_behaviour/pom.xml index ac6b14c..812c4e1 100644 --- a/src/test/resources/unit-tests/default_console_output_behaviour/pom.xml +++ b/src/test/resources/unit-tests/default_console_output_behaviour/pom.xml @@ -9,7 +9,7 @@ pom - jdbc:oracle:thin:@127.0.0.1:1521:xe + jdbc:oracle:thin:@//localhost:1521/FREEPDB1 UT3 UT3 diff --git a/src/test/resources/unit-tests/default_reporter/pom.xml b/src/test/resources/unit-tests/default_reporter/pom.xml index 8f03e25..d47b54c 100644 --- a/src/test/resources/unit-tests/default_reporter/pom.xml +++ b/src/test/resources/unit-tests/default_reporter/pom.xml @@ -9,7 +9,7 @@ pom - jdbc:oracle:thin:@127.0.0.1:1521:xe + jdbc:oracle:thin:@//localhost:1521/FREEPDB1 UT3 UT3 diff --git a/src/test/resources/unit-tests/exclude_object/pom.xml b/src/test/resources/unit-tests/exclude_object/pom.xml index d65fde3..137b9e1 100644 --- a/src/test/resources/unit-tests/exclude_object/pom.xml +++ b/src/test/resources/unit-tests/exclude_object/pom.xml @@ -9,7 +9,7 @@ pom - jdbc:oracle:thin:@127.0.0.1:1521:xe + jdbc:oracle:thin:@//localhost:1521/FREEPDB1 UT3 UT3 @@ -20,7 +20,7 @@ org.utplsql utplsql-maven-plugin - @proj + @project.version@ test diff --git a/src/test/resources/unit-tests/exclude_object_expr/pom.xml b/src/test/resources/unit-tests/exclude_object_expr/pom.xml index 7993e05..e2e2a07 100644 --- a/src/test/resources/unit-tests/exclude_object_expr/pom.xml +++ b/src/test/resources/unit-tests/exclude_object_expr/pom.xml @@ -9,7 +9,7 @@ pom - jdbc:oracle:thin:@127.0.0.1:1521:xe + jdbc:oracle:thin:@//localhost:1521/FREEPDB1 UT3 UT3 @@ -20,7 +20,7 @@ org.utplsql utplsql-maven-plugin - @proj + @project.version@ test diff --git a/src/test/resources/unit-tests/exclude_schema_expr/pom.xml b/src/test/resources/unit-tests/exclude_schema_expr/pom.xml index 28df05e..e2bbdb4 100644 --- a/src/test/resources/unit-tests/exclude_schema_expr/pom.xml +++ b/src/test/resources/unit-tests/exclude_schema_expr/pom.xml @@ -9,7 +9,7 @@ pom - jdbc:oracle:thin:@127.0.0.1:1521:xe + jdbc:oracle:thin:@//localhost:1521/FREEPDB1 UT3 UT3 @@ -20,7 +20,7 @@ org.utplsql utplsql-maven-plugin - @proj + @project.version@ test diff --git a/src/test/resources/unit-tests/include_object/pom.xml b/src/test/resources/unit-tests/include_object/pom.xml index f031df5..69391c5 100644 --- a/src/test/resources/unit-tests/include_object/pom.xml +++ b/src/test/resources/unit-tests/include_object/pom.xml @@ -9,7 +9,7 @@ pom - jdbc:oracle:thin:@127.0.0.1:1521:xe + jdbc:oracle:thin:@//localhost:1521/FREEPDB1 UT3 UT3 @@ -20,7 +20,7 @@ org.utplsql utplsql-maven-plugin - @proj + @project.version@ test diff --git a/src/test/resources/unit-tests/include_object_expr/pom.xml b/src/test/resources/unit-tests/include_object_expr/pom.xml index 636098b..cd005be 100644 --- a/src/test/resources/unit-tests/include_object_expr/pom.xml +++ b/src/test/resources/unit-tests/include_object_expr/pom.xml @@ -9,7 +9,7 @@ pom - jdbc:oracle:thin:@127.0.0.1:1521:xe + jdbc:oracle:thin:@//localhost:1521/FREEPDB1 UT3 UT3 @@ -20,7 +20,7 @@ org.utplsql utplsql-maven-plugin - @proj + @project.version@ test diff --git a/src/test/resources/unit-tests/include_schema_expr/pom.xml b/src/test/resources/unit-tests/include_schema_expr/pom.xml index f953ec0..80bcc07 100644 --- a/src/test/resources/unit-tests/include_schema_expr/pom.xml +++ b/src/test/resources/unit-tests/include_schema_expr/pom.xml @@ -9,7 +9,7 @@ pom - jdbc:oracle:thin:@127.0.0.1:1521:xe + jdbc:oracle:thin:@//localhost:1521/FREEPDB1 UT3 UT3 @@ -20,7 +20,7 @@ org.utplsql utplsql-maven-plugin - @proj + @project.version@ test diff --git a/src/test/resources/unit-tests/invalid_sources_directory/pom.xml b/src/test/resources/unit-tests/invalid_sources_directory/pom.xml index af6643d..05f9b28 100644 --- a/src/test/resources/unit-tests/invalid_sources_directory/pom.xml +++ b/src/test/resources/unit-tests/invalid_sources_directory/pom.xml @@ -9,7 +9,7 @@ pom - jdbc:oracle:thin:@127.0.0.1:1521:xe + jdbc:oracle:thin:@//localhost:1521/FREEPDB1 UT3 UT3 diff --git a/src/test/resources/unit-tests/invalid_tests_directory/pom.xml b/src/test/resources/unit-tests/invalid_tests_directory/pom.xml index c7380ef..e8a614f 100644 --- a/src/test/resources/unit-tests/invalid_tests_directory/pom.xml +++ b/src/test/resources/unit-tests/invalid_tests_directory/pom.xml @@ -9,7 +9,7 @@ pom - jdbc:oracle:thin:@127.0.0.1:1521:xe + jdbc:oracle:thin:@//localhost:1521/FREEPDB1 UT3 UT3 diff --git a/src/test/resources/unit-tests/ora_stuck_timeout/pom.xml b/src/test/resources/unit-tests/ora_stuck_timeout/pom.xml index f04825c..40555e3 100644 --- a/src/test/resources/unit-tests/ora_stuck_timeout/pom.xml +++ b/src/test/resources/unit-tests/ora_stuck_timeout/pom.xml @@ -9,7 +9,7 @@ pom - jdbc:oracle:thin:@127.0.0.1:1521:xe + jdbc:oracle:thin:@//localhost:1521/FREEPDB1 UT3 UT3 @@ -20,7 +20,7 @@ org.utplsql utplsql-maven-plugin - @proj + @project.version@ test diff --git a/src/test/resources/unit-tests/skip_utplsql_tests/pom.xml b/src/test/resources/unit-tests/skip_utplsql_tests/pom.xml index 3e978d5..8365731 100644 --- a/src/test/resources/unit-tests/skip_utplsql_tests/pom.xml +++ b/src/test/resources/unit-tests/skip_utplsql_tests/pom.xml @@ -9,7 +9,7 @@ pom - jdbc:oracle:thin:@127.0.0.1:1521:xe + jdbc:oracle:thin:@//localhost:1521/FREEPDB1 UT3 UT3 diff --git a/src/test/resources/unit-tests/sources_and_tests_parameter_does_not_exist/pom.xml b/src/test/resources/unit-tests/sources_and_tests_parameter_does_not_exist/pom.xml index a556a7e..5fbaf3e 100644 --- a/src/test/resources/unit-tests/sources_and_tests_parameter_does_not_exist/pom.xml +++ b/src/test/resources/unit-tests/sources_and_tests_parameter_does_not_exist/pom.xml @@ -9,7 +9,7 @@ pom - jdbc:oracle:thin:@127.0.0.1:1521:xe + jdbc:oracle:thin:@//localhost:1521/FREEPDB1 UT3 UT3 diff --git a/src/test/resources/unit-tests/sources_and_tests_parameter_does_not_exist_but_default_directory_exists/pom.xml b/src/test/resources/unit-tests/sources_and_tests_parameter_does_not_exist_but_default_directory_exists/pom.xml index a556a7e..5fbaf3e 100644 --- a/src/test/resources/unit-tests/sources_and_tests_parameter_does_not_exist_but_default_directory_exists/pom.xml +++ b/src/test/resources/unit-tests/sources_and_tests_parameter_does_not_exist_but_default_directory_exists/pom.xml @@ -9,7 +9,7 @@ pom - jdbc:oracle:thin:@127.0.0.1:1521:xe + jdbc:oracle:thin:@//localhost:1521/FREEPDB1 UT3 UT3 diff --git a/src/test/resources/unit-tests/sources_and_tests_parameter_have_not_directory_tag/pom.xml b/src/test/resources/unit-tests/sources_and_tests_parameter_have_not_directory_tag/pom.xml index d5382b4..c38c9e8 100644 --- a/src/test/resources/unit-tests/sources_and_tests_parameter_have_not_directory_tag/pom.xml +++ b/src/test/resources/unit-tests/sources_and_tests_parameter_have_not_directory_tag/pom.xml @@ -9,7 +9,7 @@ pom - jdbc:oracle:thin:@127.0.0.1:1521:xe + jdbc:oracle:thin:@//localhost:1521/FREEPDB1 UT3 UT3 diff --git a/src/test/resources/unit-tests/sources_and_tests_parameter_have_not_includes_tag/pom.xml b/src/test/resources/unit-tests/sources_and_tests_parameter_have_not_includes_tag/pom.xml index d33e917..7ab6ed3 100644 --- a/src/test/resources/unit-tests/sources_and_tests_parameter_have_not_includes_tag/pom.xml +++ b/src/test/resources/unit-tests/sources_and_tests_parameter_have_not_includes_tag/pom.xml @@ -10,7 +10,7 @@ pom - jdbc:oracle:thin:@127.0.0.1:1521:xe + jdbc:oracle:thin:@//localhost:1521/FREEPDB1 UT3 UT3 diff --git a/src/test/resources/unit-tests/sources_tests_parameters/pom.xml b/src/test/resources/unit-tests/sources_tests_parameters/pom.xml index 6f4c2d0..b1a778e 100644 --- a/src/test/resources/unit-tests/sources_tests_parameters/pom.xml +++ b/src/test/resources/unit-tests/sources_tests_parameters/pom.xml @@ -9,7 +9,7 @@ pom - jdbc:oracle:thin:@127.0.0.1:1521:xe + jdbc:oracle:thin:@//localhost:1521/FREEPDB1 UT3 UT3 From e47e2c0f5f0ef6bf96c01707326978b3ac10a45d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Thu, 23 Apr 2026 18:48:36 +0300 Subject: [PATCH 02/13] Update build process --- .github/workflows/build.yml | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 54289d3..628906a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,7 +34,7 @@ jobs: --health-retries 10 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 @@ -45,7 +45,7 @@ jobs: run: sh ${{ github.workspace }}/scripts/2_install_demo_project.sh - name: Set up JDK 17 - uses: actions/setup-java@v2 + uses: actions/setup-java@v5 with: java-version: '17' distribution: 'adopt' @@ -56,7 +56,7 @@ jobs: gpg-passphrase: MAVEN_GPG_PASSPHRASE - name: Cache local Maven repository - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} @@ -77,23 +77,7 @@ jobs: MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} - name: Publish unit test results - uses: EnricoMi/publish-unit-test-result-action@v1.24 + uses: EnricoMi/publish-unit-test-result-action@v2 if: always() with: files: target/**/TEST**.xml - - 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: - # Required Input - repo_token: ${{secrets.GITHUB_TOKEN}} - slack_webhook_url: ${{secrets.SLACK_WEBHOOK_URL}} - # Optional Input - name: 'Github Actions[bot]' - icon_url: 'https://octodex.github.com/images/mona-the-rivetertocat.png' From 2751fed6d1b387ec4173776f2c854837ef2be1ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Thu, 23 Apr 2026 18:49:08 +0300 Subject: [PATCH 03/13] Update 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 628906a..b6724f5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,7 @@ name: Build and deploy snapshot on: push: - branches-ignore: [ main ] + branches: [ develop ] pull_request: branches: [ develop ] From 6497f283b9ac69cfa863079c42e48ffca0ee5175 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Sat, 25 Apr 2026 20:53:58 +0300 Subject: [PATCH 04/13] Update unit test setup to avoid UK violation when testing maven plugin on a PDB. --- .../java/org/utplsql/maven/plugin/UtPlsqlMojoTest.java | 8 ++++---- .../maven/plugin/UtPlsqlMojoIT/exclude_object/pom.xml | 4 ++-- .../plugin/UtPlsqlMojoIT/exclude_object_expr/pom.xml | 4 ++-- .../maven/plugin/UtPlsqlMojoIT/include_object/pom.xml | 4 ++-- .../plugin/UtPlsqlMojoIT/include_object_expr/pom.xml | 4 ++-- .../utplsql/maven/plugin/UtPlsqlMojoIT/minimalist/pom.xml | 4 ++-- .../maven/plugin/UtPlsqlMojoIT/ora_stuck_timeout/pom.xml | 4 ++-- .../maven/plugin/UtPlsqlMojoIT/owner_param/pom.xml | 4 ++-- .../scripts/sources/foo/packages/PKG_TEST_ME.pks | 5 ++++- .../owner_param/scripts/sources/foo/tables/TO_TEST_ME.sql | 2 ++ .../org/utplsql/maven/plugin/UtPlsqlMojoIT/regex/pom.xml | 4 ++-- .../org/utplsql/maven/plugin/UtPlsqlMojoIT/simple/pom.xml | 4 ++-- .../org/utplsql/maven/plugin/UtPlsqlMojoIT/skip/pom.xml | 4 ++-- .../org/utplsql/maven/plugin/UtPlsqlMojoIT/tags/pom.xml | 4 ++-- .../maven/plugin/UtPlsqlMojoIT/type_mapping/pom.xml | 4 ++-- src/test/resources/unit-tests/dbms_output/pom.xml | 4 ++-- .../unit-tests/default_console_output_behaviour/pom.xml | 4 ++-- src/test/resources/unit-tests/default_reporter/pom.xml | 4 ++-- src/test/resources/unit-tests/exclude_object/pom.xml | 4 ++-- src/test/resources/unit-tests/exclude_object_expr/pom.xml | 4 ++-- src/test/resources/unit-tests/exclude_schema_expr/pom.xml | 4 ++-- src/test/resources/unit-tests/include_object/pom.xml | 4 ++-- src/test/resources/unit-tests/include_object_expr/pom.xml | 6 +++--- src/test/resources/unit-tests/include_schema_expr/pom.xml | 6 +++--- .../unit-tests/invalid_sources_directory/pom.xml | 4 ++-- .../resources/unit-tests/invalid_tests_directory/pom.xml | 4 ++-- src/test/resources/unit-tests/ora_stuck_timeout/pom.xml | 4 ++-- src/test/resources/unit-tests/skip_utplsql_tests/pom.xml | 4 ++-- .../sources_and_tests_parameter_does_not_exist/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../resources/unit-tests/sources_tests_parameters/pom.xml | 4 ++-- 33 files changed, 72 insertions(+), 67 deletions(-) diff --git a/src/test/java/org/utplsql/maven/plugin/UtPlsqlMojoTest.java b/src/test/java/org/utplsql/maven/plugin/UtPlsqlMojoTest.java index 010bb38..bd8cd6c 100644 --- a/src/test/java/org/utplsql/maven/plugin/UtPlsqlMojoTest.java +++ b/src/test/java/org/utplsql/maven/plugin/UtPlsqlMojoTest.java @@ -309,8 +309,8 @@ public void dbms_output() throws Exception { @Test public void db_config_using_system_properties() throws Exception { System.setProperty("dbUrl", "jdbc:oracle:thin:@//localhost:1521/FREEPDB1"); - System.setProperty("dbUser", "UT3"); - System.setProperty("dbPass", "UT3"); + System.setProperty("dbUser", "APP"); + System.setProperty("dbPass", "pass"); UtPlsqlMojo utPlsqlMojo = createUtPlsqlMojo("db_config_using_system_properties"); assertNotNull(utPlsqlMojo); @@ -370,7 +370,7 @@ public void include_object_expr() throws Exception { utPlsqlMojo.execute(); - assertEquals("*", utPlsqlMojo.includeObjectExpr); + assertEquals("APP.*", utPlsqlMojo.includeObjectExpr); } /** @@ -405,7 +405,7 @@ public void include_schema_expr() throws Exception { utPlsqlMojo.execute(); - assertEquals("*", utPlsqlMojo.includeSchemaExpr); + assertEquals("APP", utPlsqlMojo.includeSchemaExpr); } /** diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/exclude_object/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/exclude_object/pom.xml index 9380999..bf3af31 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/exclude_object/pom.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/exclude_object/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - UT3 - UT3 + APP + pass diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/exclude_object_expr/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/exclude_object_expr/pom.xml index b0468bd..14a165c 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/exclude_object_expr/pom.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/exclude_object_expr/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - UT3 - UT3 + APP + pass diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object/pom.xml index e7fdcc9..afc2c9b 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object/pom.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - UT3 - UT3 + APP + pass diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object_expr/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object_expr/pom.xml index dc2e708..a756848 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object_expr/pom.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object_expr/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - UT3 - UT3 + APP + pass diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/minimalist/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/minimalist/pom.xml index 6232de0..9aa8065 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/minimalist/pom.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/minimalist/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - UT3 - UT3 + APP + pass diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/ora_stuck_timeout/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/ora_stuck_timeout/pom.xml index 5219fac..4f9d58d 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/ora_stuck_timeout/pom.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/ora_stuck_timeout/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - UT3 - UT3 + APP + pass diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/pom.xml index b627c6d..f429ebe 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/pom.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - UT3 - UT3 + APP + pass diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/sources/foo/packages/PKG_TEST_ME.pks b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/sources/foo/packages/PKG_TEST_ME.pks index 959b122..9bd569e 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/sources/foo/packages/PKG_TEST_ME.pks +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/sources/foo/packages/PKG_TEST_ME.pks @@ -5,4 +5,7 @@ CREATE OR REPLACE PACKAGE CODE_OWNER.PKG_TEST_ME AS FUNCTION FC_TEST_ME(PPARAM1 IN VARCHAR2) RETURN NUMBER; PROCEDURE PR_TEST_ME(PSNAME IN VARCHAR2); END PKG_TEST_ME; -/ \ No newline at end of file +/ + +grant execute on pkg_test_me to tests_owner; +grant debug on pkg_test_me to tests_owner; diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/sources/foo/tables/TO_TEST_ME.sql b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/sources/foo/tables/TO_TEST_ME.sql index b2e90d9..d130dca 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/sources/foo/tables/TO_TEST_ME.sql +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/sources/foo/tables/TO_TEST_ME.sql @@ -6,3 +6,5 @@ CREATE TABLE TO_TEST_ME SNAME VARCHAR2(10) ) / + +grant all on to_test_me to tests_owner; \ No newline at end of file diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/regex/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/regex/pom.xml index 8da3e34..61f4b0a 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/regex/pom.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/regex/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - UT3 - UT3 + APP + pass diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/simple/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/simple/pom.xml index aea7b77..e9fa2b4 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/simple/pom.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/simple/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - UT3 - UT3 + APP + pass diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/skip/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/skip/pom.xml index 5f2b9cf..7b083c6 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/skip/pom.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/skip/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - UT3 - UT3 + APP + pass diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/tags/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/tags/pom.xml index 61a46b9..e62a442 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/tags/pom.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/tags/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - UT3 - UT3 + APP + pass diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/type_mapping/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/type_mapping/pom.xml index e93b79b..f11fce0 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/type_mapping/pom.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/type_mapping/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - UT3 - UT3 + APP + pass diff --git a/src/test/resources/unit-tests/dbms_output/pom.xml b/src/test/resources/unit-tests/dbms_output/pom.xml index 2c70715..67d26b9 100644 --- a/src/test/resources/unit-tests/dbms_output/pom.xml +++ b/src/test/resources/unit-tests/dbms_output/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - UT3 - UT3 + APP + pass diff --git a/src/test/resources/unit-tests/default_console_output_behaviour/pom.xml b/src/test/resources/unit-tests/default_console_output_behaviour/pom.xml index 812c4e1..5788a5e 100644 --- a/src/test/resources/unit-tests/default_console_output_behaviour/pom.xml +++ b/src/test/resources/unit-tests/default_console_output_behaviour/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - UT3 - UT3 + APP + pass diff --git a/src/test/resources/unit-tests/default_reporter/pom.xml b/src/test/resources/unit-tests/default_reporter/pom.xml index d47b54c..0c00eef 100644 --- a/src/test/resources/unit-tests/default_reporter/pom.xml +++ b/src/test/resources/unit-tests/default_reporter/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - UT3 - UT3 + APP + pass diff --git a/src/test/resources/unit-tests/exclude_object/pom.xml b/src/test/resources/unit-tests/exclude_object/pom.xml index 137b9e1..fab0f81 100644 --- a/src/test/resources/unit-tests/exclude_object/pom.xml +++ b/src/test/resources/unit-tests/exclude_object/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - UT3 - UT3 + APP + pass diff --git a/src/test/resources/unit-tests/exclude_object_expr/pom.xml b/src/test/resources/unit-tests/exclude_object_expr/pom.xml index e2e2a07..7adab95 100644 --- a/src/test/resources/unit-tests/exclude_object_expr/pom.xml +++ b/src/test/resources/unit-tests/exclude_object_expr/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - UT3 - UT3 + APP + pass diff --git a/src/test/resources/unit-tests/exclude_schema_expr/pom.xml b/src/test/resources/unit-tests/exclude_schema_expr/pom.xml index e2bbdb4..f41b1b5 100644 --- a/src/test/resources/unit-tests/exclude_schema_expr/pom.xml +++ b/src/test/resources/unit-tests/exclude_schema_expr/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - UT3 - UT3 + APP + pass diff --git a/src/test/resources/unit-tests/include_object/pom.xml b/src/test/resources/unit-tests/include_object/pom.xml index 69391c5..2e6a724 100644 --- a/src/test/resources/unit-tests/include_object/pom.xml +++ b/src/test/resources/unit-tests/include_object/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - UT3 - UT3 + APP + pass diff --git a/src/test/resources/unit-tests/include_object_expr/pom.xml b/src/test/resources/unit-tests/include_object_expr/pom.xml index cd005be..049969d 100644 --- a/src/test/resources/unit-tests/include_object_expr/pom.xml +++ b/src/test/resources/unit-tests/include_object_expr/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - UT3 - UT3 + APP + pass @@ -44,7 +44,7 @@ true - * + APP.* diff --git a/src/test/resources/unit-tests/include_schema_expr/pom.xml b/src/test/resources/unit-tests/include_schema_expr/pom.xml index 80bcc07..1408299 100644 --- a/src/test/resources/unit-tests/include_schema_expr/pom.xml +++ b/src/test/resources/unit-tests/include_schema_expr/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - UT3 - UT3 + APP + pass @@ -44,7 +44,7 @@ true - * + APP diff --git a/src/test/resources/unit-tests/invalid_sources_directory/pom.xml b/src/test/resources/unit-tests/invalid_sources_directory/pom.xml index 05f9b28..799c4f5 100644 --- a/src/test/resources/unit-tests/invalid_sources_directory/pom.xml +++ b/src/test/resources/unit-tests/invalid_sources_directory/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - UT3 - UT3 + APP + pass diff --git a/src/test/resources/unit-tests/invalid_tests_directory/pom.xml b/src/test/resources/unit-tests/invalid_tests_directory/pom.xml index e8a614f..d7bd80a 100644 --- a/src/test/resources/unit-tests/invalid_tests_directory/pom.xml +++ b/src/test/resources/unit-tests/invalid_tests_directory/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - UT3 - UT3 + APP + pass diff --git a/src/test/resources/unit-tests/ora_stuck_timeout/pom.xml b/src/test/resources/unit-tests/ora_stuck_timeout/pom.xml index 40555e3..f8233f5 100644 --- a/src/test/resources/unit-tests/ora_stuck_timeout/pom.xml +++ b/src/test/resources/unit-tests/ora_stuck_timeout/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - UT3 - UT3 + APP + pass diff --git a/src/test/resources/unit-tests/skip_utplsql_tests/pom.xml b/src/test/resources/unit-tests/skip_utplsql_tests/pom.xml index 8365731..eee75a7 100644 --- a/src/test/resources/unit-tests/skip_utplsql_tests/pom.xml +++ b/src/test/resources/unit-tests/skip_utplsql_tests/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - UT3 - UT3 + APP + pass diff --git a/src/test/resources/unit-tests/sources_and_tests_parameter_does_not_exist/pom.xml b/src/test/resources/unit-tests/sources_and_tests_parameter_does_not_exist/pom.xml index 5fbaf3e..985fc79 100644 --- a/src/test/resources/unit-tests/sources_and_tests_parameter_does_not_exist/pom.xml +++ b/src/test/resources/unit-tests/sources_and_tests_parameter_does_not_exist/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - UT3 - UT3 + APP + pass diff --git a/src/test/resources/unit-tests/sources_and_tests_parameter_does_not_exist_but_default_directory_exists/pom.xml b/src/test/resources/unit-tests/sources_and_tests_parameter_does_not_exist_but_default_directory_exists/pom.xml index 5fbaf3e..985fc79 100644 --- a/src/test/resources/unit-tests/sources_and_tests_parameter_does_not_exist_but_default_directory_exists/pom.xml +++ b/src/test/resources/unit-tests/sources_and_tests_parameter_does_not_exist_but_default_directory_exists/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - UT3 - UT3 + APP + pass diff --git a/src/test/resources/unit-tests/sources_and_tests_parameter_have_not_directory_tag/pom.xml b/src/test/resources/unit-tests/sources_and_tests_parameter_have_not_directory_tag/pom.xml index c38c9e8..a9f4690 100644 --- a/src/test/resources/unit-tests/sources_and_tests_parameter_have_not_directory_tag/pom.xml +++ b/src/test/resources/unit-tests/sources_and_tests_parameter_have_not_directory_tag/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - UT3 - UT3 + APP + pass diff --git a/src/test/resources/unit-tests/sources_and_tests_parameter_have_not_includes_tag/pom.xml b/src/test/resources/unit-tests/sources_and_tests_parameter_have_not_includes_tag/pom.xml index 7ab6ed3..7b92dda 100644 --- a/src/test/resources/unit-tests/sources_and_tests_parameter_have_not_includes_tag/pom.xml +++ b/src/test/resources/unit-tests/sources_and_tests_parameter_have_not_includes_tag/pom.xml @@ -11,8 +11,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - UT3 - UT3 + APP + pass diff --git a/src/test/resources/unit-tests/sources_tests_parameters/pom.xml b/src/test/resources/unit-tests/sources_tests_parameters/pom.xml index b1a778e..256e63f 100644 --- a/src/test/resources/unit-tests/sources_tests_parameters/pom.xml +++ b/src/test/resources/unit-tests/sources_tests_parameters/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - UT3 - UT3 + APP + pass From b415c63b0ebabbf8fc4c51c6b39ea7104ac55cb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Sat, 25 Apr 2026 21:20:17 +0300 Subject: [PATCH 05/13] Update build process. --- .github/workflows/api-snapshot-check.yml | 63 +++++++++++++++++++ .github/workflows/build.yml | 14 ++--- .github/workflows/release.yml | 29 +++------ scripts/1_install_utplsql.sh | 35 +++++++++-- scripts/sql/create_users.sql | 2 +- .../utplsql/maven/plugin/UtPlsqlMojoTest.java | 4 +- .../UtPlsqlMojoIT/exclude_object/pom.xml | 4 +- .../UtPlsqlMojoIT/exclude_object_expr/pom.xml | 4 +- .../UtPlsqlMojoIT/include_object/pom.xml | 4 +- .../UtPlsqlMojoIT/include_object_expr/pom.xml | 6 +- .../plugin/UtPlsqlMojoIT/minimalist/pom.xml | 4 +- .../UtPlsqlMojoIT/ora_stuck_timeout/pom.xml | 4 +- .../plugin/UtPlsqlMojoIT/owner_param/pom.xml | 4 +- .../sources/foo/packages/PKG_TEST_ME.pks | 5 +- .../scripts/sources/foo/tables/TO_TEST_ME.sql | 2 - .../maven/plugin/UtPlsqlMojoIT/regex/pom.xml | 4 +- .../maven/plugin/UtPlsqlMojoIT/simple/pom.xml | 4 +- .../maven/plugin/UtPlsqlMojoIT/skip/pom.xml | 4 +- .../maven/plugin/UtPlsqlMojoIT/tags/pom.xml | 4 +- .../plugin/UtPlsqlMojoIT/type_mapping/pom.xml | 4 +- .../resources/unit-tests/dbms_output/pom.xml | 4 +- .../default_console_output_behaviour/pom.xml | 4 +- .../unit-tests/default_reporter/pom.xml | 4 +- .../unit-tests/exclude_object/pom.xml | 4 +- .../unit-tests/exclude_object_expr/pom.xml | 4 +- .../unit-tests/exclude_schema_expr/pom.xml | 4 +- .../unit-tests/include_object/pom.xml | 4 +- .../unit-tests/include_object_expr/pom.xml | 4 +- .../unit-tests/include_schema_expr/pom.xml | 4 +- .../invalid_sources_directory/pom.xml | 4 +- .../invalid_tests_directory/pom.xml | 4 +- .../unit-tests/ora_stuck_timeout/pom.xml | 4 +- .../unit-tests/skip_utplsql_tests/pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../sources_tests_parameters/pom.xml | 4 +- 38 files changed, 172 insertions(+), 104 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..0e9dae3 --- /dev/null +++ b/.github/workflows/api-snapshot-check.yml @@ -0,0 +1,63 @@ +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: pass + + services: + oracle: + image: gvenzl/oracle-free:23-slim-faststart + env: + ORACLE_PASSWORD: oracle + DB_URL: "//localhost:1521/FREEPDB1" + 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 + + - name: Set up JDK + uses: actions/setup-java@v5 + with: + distribution: 'temurin' + java-version: '21' + + - name: Install utplsql + run: .github/scripts/1_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" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b6724f5..6a4a88b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,21 +8,20 @@ on: workflow_dispatch: - repository_dispatch: - type: [utPLSQL-build,utPLSQL-java-api-build] - jobs: build: runs-on: ubuntu-latest env: + UTPLSQL_VERSION: develop + UTPLSQL_FILE: utPLSQL DB_URL: "//localhost:1521/FREEPDB1" - DB_USER: UT3 - DB_PASS: UT3 + DB_USER: APP + DB_PASS: pass services: oracle: - image: gvenzl/oracle-xe:21-slim + image: gvenzl/oracle-free:23-slim-faststart env: ORACLE_PASSWORD: oracle ports: @@ -32,6 +31,7 @@ jobs: --health-interval 10s --health-timeout 5s --health-retries 10 + --name oracle steps: - uses: actions/checkout@v4 @@ -48,7 +48,7 @@ jobs: uses: actions/setup-java@v5 with: java-version: '17' - distribution: 'adopt' + distribution: 'temurin' server-id: ossrh server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4825e34..a18c098 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,7 +11,7 @@ jobs: services: oracle: - image: gvenzl/oracle-xe:21-slim + image: gvenzl/oracle-free:23-slim-faststart env: ORACLE_PASSWORD: oracle ports: @@ -23,7 +23,7 @@ jobs: --health-retries 10 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install utPLSQL run: sh ${{ github.workspace }}/scripts/1_install_utplsql.sh @@ -31,11 +31,11 @@ jobs: - name: Install demo project run: sh ${{ github.workspace }}/scripts/2_install_demo_project.sh - - name: Set up JDK 11 - uses: actions/setup-java@v2 + - name: Set up JDK 17 + uses: actions/setup-java@v5 with: - java-version: '11' - distribution: 'adopt' + java-version: '17' + distribution: 'temurin' server-id: ossrh server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD @@ -43,7 +43,7 @@ jobs: gpg-passphrase: MAVEN_GPG_PASSPHRASE - name: Cache local Maven repository - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} @@ -57,18 +57,3 @@ jobs: MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} - 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: - # Required Input - repo_token: ${{secrets.GITHUB_TOKEN}} - slack_webhook_url: ${{secrets.SLACK_WEBHOOK_URL}} - # Optional Input - name: 'Github Actions[bot]' - icon_url: 'https://octodex.github.com/images/mona-the-rivetertocat.png' diff --git a/scripts/1_install_utplsql.sh b/scripts/1_install_utplsql.sh index e85d855..8aee546 100644 --- a/scripts/1_install_utplsql.sh +++ b/scripts/1_install_utplsql.sh @@ -1,8 +1,33 @@ -UTPLSQL_DOWNLOAD_URL=$(curl --silent https://api.github.com/repos/utPLSQL/utPLSQL/releases/latest | awk '/browser_download_url/ { print $2 }' | grep ".zip\"" | sed 's/"//g') +#!/bin/bash +set -ev +cd $(dirname $(readlink -f $0)) -curl -Lk "${UTPLSQL_DOWNLOAD_URL}" -o utPLSQL.zip +# Download the specified version of utPLSQL. +if [ "$UTPLSQL_VERSION" == "develop" ] +then + git clone -b develop --single-branch https://github.com/utPLSQL/utPLSQL.git +else + curl -L -O "https://github.com/utPLSQL/utPLSQL/releases/download/$UTPLSQL_VERSION/$UTPLSQL_FILE.tar.gz" + tar -xzf ${UTPLSQL_FILE}.tar.gz && rm ${UTPLSQL_FILE}.tar.gz +fi -unzip -q utPLSQL.zip +chmod -R go+w ./${UTPLSQL_FILE}/{source,examples} +# Create a temporary install script. +cat > install.sh.tmp < jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - APP - pass + UT3 + ut3 diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/exclude_object_expr/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/exclude_object_expr/pom.xml index 14a165c..8e1701a 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/exclude_object_expr/pom.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/exclude_object_expr/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - APP - pass + UT3 + ut3 diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object/pom.xml index afc2c9b..ae6edd8 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object/pom.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - APP - pass + UT3 + ut3 diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object_expr/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object_expr/pom.xml index a756848..e78b9d2 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object_expr/pom.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object_expr/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - APP - pass + UT3 + ut3 @@ -42,7 +42,7 @@ true - app.* + APP.* diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/minimalist/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/minimalist/pom.xml index 9aa8065..6a1a36a 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/minimalist/pom.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/minimalist/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - APP - pass + UT3 + ut3 diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/ora_stuck_timeout/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/ora_stuck_timeout/pom.xml index 4f9d58d..8c88c5c 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/ora_stuck_timeout/pom.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/ora_stuck_timeout/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - APP - pass + UT3 + ut3 diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/pom.xml index f429ebe..c43a7e5 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/pom.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - APP - pass + UT3 + ut3 diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/sources/foo/packages/PKG_TEST_ME.pks b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/sources/foo/packages/PKG_TEST_ME.pks index 9bd569e..959b122 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/sources/foo/packages/PKG_TEST_ME.pks +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/sources/foo/packages/PKG_TEST_ME.pks @@ -5,7 +5,4 @@ CREATE OR REPLACE PACKAGE CODE_OWNER.PKG_TEST_ME AS FUNCTION FC_TEST_ME(PPARAM1 IN VARCHAR2) RETURN NUMBER; PROCEDURE PR_TEST_ME(PSNAME IN VARCHAR2); END PKG_TEST_ME; -/ - -grant execute on pkg_test_me to tests_owner; -grant debug on pkg_test_me to tests_owner; +/ \ No newline at end of file diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/sources/foo/tables/TO_TEST_ME.sql b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/sources/foo/tables/TO_TEST_ME.sql index d130dca..b2e90d9 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/sources/foo/tables/TO_TEST_ME.sql +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/sources/foo/tables/TO_TEST_ME.sql @@ -6,5 +6,3 @@ CREATE TABLE TO_TEST_ME SNAME VARCHAR2(10) ) / - -grant all on to_test_me to tests_owner; \ No newline at end of file diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/regex/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/regex/pom.xml index 61f4b0a..02fddc2 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/regex/pom.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/regex/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - APP - pass + UT3 + ut3 diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/simple/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/simple/pom.xml index e9fa2b4..dbb4a25 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/simple/pom.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/simple/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - APP - pass + UT3 + ut3 diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/skip/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/skip/pom.xml index 7b083c6..e0b2e44 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/skip/pom.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/skip/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - APP - pass + UT3 + ut3 diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/tags/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/tags/pom.xml index e62a442..d027db2 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/tags/pom.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/tags/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - APP - pass + UT3 + ut3 diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/type_mapping/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/type_mapping/pom.xml index f11fce0..555a850 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/type_mapping/pom.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/type_mapping/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - APP - pass + UT3 + ut3 diff --git a/src/test/resources/unit-tests/dbms_output/pom.xml b/src/test/resources/unit-tests/dbms_output/pom.xml index 67d26b9..13037fb 100644 --- a/src/test/resources/unit-tests/dbms_output/pom.xml +++ b/src/test/resources/unit-tests/dbms_output/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - APP - pass + UT3 + ut3 diff --git a/src/test/resources/unit-tests/default_console_output_behaviour/pom.xml b/src/test/resources/unit-tests/default_console_output_behaviour/pom.xml index 5788a5e..5b980dc 100644 --- a/src/test/resources/unit-tests/default_console_output_behaviour/pom.xml +++ b/src/test/resources/unit-tests/default_console_output_behaviour/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - APP - pass + UT3 + ut3 diff --git a/src/test/resources/unit-tests/default_reporter/pom.xml b/src/test/resources/unit-tests/default_reporter/pom.xml index 0c00eef..d4411d8 100644 --- a/src/test/resources/unit-tests/default_reporter/pom.xml +++ b/src/test/resources/unit-tests/default_reporter/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - APP - pass + UT3 + ut3 diff --git a/src/test/resources/unit-tests/exclude_object/pom.xml b/src/test/resources/unit-tests/exclude_object/pom.xml index fab0f81..43f83ca 100644 --- a/src/test/resources/unit-tests/exclude_object/pom.xml +++ b/src/test/resources/unit-tests/exclude_object/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - APP - pass + UT3 + ut3 diff --git a/src/test/resources/unit-tests/exclude_object_expr/pom.xml b/src/test/resources/unit-tests/exclude_object_expr/pom.xml index 7adab95..7db4090 100644 --- a/src/test/resources/unit-tests/exclude_object_expr/pom.xml +++ b/src/test/resources/unit-tests/exclude_object_expr/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - APP - pass + UT3 + ut3 diff --git a/src/test/resources/unit-tests/exclude_schema_expr/pom.xml b/src/test/resources/unit-tests/exclude_schema_expr/pom.xml index f41b1b5..e0fa712 100644 --- a/src/test/resources/unit-tests/exclude_schema_expr/pom.xml +++ b/src/test/resources/unit-tests/exclude_schema_expr/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - APP - pass + UT3 + ut3 diff --git a/src/test/resources/unit-tests/include_object/pom.xml b/src/test/resources/unit-tests/include_object/pom.xml index 2e6a724..6da5ff1 100644 --- a/src/test/resources/unit-tests/include_object/pom.xml +++ b/src/test/resources/unit-tests/include_object/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - APP - pass + UT3 + ut3 diff --git a/src/test/resources/unit-tests/include_object_expr/pom.xml b/src/test/resources/unit-tests/include_object_expr/pom.xml index 049969d..967f725 100644 --- a/src/test/resources/unit-tests/include_object_expr/pom.xml +++ b/src/test/resources/unit-tests/include_object_expr/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - APP - pass + UT3 + ut3 diff --git a/src/test/resources/unit-tests/include_schema_expr/pom.xml b/src/test/resources/unit-tests/include_schema_expr/pom.xml index 1408299..9193e5b 100644 --- a/src/test/resources/unit-tests/include_schema_expr/pom.xml +++ b/src/test/resources/unit-tests/include_schema_expr/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - APP - pass + UT3 + ut3 diff --git a/src/test/resources/unit-tests/invalid_sources_directory/pom.xml b/src/test/resources/unit-tests/invalid_sources_directory/pom.xml index 799c4f5..74c84ea 100644 --- a/src/test/resources/unit-tests/invalid_sources_directory/pom.xml +++ b/src/test/resources/unit-tests/invalid_sources_directory/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - APP - pass + UT3 + ut3 diff --git a/src/test/resources/unit-tests/invalid_tests_directory/pom.xml b/src/test/resources/unit-tests/invalid_tests_directory/pom.xml index d7bd80a..e6f868a 100644 --- a/src/test/resources/unit-tests/invalid_tests_directory/pom.xml +++ b/src/test/resources/unit-tests/invalid_tests_directory/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - APP - pass + UT3 + ut3 diff --git a/src/test/resources/unit-tests/ora_stuck_timeout/pom.xml b/src/test/resources/unit-tests/ora_stuck_timeout/pom.xml index f8233f5..fbb4dcd 100644 --- a/src/test/resources/unit-tests/ora_stuck_timeout/pom.xml +++ b/src/test/resources/unit-tests/ora_stuck_timeout/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - APP - pass + UT3 + ut3 diff --git a/src/test/resources/unit-tests/skip_utplsql_tests/pom.xml b/src/test/resources/unit-tests/skip_utplsql_tests/pom.xml index eee75a7..dd99f13 100644 --- a/src/test/resources/unit-tests/skip_utplsql_tests/pom.xml +++ b/src/test/resources/unit-tests/skip_utplsql_tests/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - APP - pass + UT3 + ut3 diff --git a/src/test/resources/unit-tests/sources_and_tests_parameter_does_not_exist/pom.xml b/src/test/resources/unit-tests/sources_and_tests_parameter_does_not_exist/pom.xml index 985fc79..83b1daa 100644 --- a/src/test/resources/unit-tests/sources_and_tests_parameter_does_not_exist/pom.xml +++ b/src/test/resources/unit-tests/sources_and_tests_parameter_does_not_exist/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - APP - pass + UT3 + ut3 diff --git a/src/test/resources/unit-tests/sources_and_tests_parameter_does_not_exist_but_default_directory_exists/pom.xml b/src/test/resources/unit-tests/sources_and_tests_parameter_does_not_exist_but_default_directory_exists/pom.xml index 985fc79..83b1daa 100644 --- a/src/test/resources/unit-tests/sources_and_tests_parameter_does_not_exist_but_default_directory_exists/pom.xml +++ b/src/test/resources/unit-tests/sources_and_tests_parameter_does_not_exist_but_default_directory_exists/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - APP - pass + UT3 + ut3 diff --git a/src/test/resources/unit-tests/sources_and_tests_parameter_have_not_directory_tag/pom.xml b/src/test/resources/unit-tests/sources_and_tests_parameter_have_not_directory_tag/pom.xml index a9f4690..16d419c 100644 --- a/src/test/resources/unit-tests/sources_and_tests_parameter_have_not_directory_tag/pom.xml +++ b/src/test/resources/unit-tests/sources_and_tests_parameter_have_not_directory_tag/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - APP - pass + UT3 + ut3 diff --git a/src/test/resources/unit-tests/sources_and_tests_parameter_have_not_includes_tag/pom.xml b/src/test/resources/unit-tests/sources_and_tests_parameter_have_not_includes_tag/pom.xml index 7b92dda..52adc45 100644 --- a/src/test/resources/unit-tests/sources_and_tests_parameter_have_not_includes_tag/pom.xml +++ b/src/test/resources/unit-tests/sources_and_tests_parameter_have_not_includes_tag/pom.xml @@ -11,8 +11,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - APP - pass + UT3 + ut3 diff --git a/src/test/resources/unit-tests/sources_tests_parameters/pom.xml b/src/test/resources/unit-tests/sources_tests_parameters/pom.xml index 256e63f..9ec7a27 100644 --- a/src/test/resources/unit-tests/sources_tests_parameters/pom.xml +++ b/src/test/resources/unit-tests/sources_tests_parameters/pom.xml @@ -10,8 +10,8 @@ jdbc:oracle:thin:@//localhost:1521/FREEPDB1 - APP - pass + UT3 + ut3 From f601046c0fa7317b7ef0b1ff9d9dc36dc6964dda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Sat, 25 Apr 2026 21:31:14 +0300 Subject: [PATCH 06/13] Update build process. --- {scripts => .github/scripts}/1_install_utplsql.sh | 0 {scripts => .github/scripts}/2_install_demo_project.sh | 9 +++++---- {scripts => .github/scripts}/sql/create_app_objects.sql | 0 .../scripts}/sql/create_source_owner_objects.sql | 0 .../scripts}/sql/create_tests_owner_objects.sql | 0 {scripts => .github/scripts}/sql/create_users.sql | 0 .github/workflows/api-snapshot-check.yml | 2 +- .github/workflows/build.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- 9 files changed, 10 insertions(+), 9 deletions(-) rename {scripts => .github/scripts}/1_install_utplsql.sh (100%) rename {scripts => .github/scripts}/2_install_demo_project.sh (56%) rename {scripts => .github/scripts}/sql/create_app_objects.sql (100%) rename {scripts => .github/scripts}/sql/create_source_owner_objects.sql (100%) rename {scripts => .github/scripts}/sql/create_tests_owner_objects.sql (100%) rename {scripts => .github/scripts}/sql/create_users.sql (100%) diff --git a/scripts/1_install_utplsql.sh b/.github/scripts/1_install_utplsql.sh similarity index 100% rename from scripts/1_install_utplsql.sh rename to .github/scripts/1_install_utplsql.sh diff --git a/scripts/2_install_demo_project.sh b/.github/scripts/2_install_demo_project.sh similarity index 56% rename from scripts/2_install_demo_project.sh rename to .github/scripts/2_install_demo_project.sh index a2a002d..b9fdb97 100644 --- a/scripts/2_install_demo_project.sh +++ b/.github/scripts/2_install_demo_project.sh @@ -1,11 +1,12 @@ +#!/bin/bash docker run --rm -v $(pwd):/work -w /work/ --network host --entrypoint sqlplus truemark/sqlplus:19.8 \ - sys/oracle@${DB_URL} as sysdba @scripts/sql/create_users.sql + sys/oracle@${DB_URL} as sysdba @.github/scripts/sql/create_users.sql docker run --rm -v $(pwd):/work -w /work/ --network host --entrypoint sqlplus truemark/sqlplus:19.8 \ - app/pass@${DB_URL} @scripts/sql/create_app_objects.sql + app/pass@${DB_URL} @.github/scripts/sql/create_app_objects.sql docker run --rm -v $(pwd):/work -w /work/ --network host --entrypoint sqlplus truemark/sqlplus:19.8 \ - code_owner/pass@${DB_URL} @scripts/sql/create_source_owner_objects.sql + code_owner/pass@${DB_URL} @.github/scripts/sql/create_source_owner_objects.sql docker run --rm -v $(pwd):/work -w /work/ --network host --entrypoint sqlplus truemark/sqlplus:19.8 \ - tests_owner/pass@${DB_URL} @scripts/sql/create_tests_owner_objects.sql + tests_owner/pass@${DB_URL} @.github/scripts/sql/create_tests_owner_objects.sql diff --git a/scripts/sql/create_app_objects.sql b/.github/scripts/sql/create_app_objects.sql similarity index 100% rename from scripts/sql/create_app_objects.sql rename to .github/scripts/sql/create_app_objects.sql diff --git a/scripts/sql/create_source_owner_objects.sql b/.github/scripts/sql/create_source_owner_objects.sql similarity index 100% rename from scripts/sql/create_source_owner_objects.sql rename to .github/scripts/sql/create_source_owner_objects.sql diff --git a/scripts/sql/create_tests_owner_objects.sql b/.github/scripts/sql/create_tests_owner_objects.sql similarity index 100% rename from scripts/sql/create_tests_owner_objects.sql rename to .github/scripts/sql/create_tests_owner_objects.sql diff --git a/scripts/sql/create_users.sql b/.github/scripts/sql/create_users.sql similarity index 100% rename from scripts/sql/create_users.sql rename to .github/scripts/sql/create_users.sql diff --git a/.github/workflows/api-snapshot-check.yml b/.github/workflows/api-snapshot-check.yml index 0e9dae3..6190333 100644 --- a/.github/workflows/api-snapshot-check.yml +++ b/.github/workflows/api-snapshot-check.yml @@ -55,7 +55,7 @@ jobs: run: .github/scripts/1_install_utplsql.sh - name: Install demo project - run: .github/scripts/install_demo_project.sh + run: .github/scripts/2_install_demo_project.sh - name: Build and Test run: | diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6a4a88b..d61f37d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,10 +39,10 @@ jobs: fetch-depth: 0 - name: Install utPLSQL - run: sh ${{ github.workspace }}/scripts/1_install_utplsql.sh + run: .github/scripts/1_install_utplsql.sh - name: Install demo project - run: sh ${{ github.workspace }}/scripts/2_install_demo_project.sh + run: .github/scripts/2_install_demo_project.sh - name: Set up JDK 17 uses: actions/setup-java@v5 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a18c098..11652fa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,10 +26,10 @@ jobs: - uses: actions/checkout@v4 - name: Install utPLSQL - run: sh ${{ github.workspace }}/scripts/1_install_utplsql.sh + run: .github/scripts/1_install_utplsql.sh - name: Install demo project - run: sh ${{ github.workspace }}/scripts/2_install_demo_project.sh + run: .github/scripts/2_install_demo_project.sh - name: Set up JDK 17 uses: actions/setup-java@v5 From 7855bfd46c97cb0e62d78de90d4639074e1c7a8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Sat, 25 Apr 2026 21:36:50 +0300 Subject: [PATCH 07/13] Fixing fle permissions --- .github/scripts/1_install_utplsql.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .github/scripts/1_install_utplsql.sh diff --git a/.github/scripts/1_install_utplsql.sh b/.github/scripts/1_install_utplsql.sh old mode 100644 new mode 100755 From 5027e4a6fc95da515b81543cf9b0ef5cd2f55a0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Sat, 25 Apr 2026 21:41:08 +0300 Subject: [PATCH 08/13] Fixing new install scripts --- .github/scripts/1_install_utplsql.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/scripts/1_install_utplsql.sh b/.github/scripts/1_install_utplsql.sh index 8aee546..88ae94c 100755 --- a/.github/scripts/1_install_utplsql.sh +++ b/.github/scripts/1_install_utplsql.sh @@ -20,9 +20,7 @@ EOF # Copy utPLSQL files to the container and install it. docker cp ./${UTPLSQL_FILE} oracle:/${UTPLSQL_FILE} -# docker cp ./$UTPLSQL_FILE $ORACLE_VERSION:/$UTPLSQL_FILE docker cp ./install.sh.tmp oracle:/install.sh -docker cp ./create_api_user.sh oracle:/create_api_user.sh # Remove temporary files. # rm $UTPLSQL_FILE.tar.gz rm -rf $UTPLSQL_FILE @@ -30,4 +28,3 @@ rm install.sh.tmp # Execute the utPLSQL installation inside the container. docker exec oracle bash /install.sh -docker exec oracle bash /create_api_user.sh From 88f43d5b201e71cc828b45966a7b003a9b507051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Sat, 25 Apr 2026 21:43:12 +0300 Subject: [PATCH 09/13] Fixing file permissions. --- .github/scripts/2_install_demo_project.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .github/scripts/2_install_demo_project.sh diff --git a/.github/scripts/2_install_demo_project.sh b/.github/scripts/2_install_demo_project.sh old mode 100644 new mode 100755 From d8d839e3ae5ad6401bcc647902cf84e8f28f7e90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Sat, 25 Apr 2026 21:51:14 +0300 Subject: [PATCH 10/13] Replaced `org.codehaus.plexus.util.DirectoryScanner` with `org.apache.maven.shared.utils.io.DirectoryScanner` --- pom.xml | 8 -------- .../java/org/utplsql/maven/plugin/io/SqlFileScanner.java | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index c1c5681..209c36b 100644 --- a/pom.xml +++ b/pom.xml @@ -92,14 +92,6 @@ 3.4.2 - - - org.codehaus.plexus - plexus-utils - 3.6.1 - provided - - org.utplsql utplsql-java-api diff --git a/src/main/java/org/utplsql/maven/plugin/io/SqlFileScanner.java b/src/main/java/org/utplsql/maven/plugin/io/SqlFileScanner.java index f126769..14001fe 100644 --- a/src/main/java/org/utplsql/maven/plugin/io/SqlFileScanner.java +++ b/src/main/java/org/utplsql/maven/plugin/io/SqlFileScanner.java @@ -1,7 +1,7 @@ package org.utplsql.maven.plugin.io; import org.apache.maven.model.Resource; -import org.codehaus.plexus.util.DirectoryScanner; +import org.apache.maven.shared.utils.io.DirectoryScanner; import java.io.File; import java.io.IOException; From 079ba4819b7a67f85d9e3be71fd615220b73cc0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Sat, 25 Apr 2026 22:08:29 +0300 Subject: [PATCH 11/13] Fixing issues with output paths. --- src/test/java/org/utplsql/maven/plugin/ReportChecker.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/utplsql/maven/plugin/ReportChecker.java b/src/test/java/org/utplsql/maven/plugin/ReportChecker.java index 9c8d815..828989e 100644 --- a/src/test/java/org/utplsql/maven/plugin/ReportChecker.java +++ b/src/test/java/org/utplsql/maven/plugin/ReportChecker.java @@ -28,10 +28,10 @@ private ReportChecker() { */ public static void assertThatReportsAreGeneratedAsExpected(MavenExecutionResult result, String... files) { for (String filename : files) { - File expectedOutputFile = new File(result.getMavenProjectResult().getTargetProjectDirectory().toFile(), "/expected-output/utplsql/" + filename); - File outputFile = new File(result.getMavenProjectResult().getTargetProjectDirectory().toFile(), "/target/utplsql/" + filename); + File expectedOutputFile = new File(result.getMavenProjectResult().getTargetProjectDirectory().toFile(), "expected-output/utplsql/" + filename); + File outputFile = new File(result.getMavenProjectResult().getTargetProjectDirectory().toFile(), "target/utplsql/" + filename); - assertThat(result.getMavenProjectResult()).withFile("/utplsql/" + filename).exists(); + assertThat(result.getMavenProjectResult()).withFile("utplsql/" + filename).exists(); try (Stream stream = Files.lines(outputFile.toPath())) { String outputContent = stream From 4481cfcf5ea4698f33570930acee4498613543cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Sat, 25 Apr 2026 22:23:58 +0300 Subject: [PATCH 12/13] Fixing failing coverage test. --- .../expected-output/utplsql/coverage-sonar-report.xml | 2 +- .../maven/plugin/UtPlsqlMojoIT/include_object_expr/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object_expr/expected-output/utplsql/coverage-sonar-report.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object_expr/expected-output/utplsql/coverage-sonar-report.xml index 2dbcb4d..f59ddcf 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object_expr/expected-output/utplsql/coverage-sonar-report.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object_expr/expected-output/utplsql/coverage-sonar-report.xml @@ -1 +1 @@ - + diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object_expr/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object_expr/pom.xml index e78b9d2..1369fda 100644 --- a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object_expr/pom.xml +++ b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object_expr/pom.xml @@ -42,7 +42,7 @@ true - APP.* + TEST_PKG_.*_ME From 284b30469423c4729e1e544cbd364447212191e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Sat, 25 Apr 2026 22:31:14 +0300 Subject: [PATCH 13/13] Update sonar project key --- .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 d61f37d..57f68e2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -64,7 +64,7 @@ jobs: ${{ runner.os }}-maven- - name: Maven unit and integration tests with sonar - run: mvn clean verify sonar:sonar -Pcoverage -Dsonar.projectKey=org.utplsql:utplsql-maven-plugin + run: mvn clean verify sonar:sonar -Pcoverage -Dsonar.projectKey=utPLSQL_utPLSQL-maven-plugin env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}