Author: rjung
Date: Thu Dec 12 12:31:48 2013
New Revision: 1550408
URL: http://svn.apache.org/r1550408
Log:
Revert r1536092: this broke building of the Log4J
adapter for our copy of commons-logging.
Unfortunately commons-logging 1.1.3 which we use
contains references to Log4J 1.2.12 and 1.2.17
but the one needed to build the adapter is 1.2.17.
Trunk already contans the right versions.
Modified:
tomcat/tc7.0.x/trunk/build.properties.default
Modified: tomcat/tc7.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1550408&r1=1550407&r2=1550408&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.properties.default (original)
+++ tomcat/tc7.0.x/trunk/build.properties.default Thu Dec 12 12:31:48 2013
@@ -94,13 +94,13 @@ commons-logging-src.loc.2=${base-commons
commons-logging-src.tar.gz=${commons-logging.home}/commons-logging-${commons-logging.version}-src.tar.gz
# ----- Avalon Framework (required by commons logging) -----
-avalon-framework.version=4.1.3
+avalon-framework.version=4.1.5
avalon-framework.home=${base.path}/avalon-framework-${avalon-framework.version}
avalon-framework.loc=${base-maven.loc}/avalon-framework/avalon-framework/${avalon-framework.version}/avalon-framework-${avalon-framework.version}.jar
avalon-framework.jar=${avalon-framework.home}/avalon-framework-${avalon-framework.version}.jar
# ----- log4j (required by commons logging) -----
-log4j.version=1.2.12
+log4j.version=1.2.17
log4j.home=${base.path}/log4j-${log4j.version}
log4j.loc=${base-maven.loc}/log4j/log4j/${log4j.version}/log4j-${log4j.version}.jar
log4j.jar=${log4j.home}/log4j-${log4j.version}.jar
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
