This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git
The following commit(s) were added to refs/heads/master by this push:
new ed45af69 Bump commons-parent from 58 to 59
ed45af69 is described below
commit ed45af69b828888d030baecf40dbfeaf5647e6f7
Author: Gary Gregory <[email protected]>
AuthorDate: Sun Jul 30 19:27:21 2023 -0400
Bump commons-parent from 58 to 59
Supports JPMS module info generation when building on Java 11 and up
---
pom.xml | 27 +++++++++++----------------
src/changes/changes.xml | 2 +-
2 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/pom.xml b/pom.xml
index 37d6f637..d51fc339 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
- <version>58</version>
+ <version>59</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>commons-dbcp2</artifactId>
@@ -217,10 +217,9 @@
<!-- For managed connections -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>1.1.1</version>
- <optional>true</optional>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
+ <version>1.3.1</version>
</dependency>
<!-- tomcat naming jars for jndi reference tests -->
@@ -274,12 +273,6 @@
<version>5.12.7.Final</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.transaction</groupId>
- <artifactId>jboss-transaction-api_1.2_spec</artifactId>
- <version>1.1.1.Final</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-transaction-spi</artifactId>
@@ -335,6 +328,8 @@
<japicmp.skip>false</japicmp.skip>
<spotbugs.skip>false</spotbugs.skip>
<findbugs.skip>true</findbugs.skip>
+ <!-- spdx 0.6.0 can require Java 11 depending on undocumented behavior
which kicks in for us here. -->
+ <commons.spdx.version>0.5.5</commons.spdx.version>
<surefire.argline></surefire.argline>
</properties>
@@ -458,11 +453,11 @@
<oldVersionPattern>${commons.bc.version}</oldVersionPattern>
</parameter>
<dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>1.1.1</version>
- </dependency>
+<dependency>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
+ <version>1.3.1</version>
+</dependency>
</dependencies>
</configuration>
</plugin>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index a4dd5f5c..c8ce1fbb 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -208,7 +208,7 @@ The <action> type attribute can be add,update,fix,remove.
Bump slf4j-simple from 1.7.30 to 1.7.36 #169.
</action>
<action dev="ggregory" type="update" due-to="Dependabot, Gary Gregory">
- Bump commons-parent from 52 to 58 #180, #219, #254, #278.
+ Bump commons-parent from 52 to 59 #180, #219, #254, #278.
</action>
<action dev="ggregory" type="update" due-to="Gary Gregory">
Bump JaCoCo from 0.8.7 to 0.8.8.