You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by oh...@apache.org on 2013/06/27 22:23:48 UTC
svn commit: r1497559 - /commons/proper/configuration/trunk/build.xml
Author: oheger
Date: Thu Jun 27 20:23:48 2013
New Revision: 1497559
URL: http://svn.apache.org/r1497559
Log:
[CONFIGURATION-544] Updated dependencies in ant build.
Some missing dependencies were added, the dependency to Commons Lang 2.6 was
removed. Thanks to Oliver Kopp for the patch these modifications were based
on.
Modified:
commons/proper/configuration/trunk/build.xml
Modified: commons/proper/configuration/trunk/build.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/build.xml?rev=1497559&r1=1497558&r2=1497559&view=diff
==============================================================================
--- commons/proper/configuration/trunk/build.xml (original)
+++ commons/proper/configuration/trunk/build.xml Thu Jun 27 20:23:48 2013
@@ -53,7 +53,7 @@
<property name="lib" value="${maven.repo.local}"/> <!-- only sets if unset - i.e., repo.check succeeded -->
<path id="build.classpath">
<pathelement location="${lib}/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar"/>
- <pathelement location="${lib}/commons-lang/commons-lang/2.6/commons-lang-2.6.jar"/>
+ <pathelement location="${lib}/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar"/>
<pathelement location="${lib}/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
<pathelement location="${lib}/commons-digester/commons-digester/1.8.1/commons-digester-1.8.1.jar"/>
<pathelement location="${lib}/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3.jar"/>
@@ -75,7 +75,7 @@
</path>
<path id="build.test.classpath">
<pathelement location="${lib}/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar"/>
- <pathelement location="${lib}/commons-lang/commons-lang/2.6/commons-lang-2.6.jar"/>
+ <pathelement location="${lib}/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar"/>
<pathelement location="${lib}/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
<pathelement location="${lib}/commons-digester/commons-digester/1.8.1/commons-digester-1.8.1.jar"/>
<pathelement location="${lib}/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3.jar"/>
@@ -101,6 +101,8 @@
<pathelement location="${lib}/junit/junit/4.10/junit-4.10.jar"/>
<pathelement location="${lib}/junit-addons/junit-addons/1.4/junit-addons-1.4.jar"/>
<pathelement location="${lib}/org/easymock/easymock/3.1/easymock-3.1.jar"/>
+ <pathelement location="${lib}/cglib/cglib-nodep/2.2.2/cglib-nodep-2.2.2.jar"/>
+ <pathelement location="${lib}/org/objenesis/objenesis/1.2/objenesis-1.2.jar"/>
<pathelement location="${lib}/mockobjects/mockobjects-core/0.09/mockobjects-core-0.09.jar"/>
<pathelement location="${lib}/mockobjects/mockobjects-jdk1.4-j2ee1.3/0.09/mockobjects-jdk1.4-j2ee1.3-0.09.jar"/>
<pathelement location="${lib}/javax/mail/mail/1.4/mail-1.4.jar"/>
@@ -210,8 +212,7 @@
<include name="**/*TestCase.java"/>
<exclude name="**/TestWebdavConfigurationBuilder.java"/>
<exclude name="**/TestAbstractConfiguration.java"/>
- <exclude name="**/AbstractCombinerTest.java"/>
- <exclude name="**/AbstractXPathTest.java"/>
+ <exclude name="**/Abstract*Test.java"/>
</fileset>
</batchtest>
<batchtest todir="${build.dir}">
@@ -259,7 +260,7 @@
<link href="http://download.oracle.com/javase/6/docs/api/"/>
<link href="http://download.oracle.com/javaee/6/api/"/>
<link href="http://commons.apache.org/collections/api-3.1"/>
- <link href="http://commons.apache.org/lang/api-2.6"/>
+ <link href="http://commons.apache.org/proper/commons-lang/javadocs/api-3.1"/>
<link href="http://commons.apache.org/beanutils/v1.8.3/apidocs"/>
</javadoc>
</target>
@@ -281,11 +282,11 @@
dest="${lib}/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar"
usetimestamp="true"
ignoreerrors="true"/>
- <mkdir dir="${lib}/commons-lang/commons-lang/2.6"/>
- <get src="http://repo1.maven.org/maven2/commons-lang/commons-lang/2.6/commons-lang-2.6.jar"
- dest="${lib}/commons-lang/commons-lang/2.6/commons-lang-2.6.jar"
- usetimestamp="true"
- ignoreerrors="true"/>
+ <mkdir dir="${lib}/commons-lang/commons-lang/3.1"/>
+ <get src="http://repo1.maven.org/maven2/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar"
+ dest="${lib}/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar"
+ usetimestamp="true"
+ ignoreerrors="true"/>
<mkdir dir="${lib}/commons-logging/commons-logging/1.1.1"/>
<get src="http://repo1.maven.org/maven2/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"
dest="${lib}/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"
@@ -411,6 +412,16 @@
dest="${lib}/org/easymock/easymock/3.1/easymock-3.1.jar"
usetimestamp="true"
ignoreerrors="true"/>
+ <mkdir dir="${lib}/cglib/cglib-nodep/2.2.2"/>
+ <get src="http://repo1.maven.org/maven2/cglib/cglib-nodep/2.2.2/cglib-nodep-2.2.2.jar"
+ dest="${lib}/cglib/cglib-nodep/2.2.2/cglib-nodep-2.2.2.jar"
+ usetimestamp="true"
+ ignoreerrors="true"/>
+ <mkdir dir="${lib}/org/objenesis/objenesis/1.2"/>
+ <get src="http://repo1.maven.org/maven2/org/objenesis/objenesis/1.2/objenesis-1.2.jar"
+ dest="${lib}/org/objenesis/objenesis/1.2/objenesis-1.2.jar"
+ usetimestamp="true"
+ ignoreerrors="true"/>
<mkdir dir="${lib}/mockobjects/mockobjects-core/0.09"/>
<get src="http://repo1.maven.org/maven2/mockobjects/mockobjects-core/0.09/mockobjects-core-0.09.jar"
dest="${lib}/mockobjects/mockobjects-core/0.09/mockobjects-core-0.09.jar"