You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2014/03/03 10:10:13 UTC

svn commit: r1573484 - in /tomcat/trunk: build.properties.default build.xml

Author: markt
Date: Mon Mar  3 09:10:13 2014
New Revision: 1573484

URL: http://svn.apache.org/r1573484
Log:
DBCP 2.0 has been released.

Modified:
    tomcat/trunk/build.properties.default
    tomcat/trunk/build.xml

Modified: tomcat/trunk/build.properties.default
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1573484&r1=1573483&r2=1573484&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon Mar  3 09:10:13 2014
@@ -152,14 +152,10 @@ tomcat-native.win.1=${base-tomcat.loc.1}
 tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip
 
 # ----- Commons DBCP, version 2.0 or later -----
-#commons-dbcp.version=1.4
-#commons-dbcp.home=${base.path}/commons-dbcp-${commons-dbcp.version}-src
-#commons-dbcp-src.loc.1=${base-commons.loc.1}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
-#commons-dbcp-src.loc.2=${base-commons.loc.2}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
-commons-dbcp.version=2.0-20140228.204604-213
-commons-dbcp.home=${base.path}/commons-dbcp2-2.0-SNAPSHOT-src
-commons-dbcp-src.loc.1=https://repository.apache.org/content/repositories/snapshots/org/apache/commons/commons-dbcp2/2.0-SNAPSHOT/commons-dbcp2-${commons-dbcp.version}-src.tar.gz
-commons-dbcp-src.loc.2=https://repository.apache.org/content/repositories/snapshots/org/apache/commons/commons-dbcp2/2.0-SNAPSHOT/commons-dbcp2-${commons-dbcp.version}-src.tar.gz
+commons-dbcp.version=2.0
+commons-dbcp.home=${base.path}/commons-dbcp2-${commons-dbcp.version}-src
+commons-dbcp-src.loc.1=${base-commons.loc.1}/dbcp/source/commons-dbcp2-${commons-dbcp.version}-src.tar.gz
+commons-dbcp-src.loc.2=${base-commons.loc.2}/dbcp/source/commons-dbcp2-${commons-dbcp.version}-src.tar.gz
 
 # ----- Commons Pool, version 2.1 or later -----
 commons-pool.version=2.2
@@ -167,8 +163,6 @@ commons-pool.home=${base.path}/commons-p
 commons-pool-src.loc.1=${base-commons.loc.1}/pool/source/commons-pool2-${commons-pool.version}-src.tar.gz
 commons-pool-src.loc.2=${base-commons.loc.2}/pool/source/commons-pool2-${commons-pool.version}-src.tar.gz
 
-
-
 # ----- NSIS, version 2.0 or later -----
 nsis.home=${base.path}/nsis-2.46
 nsis.exe=${nsis.home}/makensis.exe

Modified: tomcat/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1573484&r1=1573483&r2=1573484&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Mon Mar  3 09:10:13 2014
@@ -2576,8 +2576,6 @@ Apache Tomcat ${version} native binaries
   <target name="clean-depend"
           description="Deletes the dependencies that are built from source">
     <delete dir="${tomcat-dbcp.home}"/>
-    <!-- Only required while working with snapshots -->
-    <delete dir="${commons-dbcp.home}"/>
   </target>
 
   <target name="clean"



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Re: svn commit: r1573484 - in /tomcat/trunk: build.properties.default build.xml

Posted by Mark Thomas <ma...@apache.org>.
On 04/03/2014 11:44, Konstantin Kolinko wrote:
> 2014-03-03 13:10 GMT+04:00  <ma...@apache.org>:
>> Author: markt
>> Date: Mon Mar  3 09:10:13 2014
>> New Revision: 1573484
>>
>> URL: http://svn.apache.org/r1573484
>> Log:
>> DBCP 2.0 has been released.
>>
> 
> Congratulations, Mark!
> 
> Change log update for this =?

Will do. Busy juggling various $work things at the moment and forgot
that. Thanks for the reminder.

