Author: pbenedict
Date: Thu Jun 19 14:04:46 2014
New Revision: 1603882
URL: http://svn.apache.org/r1603882
Log:
Update compiler and dependencies
Modified:
struts/struts1/branches/STRUTS_1_2_BRANCH/build.xml
Modified: struts/struts1/branches/STRUTS_1_2_BRANCH/build.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_2_BRANCH/build.xml?rev=1603882&r1=1603881&r2=1603882&view=diff
==============================================================================
--- struts/struts1/branches/STRUTS_1_2_BRANCH/build.xml (original)
+++ struts/struts1/branches/STRUTS_1_2_BRANCH/build.xml Thu Jun 19 14:04:46 2014
@@ -212,6 +212,7 @@
<!-- Compilation Classpath -->
<path id="compile.classpath">
<pathelement location="${commons-beanutils.jar}"/>
+ <pathelement location="${commons-collections.jar}"/>
<pathelement location="${commons-digester.jar}"/>
<pathelement location="${commons-fileupload.jar}"/>
<pathelement location="${commons-logging.jar}"/>
@@ -281,53 +282,58 @@
<get dest="${libdir}/commons-beanutils.jar"
usetimestamp="true" ignoreerrors="true"
-
src="http://www.ibiblio.org/maven/commons-beanutils/jars/commons-beanutils-1.7.0.jar"/>
+
src="http://search.maven.org/remotecontent?filepath=commons-beanutils/commons-beanutils/1.9.2/commons-beanutils-1.9.2.jar"/>
+
+ <get dest="${libdir}/commons-collections.jar"
+ usetimestamp="true" ignoreerrors="true"
+
src="http://search.maven.org/remotecontent?filepath=commons-collections/commons-collections/2.1/commons-collections-2.1.jar"/>
<get dest="${libdir}/commons-digester.jar"
usetimestamp="true" ignoreerrors="true"
-
src="http://www.ibiblio.org/maven/commons-digester/jars/commons-digester-1.6.jar"/>
+
src="http://search.maven.org/remotecontent?filepath=commons-digester/commons-digester/1.8.1/commons-digester-1.8.1.jar"/>
- <get dest="${libdir}/commons-fileupload.jar"
+ <get dest="${libdir}/commons-fileupload.jar"
usetimestamp="true" ignoreerrors="true"
-
src="http://www.ibiblio.org/maven/commons-fileupload/jars/commons-fileupload-1.0.jar"/>
+
src="http://search.maven.org/remotecontent?filepath=commons-fileupload/commons-fileupload/1.3.1/commons-fileupload-1.3.1.jar"/>
<get dest="${libdir}/commons-logging.jar"
usetimestamp="true" ignoreerrors="true"
-
src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.4.jar"/>
+
src="http://search.maven.org/remotecontent?filepath=commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar"/>
<get dest="${libdir}/commons-validator.jar"
usetimestamp="true" ignoreerrors="true"
-
src="http://www.ibiblio.org/maven/commons-validator/jars/commons-validator-1.1.4.jar"/>
+
src="http://search.maven.org/remotecontent?filepath=commons-validator/commons-validator/1.1.4/commons-validator-1.1.4.jar"/>
<get dest="${libdir}/jakarta-oro.jar"
usetimestamp="true" ignoreerrors="true"
- src="http://www.ibiblio.org/maven/oro/jars/oro-2.0.7.jar"/>
+
src="http://search.maven.org/remotecontent?filepath=oro/oro/2.0.8/oro-2.0.8.jar"/>
<get dest="${libdir}/xerces.jar"
usetimestamp="true" ignoreerrors="true"
-
src="http://www.ibiblio.org/maven/xml-apis/jars/xml-apis-2.0.2.jar"/>
+
src="http://search.maven.org/remotecontent?filepath=xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar"/>
<get dest="${libdir}/antlr.jar"
usetimestamp="true" ignoreerrors="true"
- src="http://www.ibiblio.org/maven/antlr/jars/antlr-2.7.2.jar"/>
+
src="http://search.maven.org/remotecontent?filepath=antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
<get dest="${libdir}/servlet.jar"
usetimestamp="true" ignoreerrors="true"
-
src="http://www.ibiblio.org/maven/servletapi/jars/servletapi-2.2.jar"/>
+
src="http://search.maven.org/remotecontent?filepath=servletapi/servletapi/2.2/servletapi-2.2.jar"/>
<get dest="${libdir}/jstl-1.0.6.jar"
usetimestamp="true" ignoreerrors="true"
- src="http://www.ibiblio.org/maven/jstl/jars/jstl-1.0.6.jar"/>
+
src="http://search.maven.org/remotecontent?filepath=jstl/jstl/1.0.6/jstl-1.0.6.jar"/>
<get dest="${libdir}/standard-1.0.6.jar"
usetimestamp="true" ignoreerrors="true"
-
src="http://www.ibiblio.org/maven/taglibs/jars/standard-1.0.6.jar"/>
+
src="http://search.maven.org/remotecontent?filepath=taglibs/standard/1.0.6/standard-1.0.6.jar"/>
<get dest="${libdir}/junit-3.8.1.jar"
usetimestamp="true" ignoreerrors="true"
- src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar"/>
+
src="http://search.maven.org/remotecontent?filepath=junit/junit/3.8.1/junit-3.8.1.jar"/>
<property name="commons-beanutils.jar"
value="${libdir}/commons-beanutils.jar"/>
+ <property name="commons-collections.jar"
value="${libdir}/commons-collections.jar"/>
<property name="commons-digester.jar"
value="${libdir}/commons-digester.jar"/>
<property name="commons-fileupload.jar"
value="${libdir}/commons-fileupload.jar"/>
<property name="commons-logging.jar"
value="${libdir}/commons-logging.jar"/>
@@ -398,7 +404,9 @@
destdir="${build.home}/library/classes"
debug="${compile.debug}"
optimize="${compile.optimize}"
- deprecation="${compile.deprecation}">
+ source="1.5"
+ target="1.5"
+ deprecation="${compile.deprecation}">
<classpath refid="compile.classpath"/>
</javac>
<copy todir="${build.home}/library/classes">