This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch TOMEE-3800
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/TOMEE-3800 by this push:
new 0d590e87e1 TOMEE-3800 - DBCP 2.9.0 updates
0d590e87e1 is described below
commit 0d590e87e132f5f2c270714c26a0cda206dcd2b6
Author: Richard Zowalla <[email protected]>
AuthorDate: Sat Jun 25 09:47:32 2022 +0200
TOMEE-3800 - DBCP 2.9.0 updates
---
boms/tomee-microprofile/pom.xml | 2 +-
boms/tomee-plume/pom.xml | 2 +-
boms/tomee-plus/pom.xml | 2 +-
boms/tomee-webprofile/pom.xml | 2 +-
.../apache/openejb/resource/jdbc/dbcp/BasicManagedDataSource.java | 2 +-
.../org/apache/openejb/resource/jdbc/dbcp/DbcpManagedDataSource.java | 2 +-
.../apache/openejb/resource/jdbc/dbcp/DbcpTransactionRegistry.java | 5 +----
7 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml
index 9758baf2bc..7b52639dbe 100644
--- a/boms/tomee-microprofile/pom.xml
+++ b/boms/tomee-microprofile/pom.xml
@@ -279,7 +279,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
- <version>2.3.0</version>
+ <version>2.9.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
index 57febeeb94..c7e5f94486 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -356,7 +356,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
- <version>2.3.0</version>
+ <version>2.9.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
index 3ebcbfd824..1fd23afca0 100644
--- a/boms/tomee-plus/pom.xml
+++ b/boms/tomee-plus/pom.xml
@@ -367,7 +367,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
- <version>2.3.0</version>
+ <version>2.9.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-webprofile/pom.xml b/boms/tomee-webprofile/pom.xml
index 8ad8690d90..4839cc3ff9 100644
--- a/boms/tomee-webprofile/pom.xml
+++ b/boms/tomee-webprofile/pom.xml
@@ -180,7 +180,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
- <version>2.3.0</version>
+ <version>2.9.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicManagedDataSource.java
b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicManagedDataSource.java
index 09369d3333..bc8469e0c8 100644
---
a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicManagedDataSource.java
+++
b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicManagedDataSource.java
@@ -183,7 +183,7 @@ public class BasicManagedDataSource extends
org.apache.commons.dbcp2.managed.Bas
}
}
- public void setTransactionRegistry(XAConnectionFactory
xaConnectionFactory, final TransactionRegistry registry) {
+ private void setTransactionRegistry(XAConnectionFactory
xaConnectionFactory, final TransactionRegistry registry) {
try {
final Field field =
xaConnectionFactory.getClass().getDeclaredField("transactionRegistry");
field.setAccessible(true);
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/DbcpManagedDataSource.java
b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/DbcpManagedDataSource.java
index 9b23c231fd..afd671481a 100644
---
a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/DbcpManagedDataSource.java
+++
b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/DbcpManagedDataSource.java
@@ -83,7 +83,7 @@ public class DbcpManagedDataSource extends
BasicManagedDataSource {
}
}
- public void setTransactionRegistry(XAConnectionFactory
xaConnectionFactory, final TransactionRegistry registry) {
+ private void setTransactionRegistry(XAConnectionFactory
xaConnectionFactory, final TransactionRegistry registry) {
try {
final Field field =
xaConnectionFactory.getClass().getDeclaredField("transactionRegistry");
field.setAccessible(true);
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/DbcpTransactionRegistry.java
b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/DbcpTransactionRegistry.java
index 011176e716..d298acd628 100644
---
a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/DbcpTransactionRegistry.java
+++
b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/DbcpTransactionRegistry.java
@@ -24,15 +24,12 @@ import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
import javax.transaction.TransactionSynchronizationRegistry;
import java.sql.SQLException;
-
-public class DbcpTransactionRegistry extends
org.apache.commons.dbcp2.managed.TransactionRegistry{
+public class DbcpTransactionRegistry extends
org.apache.commons.dbcp2.managed.TransactionRegistry {
private TransactionManager transactionManager;
-
public DbcpTransactionRegistry(TransactionManager transactionManager) {
this(transactionManager, null);
}
-
public DbcpTransactionRegistry(TransactionManager transactionManager,
TransactionSynchronizationRegistry transactionSynchronizationRegistry) {
super(transactionManager, transactionSynchronizationRegistry);
this.transactionManager = transactionManager;
