Skip to content

Commit 76ad405

Browse files
simaschsimasch
committed
Merge branch 'develop'
2 parents a191427 + 0afdbd5 commit 76ad405

File tree

70 files changed

+382
-354
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+382
-354
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
workflow_dispatch:
1010

1111
repository_dispatch:
12-
type: [utPLSQL-build]
12+
type: [utPLSQL-build,utPLSQL-java-api-build]
1313

1414
jobs:
1515
build:

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ dependency-reduced-pom.xml
2626
doc/
2727
/utPLSQL/
2828
/utPLSQL.zip
29+
/tree.txt

‎README.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Please refer to the following usage example for the parameters descriptions:
9090
<plugin>
9191
<groupId>org.utplsql</groupId>
9292
<artifactId>utplsql-maven-plugin</artifactId>
93-
<version>3.1.9</version>
93+
<version>3.1.10</version>
9494
<executions>
9595
<execution>
9696
<goals>
@@ -152,6 +152,10 @@ Please refer to the following usage example for the parameters descriptions:
152152
<!-- Enables DBMS_OUTPUT -->
153153
<!-- Defaults to: false -->
154154
<dbmsOutput>false</dbmsOutput>
155+
156+
<!-- Sets a timeout around Reporter creation and retries when not ready after a while. -->
157+
<!-- 0 = no timeout. -->
158+
<ora-stuck-timeout>0</ora-stuck-timeout>
155159

156160
<!-- A list of tags to run. -->
157161
<tags>

‎mvnw‎

Lines changed: 85 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎mvnw.cmd‎

Lines changed: 43 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>org.utplsql</groupId>
77
<artifactId>utplsql-maven-plugin</artifactId>
8-
<version>3.1.9</version>
8+
<version>3.1.10</version>
99
<packaging>maven-plugin</packaging>
1010

1111
<name>utPLSQL Maven Plugin</name>
@@ -78,13 +78,13 @@
7878
<dependency>
7979
<groupId>org.apache.maven.shared</groupId>
8080
<artifactId>maven-shared-utils</artifactId>
81-
<version>3.1.0</version>
81+
<version>3.3.4</version>
8282
</dependency>
8383

8484
<dependency>
8585
<groupId>org.utplsql</groupId>
8686
<artifactId>java-api</artifactId>
87-
<version>3.1.8</version>
87+
<version>3.1.9</version>
8888
</dependency>
8989

9090
<dependency>

‎scripts/sql/create_app_objects.sql‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
whenever sqlerror exit failure rollback
22
whenever oserror exit failure rollback
33

4-
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/simple/scripts/sources/TO_TEST_ME.tab
5-
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/simple/scripts/sources/APP.PKG_TEST_ME.spc
6-
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/simple/scripts/sources/APP.PKG_TEST_ME.bdy
4+
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/simple/scripts/sources/TO_TEST_ME.sql
5+
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/simple/scripts/sources/APP.PKG_TEST_ME.pks
6+
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/simple/scripts/sources/APP.PKG_TEST_ME.pkb
77

8-
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/simple/scripts/tests/APP.TEST_PKG_TEST_ME.spc
9-
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/simple/scripts/tests/APP.TEST_PKG_TEST_ME.bdy
8+
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/simple/scripts/tests/APP.TEST_PKG_TEST_ME.pks
9+
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/simple/scripts/tests/APP.TEST_PKG_TEST_ME.pkb

‎scripts/sql/create_source_owner_objects.sql‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
whenever sqlerror exit failure rollback
22
whenever oserror exit failure rollback
33

4-
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/sources/foo/tables/TO_TEST_ME.tab
5-
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/sources/foo/packages/PKG_TEST_ME.sql
6-
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/sources/foo/package_bodies/PKG_TEST_ME.sql
4+
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/sources/foo/tables/TO_TEST_ME.sql
5+
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/sources/foo/packages/PKG_TEST_ME.pks
6+
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/sources/foo/package_bodies/PKG_TEST_ME.pkb

‎scripts/sql/create_tests_owner_objects.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ whenever oserror exit failure rollback
44
create synonym TO_TEST_ME for CODE_OWNER.TO_TEST_ME;
55
create synonym PKG_TEST_ME for CODE_OWNER.PKG_TEST_ME;
66

7-
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/test/bar/packages/TEST_PKG_TEST_ME.sql
8-
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/test/bar/package_bodies/TEST_PKG_TEST_ME.sql
7+
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/test/bar/packages/TEST_PKG_TEST_ME.pks
8+
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/test/bar/package_bodies/TEST_PKG_TEST_ME.pkb

‎src/main/java/org/utplsql/maven/plugin/UtPlsqlMojo.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,9 @@ public class UtPlsqlMojo extends AbstractMojo {
125125
@Parameter
126126
boolean dbmsOutput;
127127

128+
@Parameter(defaultValue = "0")
129+
Integer oraStuckTimeout;
130+
128131
private final SqlFileScanner sqlFileScanner = new SqlFileScanner();
129132

130133
@Override
@@ -160,7 +163,8 @@ public void execute() throws MojoExecutionException {
160163
.addTags(tags)
161164
.randomTestOrder(randomTestOrder)
162165
.randomTestOrderSeed(randomTestOrderSeed)
163-
.failOnErrors(!ignoreFailure);
166+
.failOnErrors(!ignoreFailure)
167+
.oraStuckTimeout(oraStuckTimeout);
164168

165169
if (isNotBlank(excludeObject)) {
166170
if (excludeObject.contains(",")) {

0 commit comments

Comments
 (0)