You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2021/05/31 15:20:17 UTC
[commons-dbcp] branch master updated (092f620 -> 1d778eb)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git.
from 092f620 [DBCP-573] DataSource implementations do not implement Wrapper interface correctly #93.
new bdc2620 Use final and simpler array initializations.
new d251611 Update versions for next release.
new 1d778eb Bump commons.jacoco.version 0.8.6 -> 0.8.7.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 6 +++---
src/main/java/org/apache/commons/dbcp2/PoolableConnection.java | 2 +-
src/main/java/org/apache/commons/dbcp2/PoolingDriver.java | 2 +-
src/main/java/org/apache/commons/dbcp2/Utils.java | 4 ++--
.../org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java | 2 +-
src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java | 4 ++--
6 files changed, 10 insertions(+), 10 deletions(-)
[commons-dbcp] 02/03: Update versions for next release.
Posted by gg...@apache.org.
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
commit d251611f6ec0287b2b3aefe58ea6618fe2b16832
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon May 31 11:16:23 2021 -0400
Update versions for next release.
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3a67660..bbf0e9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -293,7 +293,7 @@
<commons.rc.version>RC1</commons.rc.version>
<commons.module.name>org.apache.commons.dbcp2</commons.module.name>
- <commons.release.version>2.8.0</commons.release.version>
+ <commons.release.version>2.9.0</commons.release.version>
<commons.release.desc>for JDBC 4.2 on Java 8</commons.release.desc>
<commons.release.hash>sha512</commons.release.hash>
@@ -331,7 +331,7 @@
<commons.osgi.import>javax.transaction;version="1.1.0",javax.transaction.xa;version="1.1.0";partial=true;mandatory:=partial,*</commons.osgi.import>
<commons.japicmp.ignoreMissingClasses>true</commons.japicmp.ignoreMissingClasses>
<!-- Commons Release Plugin -->
- <commons.bc.version>2.7.0</commons.bc.version>
+ <commons.bc.version>2.8.0</commons.bc.version>
<commons.release.isDistModule>true</commons.release.isDistModule>
<commons.releaseManagerName>Gary Gregory</commons.releaseManagerName>
<commons.releaseManagerKey>86fdc7e2a11262cb</commons.releaseManagerKey>
[commons-dbcp] 01/03: Use final and simpler array initializations.
Posted by gg...@apache.org.
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
commit bdc262055c99482800be541dfef0e4334cefbdeb
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon May 31 11:16:08 2021 -0400
Use final and simpler array initializations.
---
src/main/java/org/apache/commons/dbcp2/PoolableConnection.java | 2 +-
src/main/java/org/apache/commons/dbcp2/PoolingDriver.java | 2 +-
src/main/java/org/apache/commons/dbcp2/Utils.java | 4 ++--
.../org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java | 2 +-
src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java b/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java
index 9bd367b..09502a6 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java
@@ -240,7 +240,7 @@ public class PoolableConnection extends DelegatingConnection<Connection> impleme
* @since 2.9.0
*/
@Override
- public void abort(Executor executor) throws SQLException {
+ public void abort(final Executor executor) throws SQLException {
if (jmxObjectName != null) {
jmxObjectName.unregisterMBean();
}
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java b/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java
index ae0c0da..4edaf1c 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java
@@ -36,7 +36,7 @@ import org.apache.commons.pool2.ObjectPool;
*/
public class PoolingDriver implements Driver {
- private static final DriverPropertyInfo[] EMPTY_DRIVER_PROPERTY_INFO_ARRAY = new DriverPropertyInfo[0];
+ private static final DriverPropertyInfo[] EMPTY_DRIVER_PROPERTY_INFO_ARRAY = {};
/* Register myself with the {@link DriverManager}. */
static {
diff --git a/src/main/java/org/apache/commons/dbcp2/Utils.java b/src/main/java/org/apache/commons/dbcp2/Utils.java
index 5adc070..5a2f5af 100644
--- a/src/main/java/org/apache/commons/dbcp2/Utils.java
+++ b/src/main/java/org/apache/commons/dbcp2/Utils.java
@@ -58,8 +58,8 @@ public final class Utils {
*/
public static final Set<String> DISCONNECTION_SQL_CODES;
- static final ResultSet[] EMPTY_RESULT_SET_ARRAY = new ResultSet[0];
- static final String[] EMPTY_STRING_ARRAY = new String[0];
+ static final ResultSet[] EMPTY_RESULT_SET_ARRAY = {};
+ static final String[] EMPTY_STRING_ARRAY = {};
static {
DISCONNECTION_SQL_CODES = new HashSet<>();
diff --git a/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java
index 44faba8..6992ef2 100644
--- a/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java
@@ -50,7 +50,7 @@ public class LocalXAConnectionFactory implements XAConnectionFactory {
* @since 2.0
*/
protected static class LocalXAResource implements XAResource {
- private static final Xid[] EMPTY_XID_ARRAY = new Xid[0];
+ private static final Xid[] EMPTY_XID_ARRAY = {};
private final Connection connection;
private Xid currentXid; // @GuardedBy("this")
private boolean originalAutoCommit; // @GuardedBy("this")
diff --git a/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java b/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java
index 2a46d37..31d8252 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java
@@ -101,7 +101,7 @@ public class TestPoolingConnection {
@Test
public void testPrepareStatementWithColumnIndexes() throws Exception {
final String sql = "select 'a' from dual";
- final int[] columnIndexes = new int[]{1};
+ final int[] columnIndexes = {1};
final DelegatingPreparedStatement statement = (DelegatingPreparedStatement)con.prepareStatement(sql, columnIndexes);
final TesterPreparedStatement testStatement = (TesterPreparedStatement) statement.getInnermostDelegate();
// assert
@@ -112,7 +112,7 @@ public class TestPoolingConnection {
@Test
public void testPrepareStatementWithColumnNames() throws Exception {
final String sql = "select 'a' from dual";
- final String[] columnNames = new String[]{"columnName1"};
+ final String[] columnNames = {"columnName1"};
final DelegatingPreparedStatement statement = (DelegatingPreparedStatement)con.prepareStatement(sql, columnNames);
final TesterPreparedStatement testStatement = (TesterPreparedStatement) statement.getInnermostDelegate();
// assert
[commons-dbcp] 03/03: Bump commons.jacoco.version 0.8.6 -> 0.8.7.
Posted by gg...@apache.org.
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
commit 1d778eba7bff32ff735bda81360f60d6fdf6dedf
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon May 31 11:20:13 2021 -0400
Bump commons.jacoco.version 0.8.6 -> 0.8.7.
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index bbf0e9f..5baca8e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -326,7 +326,7 @@
<!-- Constant for Commons Pool version (used in multiple places) -->
<commons.pool.version>2.9.0</commons.pool.version>
<commons.japicmp.version>0.15.3</commons.japicmp.version>
- <commons.jacoco.version>0.8.6</commons.jacoco.version>
+ <commons.jacoco.version>0.8.7</commons.jacoco.version>
<!-- See DBCP-445 and DBCP-454 -->
<commons.osgi.import>javax.transaction;version="1.1.0",javax.transaction.xa;version="1.1.0";partial=true;mandatory:=partial,*</commons.osgi.import>
<commons.japicmp.ignoreMissingClasses>true</commons.japicmp.ignoreMissingClasses>