diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6c848b6..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 ] @@ -15,6 +15,10 @@ jobs: build: runs-on: ubuntu-latest + env: + DB_URL: "//localhost:1521/FREEPDB1" + DB_USER: UT3 + DB_PASS: UT3 services: oracle: @@ -30,7 +34,7 @@ jobs: --health-retries 10 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 @@ -41,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' @@ -52,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') }} @@ -73,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' 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