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/05/12 18:54:38 UTC

[1/9] commons-dbcp git commit: Set POM version to 2.3.1-SNAPSHOT.

Repository: commons-dbcp
Updated Branches:
  refs/heads/release 96466c6bf -> 6040b67b7


Set POM version to 2.3.1-SNAPSHOT.

Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/8d0c258b
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/8d0c258b
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/8d0c258b

Branch: refs/heads/release
Commit: 8d0c258bed70d85c45f35a5669754bc4ecbfb2d6
Parents: 96466c6
Author: Gary Gregory <ga...@gmail.com>
Authored: Tue May 8 18:13:31 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Tue May 8 18:13:31 2018 -0600

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/8d0c258b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 26aa9a8..65488de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>commons-dbcp2</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <name>Apache Commons DBCP</name>
 
   <inceptionYear>2001</inceptionYear>

[6/9] commons-dbcp git commit: Update year in Javadocs to 2018.

Posted by gg...@apache.org.
Update year in Javadocs to 2018.

Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/68d1bebe
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/68d1bebe
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/68d1bebe

Branch: refs/heads/release
Commit: 68d1bebe0be8e74ed99392486ff70f22451f4a23
Parents: b8467c0
Author: Gary Gregory <ga...@gmail.com>
Authored: Sat May 12 12:29:28 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Sat May 12 12:29:28 2018 -0600

----------------------------------------------------------------------
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/68d1bebe/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 03b5eb5..8f9c15b 100644
--- a/build.xml
+++ b/build.xml
@@ -64,7 +64,7 @@
       <property name="test.runner" value="junit.textui.TestRunner" /> 
      
       <property name="javadoc.dir" value="${dist.dir}/docs/api"/>
-      <property name="javadoc.bottom" value="&lt;small&gt;Copyright &amp;copy; 2001-2015 Apache Software Foundation. Documentation generated ${TODAY}&lt;/small&gt;."/>
+      <property name="javadoc.bottom" value="&lt;small&gt;Copyright &amp;copy; 2001-2018 Apache Software Foundation. Documentation generated ${TODAY}&lt;/small&gt;."/>
       <property name="javadoc.overview" value="${basedir}/src/main/java/org/apache/commons/dbcp2/overview.html"/>
 
       <property name="javac.optimize" value="false"/>

[4/9] commons-dbcp git commit: Add Javadoc link specific to version 2.3.0.

Posted by gg...@apache.org.
Add Javadoc link specific to version 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/23648125
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/23648125
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/23648125

Branch: refs/heads/release
Commit: 236481258cd4141059d0d0f263b3c4e3b74889c9
Parents: af9ca77
Author: Gary Gregory <ga...@gmail.com>
Authored: Wed May 9 09:37:19 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Wed May 9 09:37:19 2018 -0600

----------------------------------------------------------------------
 src/site/site.xml | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/23648125/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 970b8f9..894c9a5 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -33,6 +33,7 @@
         <item name="Javadoc (2.1 release)" href="/api-2.1/index.html"/>
         <item name="Javadoc (2.1.1 release)" href="/api-2.1.1/index.html"/>
         <item name="Javadoc (2.2.0 release)" href="/api-2.2.0/index.html"/>
+        <item name="Javadoc (2.3.0 release)" href="/api-2.3.0/index.html"/>
         <item name="Developers&#xA0;Guide" href="/guide/index.html" collapse="true">
         <item name="JNDI&#xA0;Howto"  href="/guide/jndi-howto.html"/>
         <item name="Class&#xA0;Diagrams" href="/guide/classdiagrams.html"/>

[8/9] commons-dbcp git commit: Remove Subversion tags.

Posted by gg...@apache.org.
Remove Subversion tags.

Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/19577584
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/19577584
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/19577584

Branch: refs/heads/release
Commit: 1957758471b8f6586fb7367b9ced3b53c1afc35f
Parents: 62f460e
Author: Gary Gregory <ga...@gmail.com>
Authored: Sat May 12 12:32:27 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Sat May 12 12:32:27 2018 -0600

----------------------------------------------------------------------
 dbcp-RC.sh      | 1 -
 dbcp-pre-RC.sh  | 1 -
 dbcp-release.sh | 1 -
 3 files changed, 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/19577584/dbcp-RC.sh
----------------------------------------------------------------------
diff --git a/dbcp-RC.sh b/dbcp-RC.sh
index 33c34cc..9359aee 100755
--- a/dbcp-RC.sh
+++ b/dbcp-RC.sh
@@ -25,7 +25,6 @@
 #    svn pub/sub dev checkout.
 # 2) Nexus repo from previous RC has been dropped.
 #
-# $Revision$ $Date$
 # -----------------------------------------------------------------------------
 # Set script variables
 version=2.3.0

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/19577584/dbcp-pre-RC.sh
----------------------------------------------------------------------
diff --git a/dbcp-pre-RC.sh b/dbcp-pre-RC.sh
index 0d1802c..f80d657 100755
--- a/dbcp-pre-RC.sh
+++ b/dbcp-pre-RC.sh
@@ -23,7 +23,6 @@
 # to checkin.  Both RELEASE-NOTES.txt and the generated download
 # page need to be checked in after review.
 #
