[3/5] commons-dbcp git commit: Merge branch 'master' into release.
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
Authored: Wed Jun 13 12:06:42 2018 -0600
Committer: Gary Gregory
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 @@
ggreg...@apache.org
The Apache Software Foundation
+
+ Ignacio J. Ortega
+ nacho
+
+
+ Sean C. Sullivan
+ sullis
+
@@ -148,6 +156,15 @@
Philippe Mouawad
+
+ Glenn L. Nielsen
+
+
+ James House
+
+
+ James Ring
+
@@ -215,6 +232,42 @@
+
+ com.h2database
+ h2
+ 1.4.197
+ test
+
+
+ org.jboss.narayana.jta
+ narayana-jta
+ 5.8.2.Final
+ test
+
+
+ org.jboss.spec.javax.transaction
+ jboss-transaction-api_1.2_spec
+ 1.0.0.Final
+ test
+
+
+ org.jboss
+ jboss-transaction-spi
+ 7.6.0.Final
+
+
+ org.jboss.logging
+ jboss-logging-spi
+
+
+ test
+
+
+ org.jboss.logging
+ jboss-logging
+ 3.1.4.GA
+ test
+
@@ -222,12 +275,10 @@
UTF-8
1.7
1.7
-
scm:svn:https://dist.apache.org/repos/dist/dev/commons/dbcp/
-true
-dbcp2
+dbcp
RC1
org.apache.commons.dbcp2
-2.3.0
+2.4.0
for JDBC 4.1 (Java 7.0+)
1.4
for JDBC 4 (Java 6.0)
@@ -249,6 +300,12 @@
javax.transaction;version="1.1.0",javax.transaction.xa;version="1.1.0";partial=true;mandatory:=partial,*
true
+
+2.3.0
+true
+
scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid}
+Gary Gregory
+86fdc7e2a11262cb
@@ -417,4 +474,34 @@
+
+
+ jdk7
+
+(,1.7]
+
+
+
+
+org.apache.maven.plugins
+maven-surefire-plugin
+
+
+
+
org.apache.commons.dbcp2.StackMessageLog
+
+ plain
+
+
+**/Tester*.java
+
+**/Test*$*.java
+**/*Narayana*.java
+
+
+
+
+
+
+
[2/5] commons-dbcp git commit: Merge branch 'master' into release.
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 Authored: Wed Jun 13 11:28:10 2018 -0600 Committer: Gary Gregory 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 +-
commons-dbcp git commit: Merge branch 'master' into release.
Repository: commons-dbcp
Updated Branches:
refs/heads/release fb23b1530 -> 566085573
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/release
Commit: 5660855731502d00319f54cd584c95afa487a854
Parents: fb23b15
Author: Gary Gregory
Authored: Wed Jun 13 12:06:42 2018 -0600
Committer: Gary Gregory
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 @@
ggreg...@apache.org
The Apache Software Foundation
+
+ Ignacio J. Ortega
+ nacho
+
+
+ Sean C. Sullivan
+ sullis
+
@@ -148,6 +156,15 @@
Philippe Mouawad
+
+ Glenn L. Nielsen
+
+
+ James House
+
+
+ James Ring
+
@@ -215,6 +232,42 @@
+
+ com.h2database
+ h2
+ 1.4.197
+ test
+
+
+ org.jboss.narayana.jta
+ narayana-jta
+ 5.8.2.Final
+ test
+
+
+ org.jboss.spec.javax.transaction
+ jboss-transaction-api_1.2_spec
+ 1.0.0.Final
+ test
+
+
+ org.jboss
+ jboss-transaction-spi
+ 7.6.0.Final
+
+
+ org.jboss.logging
+ jboss-logging-spi
+
+
+ test
+
+
+ org.jboss.logging
+ jboss-logging
+ 3.1.4.GA
+ test
+
@@ -222,12 +275,10 @@
UTF-8
1.7
1.7
-
scm:svn:https://dist.apache.org/repos/dist/dev/commons/dbcp/
-true
-dbcp2
+dbcp
RC1
org.apache.commons.dbcp2
-2.3.0
+2.4.0
for JDBC 4.1 (Java 7.0+)
1.4
for JDBC 4 (Java 6.0)
@@ -249,6 +300,12 @@
javax.transaction;version="1.1.0",javax.transaction.xa;version="1.1.0";partial=true;mandatory:=partial,*
true
+
+2.3.0
+true
+
scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid}
+Gary Gregory
+86fdc7e2a11262cb
@@ -417,4 +474,34 @@
+
+
+ jdk7
+
+(,1.7]
+
+
+
+
+org.apache.maven.plugins
+maven-surefire-plugin
+
+
+
+
org.apache.commons.dbcp2.StackMessageLog
+
+ plain
+
+
+**/Tester*.java
+
+**/Test*$*.java
+**/*Narayana*.java
+
+
+
+
+
+
+
[50/50] [abbrv] commons-dbcp git commit: Merge branch 'master' into release.
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/release Commit: fb23b1530cfcf68004bf59a6a3e2a68fe79426b1 Parents: f8b2186 8c42fb8 Author: Gary Gregory Authored: Wed Jun 13 11:28:10 2018 -0600 Committer: Gary Gregory 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 +-
