You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2013/06/13 10:31:37 UTC
svn commit: r1492563 - in /tomcat/tc7.0.x/trunk: ./ build.properties.default
build.xml modules/jdbc-pool/build.properties.default
modules/jdbc-pool/build.xml webapps/docs/changelog.xml
Author: kkolinko
Date: Thu Jun 13 08:31:37 2013
New Revision: 1492563
URL: http://svn.apache.org/r1492563
Log:
Merged r1492555 from tomcat/trunk:
Update Tomcat and JDBC-Pool to JUnit 4.11.
Download Hamcrest 1.3 core library and add it to testing classpath.
As junit.jar no longer includes Hamcrest classes, the library has to be downloaded separately.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/build.properties.default
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/modules/jdbc-pool/build.properties.default
tomcat/tc7.0.x/trunk/modules/jdbc-pool/build.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1492555
Modified: tomcat/tc7.0.x/trunk/build.properties.default
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1492563&r1=1492562&r2=1492563&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.properties.default (original)
+++ tomcat/tc7.0.x/trunk/build.properties.default Thu Jun 13 08:31:37 2013
@@ -176,12 +176,18 @@ commons-daemon.native.src.loc.2=${base-c
commons-daemon.native.win.loc.1=${base-commons.loc.1}/daemon/binaries/windows/commons-daemon-${commons-daemon.version}-bin-windows.zip
commons-daemon.native.win.loc.2=${base-commons.loc.2}/daemon/binaries/windows/commons-daemon-${commons-daemon.version}-bin-windows.zip
-# ----- JUnit Unit Test Suite, version 4.8 or later -----
-junit.version=4.9
-junit.home=${base.path}/junit${junit.version}
+# ----- JUnit Unit Test Suite, version 4.11 or later -----
+junit.version=4.11
+junit.home=${base.path}/junit-${junit.version}
junit.jar=${junit.home}/junit-${junit.version}.jar
junit.loc=${base-maven.loc}/junit/junit/${junit.version}/junit-${junit.version}.jar
+# ----- Hamcrest Library, used by JUnit, version 1.3 or later ----
+hamcrest.version=1.3
+hamcrest.home=${base.path}/hamcrest-${hamcrest.version}
+hamcrest.jar=${hamcrest.home}/hamcrest-core-${hamcrest.version}.jar
+hamcrest.loc=${base-maven.loc}/org/hamcrest/hamcrest-core/${hamcrest.version}/hamcrest-core-${hamcrest.version}.jar
+
# ----- Checkstyle, version 5.1 or later -----
checkstyle.version=5.6
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
Modified: tomcat/tc7.0.x/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1492563&r1=1492562&r2=1492563&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Thu Jun 13 08:31:37 2013
@@ -174,6 +174,7 @@
<pathelement location="${tomcat.build}/webapps/examples/WEB-INF/classes"/>
<pathelement location="${test.classes}"/>
<pathelement location="${junit.jar}"/>
+ <pathelement location="${hamcrest.jar}"/>
<path refid="compile.classpath" />
<path refid="tomcat.classpath" />
</path>
@@ -2378,6 +2379,12 @@ Apache Tomcat ${version} native binaries
<param name="destdir" value="${junit.home}"/>
</antcall>
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${hamcrest.loc}"/>
+ <param name="destfile" value="${hamcrest.jar}"/>
+ <param name="destdir" value="${hamcrest.home}"/>
+ </antcall>
+
</target>
<target name="download-dist"
Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/build.properties.default
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/build.properties.default?rev=1492563&r1=1492562&r2=1492563&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/modules/jdbc-pool/build.properties.default (original)
+++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/build.properties.default Thu Jun 13 08:31:37 2013
@@ -62,11 +62,17 @@ testdb.validationQuery=SELECT 1
#testdb.driverClassName=org.apache.derby.jdbc.EmbeddedDriver
#testdb.validationQuery=VALUES 1
-# ----- JUnit Unit Test Suite, version 4.8 or later -----
-junit.home=${base.path}/junit4.8.2
-junit.lib=${junit.home}
-junit.jar=${junit.lib}/junit-4.8.2.jar
-junit.loc=http://cloud.github.com/downloads/KentBeck/junit/junit4.8.2.zip
+# JUnit Unit Test Suite
+junit.version=4.11
+junit.home=${base.path}/junit-${junit.version}
+junit.jar=${junit.home}/junit-${junit.version}.jar
+junit.loc=http://repo.maven.apache.org/maven2/junit/junit/${junit.version}/junit-${junit.version}.jar
+
+# Hamcrest Library, used by JUnit
+hamcrest.version=1.3
+hamcrest.home=${base.path}/hamcrest-${hamcrest.version}
+hamcrest.jar=${hamcrest.home}/hamcrest-core-${hamcrest.version}.jar
+hamcrest.loc=http://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/${hamcrest.version}/hamcrest-core-${hamcrest.version}.jar
c3p0.home=${base.path}/c3p0-0.9.1.2
c3p0.jar=${c3p0.home}/lib/c3p0-0.9.1.2.jar
Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/build.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/build.xml?rev=1492563&r1=1492562&r2=1492563&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/modules/jdbc-pool/build.xml (original)
+++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/build.xml Thu Jun 13 08:31:37 2013
@@ -71,6 +71,7 @@
<pathelement location="${c3p0.jar}"/>
<pathelement location="${mysql.jar}"/>
<pathelement location="${junit.jar}"/>
+ <pathelement location="${hamcrest.jar}"/>
<pathelement location="${tomcat.dbcp.jar}"/>
<pathelement location="${derby.jar}"/>
<pathelement location="${h2.jar}"/>
@@ -397,10 +398,15 @@
<param name="destfile" value="${h2.jar}"/>
<param name="destdir" value="${base.path}"/>
</antcall>
- <antcall target="downloadzip">
+ <antcall target="downloadfile">
<param name="sourcefile" value="${junit.loc}"/>
<param name="destfile" value="${junit.jar}"/>
- <param name="destdir" value="${base.path}"/>
+ <param name="destdir" value="${junit.home}"/>
+ </antcall>
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${hamcrest.loc}"/>
+ <param name="destfile" value="${hamcrest.jar}"/>
+ <param name="destdir" value="${hamcrest.home}"/>
</antcall>
</target>
@@ -419,10 +425,15 @@
<param name="destfile" value="${h2.jar}"/>
<param name="destdir" value="${base.path}"/>
</antcall>
- <antcall target="downloadzip">
+ <antcall target="downloadfile">
<param name="sourcefile" value="${junit.loc}"/>
<param name="destfile" value="${junit.jar}"/>
- <param name="destdir" value="${base.path}"/>
+ <param name="destdir" value="${junit.home}"/>
+ </antcall>
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${hamcrest.loc}"/>
+ <param name="destfile" value="${hamcrest.jar}"/>
+ <param name="destdir" value="${hamcrest.home}"/>
</antcall>
</target>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1492563&r1=1492562&r2=1492563&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Jun 13 08:31:37 2013
@@ -86,7 +86,9 @@
to be <code>repo.maven.apache.org</code>. (kkolinko)
</update>
<update>
- Update JUnit to version 4.9. (kkolinko)
+ Update JUnit to version 4.11. Configure separate download for Hamcrest
+ 1.3 core library as its classes are no longer included in junit.jar.
+ (kkolinko)
</update>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org