-# $Revision$ $Date$
 # ----------------------------------------------------------------------------
 version=2.3.0
 mvn changes:announcement-generate -Prelease-notes -Dchanges.version=${version}

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/19577584/dbcp-release.sh
----------------------------------------------------------------------
diff --git a/dbcp-release.sh b/dbcp-release.sh
index cd21dd3..566d08d 100755
--- a/dbcp-release.sh
+++ b/dbcp-release.sh
@@ -28,7 +28,6 @@
 # 0) Commit the local changes to actually publish the artifacts
 # 1) Cleanup old versions in dist
 #
-# $Revision$ $Date$
 # -----------------------------------------------------------------------------
 # Set script variables
 version=2.3.0      # version being released

[2/9] commons-dbcp git commit: Typo.

Posted by gg...@apache.org.
Typo.

Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/39c82bb0
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/39c82bb0
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/39c82bb0

Branch: refs/heads/release
Commit: 39c82bb0149a8fa7c4322c08fcad040ea3255258
Parents: 8d0c258
Author: Gary Gregory <ga...@gmail.com>
Authored: Tue May 8 18:28:24 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Tue May 8 18:28:24 2018 -0600

----------------------------------------------------------------------
 src/changes/changes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/39c82bb0/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index fa85cb5..33ebd63 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -62,7 +62,7 @@ The <action> type attribute can be add,update,fix,remove.
   <body>
     <release version="2.3.0" date="2018-MM-DD" description="This is a minor release, including bug fixes and enhancements.">
       <action dev="pschumacher" type="fix" issue="DBCP-476" due-to="Gary Evesson, Richard Cordova">
-        AbandonedTrace.getTrace() contains race condition
+        AbandonedTrace.getTrace() contains race condition.
       </action>
       <action dev="ggregory" type="fix" issue="DBCP-482" due-to="Dennis Lloyd, Gary Gregory">
         Avoid javax.management.InstanceNotFoundException on shutdown when a bean is not registered.

[3/9] commons-dbcp git commit: Add missing day for 2.2.0 release.

Posted by gg...@apache.org.
Add missing day for 2.2.0 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/af9ca771
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/af9ca771
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/af9ca771

Branch: refs/heads/release
Commit: af9ca771525724e3f303d4fa255b21950a247786
Parents: 39c82bb
Author: Gary Gregory <ga...@gmail.com>
Authored: Tue May 8 18:29:52 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Tue May 8 18:29:52 2018 -0600

----------------------------------------------------------------------
 src/changes/changes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/af9ca771/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 33ebd63..9f32b80 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -83,7 +83,7 @@ The <action> type attribute can be add,update,fix,remove.
         The method org.apache.commons.dbcp2.PoolingDriver.getConnectionPool(String) does not tell you which pool name is not registered when it throws an exception.      
       </action>
     </release>
-    <release version="2.2.0" date="2017-12-DD" description="This is a minor release, including bug fixes and enhancements.">
+    <release version="2.2.0" date="2017-12-27" description="This is a minor release, including bug fixes and enhancements.">
       <action dev="ggregory" type="fix" issue="DBCP-481" due-to="Gary Gregory">
         Update Apache Commons Pool from 2.4.2 to 2.5.0.
       </action>

[5/9] commons-dbcp git commit: Update version in release notes.

Posted by gg...@apache.org.
Update version in release notes.

Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/b8467c09
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/b8467c09
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/b8467c09

Branch: refs/heads/release
Commit: b8467c09548030e9687da821e69026e7751d5b68
Parents: 2364812
Author: Gary Gregory <ga...@gmail.com>
Authored: Sat May 12 12:28:17 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Sat May 12 12:28:17 2018 -0600

----------------------------------------------------------------------
 RELEASE-NOTES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/b8467c09/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index a523943..99fb415 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,5 +1,5 @@
               Apache Apache Commons DBCP
-                  Version 2.3.0-SNAPSHOT
+                  Version 2.3.0
                  RELEASE NOTES
 
 The Apache Commons DBCP team is pleased to announce the release of Apache Apache Commons DBCP 2.3.0-SNAPSHOT.

[9/9] commons-dbcp git commit: Match versions for Ant build based on Maven build.

Posted by gg...@apache.org.
Match versions for Ant build based on Maven build.

Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/6040b67b
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/6040b67b
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/6040b67b

Branch: refs/heads/release
Commit: 6040b67b78d96d05c282a75bb250fa6ea31623dc
Parents: 1957758
Author: Gary Gregory <ga...@gmail.com>
Authored: Sat May 12 12:36:02 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Sat May 12 12:36:02 2018 -0600

----------------------------------------------------------------------
 build.properties.sample | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/6040b67b/build.properties.sample
