From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 21 Feb 2011 13:15:53 +0000 (+0000)
Subject: Servletapi-2.3 appears to have disappeared from the maven1 repo.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=54d7cce8de65efa28773cb559e1bac03a7ee5845;p=tomcat7.0

Servletapi-2.3 appears to have disappeared from the maven1 repo.
Switch everything to maven2 repo

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1072962 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/build.properties.default b/build.properties.default
index 63430e05b..e44f26e18 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -60,7 +60,7 @@ base-tomcat.loc.1=${base-apache.loc.1}/tomcat
 base-tomcat.loc.2=${base-apache.loc.2}/tomcat
 
 base-sf.loc=http://downloads.sourceforge.net
-base-maven1.loc=http://repo1.maven.org/maven
+base-maven.loc=http://repo2.maven.org/maven2
 
 # Mirror, was used when there were problems with the main SF downloads site
 # base-sf.loc=http://sunet.dl.sourceforge.net
@@ -80,37 +80,37 @@ commons-logging-src.tar.gz=${commons-logging.home}/commons-logging-${commons-log
 # ----- Avalon Framework (required by commons logging) -----
 avalon-framework.version=4.1.3
 avalon-framework.home=${base.path}/avalon-framework-${avalon-framework.version}
-avalon-framework.loc=${base-maven1.loc}/avalon-framework/jars/avalon-framework-${avalon-framework.version}.jar
+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.home=${base.path}/log4j-${log4j.version}
-log4j.loc=${base-maven1.loc}/log4j/jars/log4j-${log4j.version}.jar
+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-maven1.loc}/logkit/jars/logkit-${logkit.version}.jar
+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-maven1.loc}/servletapi/jars/servletapi-${servletapi.version}.jar
+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}
-jaxrpc-lib.loc=http://repo1.maven.org/maven2/geronimo-spec/geronimo-spec-jaxrpc/${jaxrpc-lib.version}/geronimo-spec-jaxrpc-${jaxrpc-lib.version}.jar
+jaxrpc-lib.loc=${base-maven.loc}/geronimo-spec/geronimo-spec-jaxrpc/${jaxrpc-lib.version}/geronimo-spec-jaxrpc-${jaxrpc-lib.version}.jar
 jaxrpc-lib.jar=${jaxrpc-lib.home}/geronimo-spec-jaxrpc-${jaxrpc-lib.version}.jar
 
 # ----- Webservices - WSDL4J -----
 wsdl4j-lib.version=1.6.1
 wsdl4j-lib.home=${base.path}/wsdl4j-${wsdl4j-lib.version}
-wsdl4j-lib.loc=http://repo1.maven.org/maven2/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${wsdl4j-lib.version}.jar
+wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${wsdl4j-lib.version}.jar
 wsdl4j-lib.jar=${wsdl4j-lib.home}/wsdl4j-${wsdl4j-lib.version}.jar
 
 # ----- Eclipse JDT, version 3.2 or later -----