Mark


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Re: svn commit: r1573484 - in /tomcat/trunk: build.properties.default build.xml

Posted by Konstantin Kolinko <kn...@gmail.com>.
2014-03-03 13:10 GMT+04:00  <ma...@apache.org>:
> Author: markt
> Date: Mon Mar  3 09:10:13 2014
> New Revision: 1573484
>
> URL: http://svn.apache.org/r1573484
> Log:
> DBCP 2.0 has been released.
>

Congratulations, Mark!

Change log update for this =?


> Modified:
>     tomcat/trunk/build.properties.default
>     tomcat/trunk/build.xml
>
> Modified: tomcat/trunk/build.properties.default
> URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1573484&r1=1573483&r2=1573484&view=diff
> ==============================================================================
> --- tomcat/trunk/build.properties.default (original)
> +++ tomcat/trunk/build.properties.default Mon Mar  3 09:10:13 2014
> @@ -152,14 +152,10 @@ tomcat-native.win.1=${base-tomcat.loc.1}
>  tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip
>
>  # ----- Commons DBCP, version 2.0 or later -----
> -#commons-dbcp.version=1.4
> -#commons-dbcp.home=${base.path}/commons-dbcp-${commons-dbcp.version}-src
> -#commons-dbcp-src.loc.1=${base-commons.loc.1}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
> -#commons-dbcp-src.loc.2=${base-commons.loc.2}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
> -commons-dbcp.version=2.0-20140228.204604-213
> -commons-dbcp.home=${base.path}/commons-dbcp2-2.0-SNAPSHOT-src
> -commons-dbcp-src.loc.1=https://repository.apache.org/content/repositories/snapshots/org/apache/commons/commons-dbcp2/2.0-SNAPSHOT/commons-dbcp2-${commons-dbcp.version}-src.tar.gz
> -commons-dbcp-src.loc.2=https://repository.apache.org/content/repositories/snapshots/org/apache/commons/commons-dbcp2/2.0-SNAPSHOT/commons-dbcp2-${commons-dbcp.version}-src.tar.gz
> +commons-dbcp.version=2.0
> +commons-dbcp.home=${base.path}/commons-dbcp2-${commons-dbcp.version}-src
> +commons-dbcp-src.loc.1=${base-commons.loc.1}/dbcp/source/commons-dbcp2-${commons-dbcp.version}-src.tar.gz
> +commons-dbcp-src.loc.2=${base-commons.loc.2}/dbcp/source/commons-dbcp2-${commons-dbcp.version}-src.tar.gz
>
>  # ----- Commons Pool, version 2.1 or later -----
>  commons-pool.version=2.2
> @@ -167,8 +163,6 @@ commons-pool.home=${base.path}/commons-p
>  commons-pool-src.loc.1=${base-commons.loc.1}/pool/source/commons-pool2-${commons-pool.version}-src.tar.gz
>  commons-pool-src.loc.2=${base-commons.loc.2}/pool/source/commons-pool2-${commons-pool.version}-src.tar.gz
>
> -
> -
>  # ----- NSIS, version 2.0 or later -----
>  nsis.home=${base.path}/nsis-2.46
>  nsis.exe=${nsis.home}/makensis.exe
>
> Modified: tomcat/trunk/build.xml
> URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1573484&r1=1573483&r2=1573484&view=diff
> ==============================================================================
> --- tomcat/trunk/build.xml (original)
> +++ tomcat/trunk/build.xml Mon Mar  3 09:10:13 2014
> @@ -2576,8 +2576,6 @@ Apache Tomcat ${version} native binaries
>    <target name="clean-depend"
>            description="Deletes the dependencies that are built from source">
>      <delete dir="${tomcat-dbcp.home}"/>
> -    <!-- Only required while working with snapshots -->
> -    <delete dir="${commons-dbcp.home}"/>
>    </target>
>
>    <target name="clean"
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org