----------------------------------------------------------------------
diff --git a/build.properties.sample b/build.properties.sample
index 14aedfd..2aed382 100644
--- a/build.properties.sample
+++ b/build.properties.sample
@@ -24,15 +24,15 @@
 repository=${user.home}/.m2/repository
 
 # Maven-generated jar to validate in test-jar target
-dbcp.jar=./target/commons-dbcp2-2.1.1-SNAPSHOT.jar
+dbcp.jar=./target/commons-dbcp2-2.3.0-SNAPSHOT.jar
 
 # commons-pool.jar - path to commons-pool2 jar
-commons-pool.home=${repository}/org/apache/commons/commons-pool2/2.4.2
-commons-pool.jar=${commons-pool.home}/commons-pool2-2.4.2.jar
+commons-pool.home=${repository}/org/apache/commons/commons-pool2/2.5.0
+commons-pool.jar=${commons-pool.home}/commons-pool2-2.5.0.jar
 
 # JUnit
-junit.home=${repository}/junit/junit/4.11
-junit.jar=${junit.home}/junit-4.11.jar
+junit.home=${repository}/junit/junit/4.12
+junit.jar=${junit.home}/junit-4.12.jar
 hamcrest.jar=${repository}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar
 
 # XML parser
@@ -46,8 +46,8 @@ naming.java.home=${repository}/tomcat/naming-java/5.0.28
 naming-java.jar=${naming.java.home}/naming-java-5.0.28.jar
 
 # Commons logging - dependency of naming jars
-commons-logging.home=${repository}/commons-logging/commons-logging/1.1.3
-commons-logging.jar=${commons-logging.home}/commons-logging-1.1.3.jar
+commons-logging.home=${repository}/commons-logging/commons-logging/1.2
+commons-logging.jar=${commons-logging.home}/commons-logging-1.2.jar
 
 # JTA - needed for managed connections
 jta-spec.jar=${repository}/org/apache/geronimo/specs/geronimo-jta_1.1_spec/1.1.1/geronimo-jta_1.1_spec-1.1.1.jar

[7/9] commons-dbcp git commit: Update versions in Linux scripts I do not use for releasing.

Posted by gg...@apache.org.
Update versions in Linux scripts I do not use for releasing.

Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/62f460e7
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/62f460e7
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/62f460e7

Branch: refs/heads/release
Commit: 62f460e7ea7e14e631da20d0c7ab75f896ea7097
Parents: 68d1beb
Author: Gary Gregory <ga...@gmail.com>
Authored: Sat May 12 12:31:48 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Sat May 12 12:31:48 2018 -0600

----------------------------------------------------------------------
 dbcp-RC.sh      | 2 +-
 dbcp-pre-RC.sh  | 2 +-
 dbcp-release.sh | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/62f460e7/dbcp-RC.sh
----------------------------------------------------------------------
diff --git a/dbcp-RC.sh b/dbcp-RC.sh
index 6121b0e..33c34cc 100755
--- a/dbcp-RC.sh
+++ b/dbcp-RC.sh
@@ -28,7 +28,7 @@
 # $Revision$ $Date$
 # -----------------------------------------------------------------------------
 # Set script variables
-version=2.2
+version=2.3.0
 repo_path=~/.m2/repository/org/apache/commons/commons-dbcp2/${version}
 release_path=~/dbcp-rc  #checkout of https://dist.apache.org/repos/dist/dev/commons/dbcp
 #

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/62f460e7/dbcp-pre-RC.sh
----------------------------------------------------------------------
diff --git a/dbcp-pre-RC.sh b/dbcp-pre-RC.sh
index b0e6db3..0d1802c 100755
--- a/dbcp-pre-RC.sh
+++ b/dbcp-pre-RC.sh
@@ -25,6 +25,6 @@
 #
 # $Revision$ $Date$
 # ----------------------------------------------------------------------------
-version=2.2
+version=2.3.0
 mvn changes:announcement-generate -Prelease-notes -Dchanges.version=${version}
 mvn commons:download-page -Dcommons.componentid=dbcp -Dcommons.release.version=${version}

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/62f460e7/dbcp-release.sh
----------------------------------------------------------------------
diff --git a/dbcp-release.sh b/dbcp-release.sh
index 23a337d..cd21dd3 100755
--- a/dbcp-release.sh
+++ b/dbcp-release.sh
@@ -31,8 +31,8 @@
 # $Revision$ $Date$
 # -----------------------------------------------------------------------------
 # Set script variables
-version=2.2        # version being released
-last_version=2.1.1 # previous version, will be replaced in README.html
+version=2.3.0      # version being released
+last_version=2.2.0 # previous version, will be replaced in README.html
 rc_path=~/dbcp-rc  # checkout of https://dist.apache.org/repos/dist/dev/commons/dbcp
 release_path=~/dbcp-release #https://dist.apache.org/repos/dist/release/commons/dbcp
 #