Author: markt Date: Tue Jun 28 11:43:53 2016 New Revision: 1750480 URL: http://svn.apache.org/viewvc?rev=1750480&view=rev Log: Remove a few more left-overs after removing the JULI/log4j embedded JAR
Modified: tomcat/trunk/build.properties.default tomcat/trunk/res/maven/tomcat-embed-core.pom Modified: tomcat/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1750480&r1=1750479&r2=1750480&view=diff ============================================================================== --- tomcat/trunk/build.properties.default (original) +++ tomcat/trunk/build.properties.default Tue Jun 28 11:43:53 2016 @@ -95,42 +95,6 @@ base-maven.loc=http://repo.maven.apache. # Mirror, was used when there were problems with the main SF downloads site # base-sf.loc=http://sunet.dl.sourceforge.net -# ----- Commons Logging, version 1.1 or later ----- -# If this version is updated, check the versions required for the dependencies below -# - avalon-framework -# - log4j -# - logkit -# - servletapi -commons-logging.version=1.1.3 -commons-logging.home=${base.path}/commons-logging-${commons-logging.version} -commons-logging-src.loc.1=${base-commons.loc.1}/logging/source/commons-logging-${commons-logging.version}-src.tar.gz -commons-logging-src.loc.2=${base-commons.loc.2}/logging/source/commons-logging-${commons-logging.version}-src.tar.gz -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.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.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 - -# ----- logkit (required by commons logging) ----- -logkit.version=1.0.1 -logkit.home=${base.path}/logkit-${logkit.version} -logkit.loc=${base-maven.loc}/logkit/logkit/${logkit.version}/logkit-${logkit.version}.jar -logkit.jar=${logkit.home}/logkit-${logkit.version}.jar - -# ----- servletapi (required by commons logging) ----- -servletapi.version=2.3 -servletapi.home=${base.path}/servletapi-${servletapi.version} -servletapi.loc=${base-maven.loc}/servletapi/servletapi/${servletapi.version}/servletapi-${servletapi.version}.jar -servletapi.jar=${servletapi.home}/servletapi-${servletapi.version}.jar - # ----- Webservices - JAX RPC ----- jaxrpc-lib.version=1.1-rc4 jaxrpc-lib.home=${base.path}/jaxrpc-${jaxrpc-lib.version} Modified: tomcat/trunk/res/maven/tomcat-embed-core.pom URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-embed-core.pom?rev=1750480&r1=1750479&r2=1750480&view=diff ============================================================================== --- tomcat/trunk/res/maven/tomcat-embed-core.pom (original) +++ tomcat/trunk/res/maven/tomcat-embed-core.pom Tue Jun 28 11:43:53 2016 @@ -29,20 +29,4 @@ <distribution>repo</distribution> </license> </licenses> - <dependencies> - <dependency> - <groupId>org.apache.tomcat.embed</groupId> - <artifactId>tomcat-embed-logging-juli</artifactId> - <version>@MAVEN.DEPLOY.VERSION@</version> - <scope>compile</scope> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.apache.tomcat.embed</groupId> - <artifactId>tomcat-embed-logging-log4j</artifactId> - <version>@MAVEN.DEPLOY.VERSION@</version> - <scope>compile</scope> - <optional>true</optional> - </dependency> - </dependencies> </project> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org