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 2018/06/16 22:15:09 UTC
[1/5] commons-dbcp git commit: Release 2.3.0.
Repository: commons-dbcp
Updated Branches:
refs/heads/master 8c42fb865 -> e2f101cc5
Release 2.3.0.
Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/f8b21869
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/f8b21869
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/f8b21869
Branch: refs/heads/master
Commit: f8b2186914a4d14c735b9bd7ea4f0961e56bb936
Parents: 6040b67
Author: Gary Gregory <ga...@gmail.com>
Authored: Sun May 13 08:03:57 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Sun May 13 08:03:57 2018 -0600
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/f8b21869/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 65488de..26aa9a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>commons-dbcp2</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.0</version>
<name>Apache Commons DBCP</name>
<inceptionYear>2001</inceptionYear>
[5/5] commons-dbcp git commit: Bump to next development version
Posted by gg...@apache.org.
Bump to next development version
Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/e2f101cc
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/e2f101cc
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/e2f101cc
Branch: refs/heads/master
Commit: e2f101cc5bcd0acef17ddb122cd98cc9695be5db
Parents: d7aa662
Author: Gary Gregory <ga...@gmail.com>
Authored: Sat Jun 16 16:13:58 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Sat Jun 16 16:13:58 2018 -0600
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/e2f101cc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cccc466..3ac648b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>commons-dbcp2</artifactId>
- <version>2.4.0</version>
+ <version>2.4.1-SNAPSHOT</version>
<name>Apache Commons DBCP</name>
<inceptionYear>2001</inceptionYear>
[3/5] commons-dbcp git commit: Merge branch 'master' into release.
Posted by gg...@apache.org.
Merge branch 'master' into release.
Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/56608557
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/56608557
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/56608557
Branch: refs/heads/master
Commit: 5660855731502d00319f54cd584c95afa487a854
Parents: fb23b15
Author: Gary Gregory <ga...@gmail.com>
Authored: Wed Jun 13 12:06:42 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Wed Jun 13 12:06:42 2018 -0600
----------------------------------------------------------------------
pom.xml | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 91 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/56608557/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fa9a2b7..4387356 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,6 +132,14 @@
<email>ggregory@apache.org</email>
<organization>The Apache Software Foundation</organization>
</developer>
+ <developer>
+ <name>Ignacio J. Ortega</name>
+ <id>nacho</id>
+ </developer>
+ <developer>
+ <name>Sean C. Sullivan</name>
+ <id>sullis</id>
+ </developer>
</developers>
<contributors>
<contributor>
@@ -148,6 +156,15 @@
<contributor>
<name>Philippe Mouawad</name>
</contributor>
+ <contributor>
+ <name>Glenn L. Nielsen</name>
+ </contributor>
+ <contributor>
+ <name>James House</name>
+ </contributor>
+ <contributor>
+ <name>James Ring</name>
+ </contributor>
</contributors>
<dependencies>
@@ -215,6 +232,42 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>1.4.197</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.jta</groupId>
+ <artifactId>narayana-jta</artifactId>
+ <version>5.8.2.Final</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.transaction</groupId>
+ <artifactId>jboss-transaction-api_1.2_spec</artifactId>
+ <version>1.0.0.Final</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-transaction-spi</artifactId>
+ <version>7.6.0.Final</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>3.1.4.GA</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<properties>
@@ -222,12 +275,10 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
- <commons.distSvnStagingUrl>scm:svn:https://dist.apache.org/repos/dist/dev/commons/dbcp/</commons.distSvnStagingUrl>
- <commons.release.isDistModule>true</commons.release.isDistModule>
- <commons.componentid>dbcp2</commons.componentid>
+ <commons.componentid>dbcp</commons.componentid>
<commons.rc.version>RC1</commons.rc.version>
<commons.module.name>org.apache.commons.dbcp2</commons.module.name>
- <commons.release.version>2.3.0</commons.release.version>
+ <commons.release.version>2.4.0</commons.release.version>
<commons.release.desc>for JDBC 4.1 (Java 7.0+)</commons.release.desc>
<commons.release.2.version>1.4</commons.release.2.version>
<commons.release.2.desc>for JDBC 4 (Java 6.0)</commons.release.2.desc>
@@ -249,6 +300,12 @@
<!-- 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>
+ <!-- Commons Release Plugin -->
+ <commons.bc.version>2.3.0</commons.bc.version>
+ <commons.release.isDistModule>true</commons.release.isDistModule>
+ <commons.distSvnStagingUrl>scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid}</commons.distSvnStagingUrl>
+ <commons.releaseManagerName>Gary Gregory</commons.releaseManagerName>
+ <commons.releaseManagerKey>86fdc7e2a11262cb</commons.releaseManagerKey>
</properties>
<build>
@@ -417,4 +474,34 @@
</plugin>
</plugins>
</reporting>
+ <profiles>
+ <profile>
+ <id>jdk7</id>
+ <activation>
+ <jdk>(,1.7]</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <!-- Ensure that logging messages can be inspected -->
+ <org.apache.commons.logging.Log>org.apache.commons.dbcp2.StackMessageLog</org.apache.commons.logging.Log>
+ </systemPropertyVariables>
+ <reportFormat>plain</reportFormat>
+ <excludes>
+ <!-- Test support files -->
+ <exclude>**/Tester*.java</exclude>
+ <!-- Exclude nested classes which Surefire cannot handle -->
+ <exclude>**/Test*$*.java</exclude>
+ <exclude>**/*Narayana*.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
[4/5] commons-dbcp git commit: Prepare for release 2.4.0.
Posted by gg...@apache.org.
Prepare for release 2.4.0.
Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/d7aa662f
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/d7aa662f
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/d7aa662f
Branch: refs/heads/master
Commit: d7aa662fbbb99e536ae28c47d0c4e1d51e39d5b9
Parents: 5660855
Author: Gary Gregory <ga...@gmail.com>
Authored: Wed Jun 13 13:26:05 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Wed Jun 13 13:26:05 2018 -0600
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/d7aa662f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4387356..cccc466 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>commons-dbcp2</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.0</version>
<name>Apache Commons DBCP</name>
<inceptionYear>2001</inceptionYear>
[2/5] commons-dbcp git commit: Merge branch 'master' into release.
Posted by gg...@apache.org.
Merge branch 'master' into release.
Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/fb23b153
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/fb23b153
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/fb23b153
Branch: refs/heads/master
Commit: fb23b1530cfcf68004bf59a6a3e2a68fe79426b1
Parents: f8b2186 8c42fb8
Author: Gary Gregory <ga...@gmail.com>
Authored: Wed Jun 13 11:28:10 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Wed Jun 13 11:28:10 2018 -0600
----------------------------------------------------------------------
.gitignore | 4 +-
CONTRIBUTING.md | 2 +-
README.md | 14 +-
RELEASE-NOTES.txt | 47 +-
build.properties.sample | 58 -
build.xml | 283 ---
dbcp-RC.sh | 2 +-
dbcp-pre-RC.sh | 2 +-
dbcp-release.sh | 4 +-
doc/README.txt | 2 +-
pom.xml | 2 +-
src/changes/changes.xml | 47 +-
src/changes/release-notes.vm | 2 +-
.../apache/commons/dbcp2/AbandonedTrace.java | 72 +-
.../apache/commons/dbcp2/BasicDataSource.java | 1356 ++++++-------
.../commons/dbcp2/BasicDataSourceFactory.java | 248 +--
.../commons/dbcp2/BasicDataSourceMXBean.java | 40 +
.../apache/commons/dbcp2/ConnectionFactory.java | 7 +-
.../org/apache/commons/dbcp2/Constants.java | 13 +-
.../dbcp2/DataSourceConnectionFactory.java | 64 +-
.../dbcp2/DelegatingCallableStatement.java | 1069 ++++++++---
.../commons/dbcp2/DelegatingConnection.java | 525 +++---
.../dbcp2/DelegatingDatabaseMetaData.java | 1595 ++++++++++------
.../dbcp2/DelegatingPreparedStatement.java | 499 +++--
.../commons/dbcp2/DelegatingResultSet.java | 1774 +++++++++++++-----
.../commons/dbcp2/DelegatingStatement.java | 500 +++--
.../commons/dbcp2/DriverConnectionFactory.java | 35 +-
.../dbcp2/DriverManagerConnectionFactory.java | 71 +-
.../dbcp2/LifetimeExceededException.java | 5 +-
.../org/apache/commons/dbcp2/ListException.java | 57 +
.../apache/commons/dbcp2/ObjectNameWrapper.java | 6 +-
.../java/org/apache/commons/dbcp2/PStmtKey.java | 562 ++++--
.../dbcp2/PoolableCallableStatement.java | 68 +-
.../commons/dbcp2/PoolableConnection.java | 67 +-
.../dbcp2/PoolableConnectionFactory.java | 301 +--
.../commons/dbcp2/PoolableConnectionMXBean.java | 17 +-
.../dbcp2/PoolablePreparedStatement.java | 53 +-
.../apache/commons/dbcp2/PoolingConnection.java | 738 ++++----
.../apache/commons/dbcp2/PoolingDataSource.java | 122 +-
.../org/apache/commons/dbcp2/PoolingDriver.java | 105 +-
.../commons/dbcp2/SwallowedExceptionLogger.java | 21 +-
.../java/org/apache/commons/dbcp2/Utils.java | 91 +-
.../dbcp2/cpdsadapter/ConnectionImpl.java | 219 ++-
.../dbcp2/cpdsadapter/DriverAdapterCPDS.java | 481 ++---
.../commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java | 94 +-
.../dbcp2/cpdsadapter/PooledConnectionImpl.java | 642 ++++---
.../datasources/CPDSConnectionFactory.java | 231 +--
.../datasources/InstanceKeyDataSource.java | 715 +++----
.../InstanceKeyDataSourceFactory.java | 282 ++-
.../datasources/KeyedCPDSConnectionFactory.java | 205 +-
.../datasources/PerUserPoolDataSource.java | 1480 ++++++++-------
.../PerUserPoolDataSourceFactory.java | 52 +-
.../commons/dbcp2/datasources/PoolKey.java | 54 +-
.../datasources/PooledConnectionAndInfo.java | 55 +-
.../datasources/PooledConnectionManager.java | 30 +-
.../dbcp2/datasources/SharedPoolDataSource.java | 137 +-
.../SharedPoolDataSourceFactory.java | 12 +-
.../commons/dbcp2/datasources/UserPassKey.java | 108 +-
.../dbcp2/managed/BasicManagedDataSource.java | 90 +-
.../managed/DataSourceXAConnectionFactory.java | 109 +-
.../dbcp2/managed/LocalXAConnectionFactory.java | 134 +-
.../dbcp2/managed/ManagedConnection.java | 75 +-
.../dbcp2/managed/ManagedDataSource.java | 46 +-
.../managed/PoolableManagedConnection.java | 38 +-
.../PoolableManagedConnectionFactory.java | 31 +-
.../dbcp2/managed/TransactionContext.java | 85 +-
.../managed/TransactionContextListener.java | 8 +-
.../dbcp2/managed/TransactionRegistry.java | 63 +-
.../dbcp2/managed/XAConnectionFactory.java | 24 +-
.../org/apache/commons/dbcp2/package-info.java | 207 +-
src/site/site.xml | 1 +
src/site/xdoc/configuration.xml | 1012 +++++-----
src/site/xdoc/download_dbcp.xml | 26 +-
src/site/xdoc/guide/classdiagrams.xml | 58 +-
src/site/xdoc/guide/index.xml | 50 +-
src/site/xdoc/guide/jndi-howto.xml | 2 +-
src/site/xdoc/guide/sequencediagrams.xml | 52 +-
src/site/xdoc/index.xml | 2 +-
src/site/xdoc/mail-lists.xml | 8 +-
.../apache/commons/dbcp2/StackMessageLog.java | 1 -
.../dbcp2/TestAbandonedBasicDataSource.java | 6 +-
.../commons/dbcp2/TestBasicDataSource.java | 8 +-
.../dbcp2/TestBasicDataSourceFactory.java | 6 +-
.../commons/dbcp2/TestConnectionPool.java | 13 +-
.../commons/dbcp2/TestDelegatingConnection.java | 1 -
.../dbcp2/TestDelegatingPreparedStatement.java | 2 -
.../commons/dbcp2/TestDelegatingStatement.java | 2 -
.../TestDriverManagerConnectionFactory.java | 11 +-
.../java/org/apache/commons/dbcp2/TestJndi.java | 44 +-
.../org/apache/commons/dbcp2/TestPStmtKey.java | 84 +
.../apache/commons/dbcp2/TestPStmtPooling.java | 2 -
.../dbcp2/TestPStmtPoolingBasicDataSource.java | 2 -
.../commons/dbcp2/TestPoolableConnection.java | 1 -
.../commons/dbcp2/TestPoolingDataSource.java | 7 +-
.../apache/commons/dbcp2/TestPoolingDriver.java | 8 +-
.../org/apache/commons/dbcp2/TestUtils.java | 2 +-
.../commons/dbcp2/TesterCallableStatement.java | 2 -
.../apache/commons/dbcp2/TesterConnection.java | 13 +-
.../commons/dbcp2/TesterDatabaseMetaData.java | 10 +-
.../org/apache/commons/dbcp2/TesterDriver.java | 54 +-
.../commons/dbcp2/TesterPreparedStatement.java | 5 +-
.../apache/commons/dbcp2/TesterResultSet.java | 3 -
.../apache/commons/dbcp2/TesterStatement.java | 7 +-
.../cpdsadapter/TestDriverAdapterCPDS.java | 17 +-
.../ConnectionPoolDataSourceProxy.java | 23 +-
.../datasources/PooledConnectionProxy.java | 31 +-
.../datasources/TestCPDSConnectionFactory.java | 28 +-
.../commons/dbcp2/datasources/TestFactory.java | 11 +-
.../datasources/TestInstanceKeyDataSource.java | 12 +-
.../TestKeyedCPDSConnectionFactory.java | 14 +-
.../datasources/TestPerUserPoolDataSource.java | 4 +-
.../datasources/TestSharedPoolDataSource.java | 153 +-
.../managed/TestBasicManagedDataSource.java | 2 +-
.../managed/TestConnectionWithNarayana.java | 236 +++
.../dbcp2/managed/TestManagedConnection.java | 2 +-
.../dbcp2/managed/TestManagedDataSource.java | 4 +-
.../managed/TestManagedDataSourceInTx.java | 2 -
.../dbcp2/managed/TestTransactionContext.java | 10 +-
118 files changed, 10668 insertions(+), 7643 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/fb23b153/pom.xml
----------------------------------------------------------------------