aboutsummaryrefslogtreecommitdiffstats
path: root/build.xml
diff options
context:
space:
mode:
authorDominik Stadler <centic@apache.org>2015-10-13 16:37:22 +0000
committerDominik Stadler <centic@apache.org>2015-10-13 16:37:22 +0000
commitf678783d466471a6472914038b4e83518879abcb (patch)
treeeae3917d94276359bddea7695fcd824849a2817d /build.xml
parent1725c9100acca911c5a40d5ecf654fd6b9d19f78 (diff)
downloadpoi-f678783d466471a6472914038b4e83518879abcb.tar.gz
poi-f678783d466471a6472914038b4e83518879abcb.zip
Update to latest commons-codec-1.10 and commons-logging-1.2, use the properties for these libs everywhere in build.xml
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1708464 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml19
1 files changed, 10 insertions, 9 deletions
diff --git a/build.xml b/build.xml
index 857b7ddbdf..d50555190b 100644
--- a/build.xml
+++ b/build.xml
@@ -149,12 +149,12 @@ under the License.
<property name="excelant.testokfile" location="build/excelant-testokfile.txt"/>
<!-- jars in the /lib directory, see the fetch-jars target-->
- <property name="main.commons-logging.jar" location="${main.lib}/commons-logging-1.1.3.jar"/>
+ <property name="main.commons-logging.jar" location="${main.lib}/commons-logging-1.2.jar"/>
<property name="main.commons-logging.url"
- value="${repository.m2}/maven2/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar"/>
- <property name="main.commons-codec.jar" location="${main.lib}/commons-codec-1.9.jar"/>
+ value="${repository.m2}/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
+ <property name="main.commons-codec.jar" location="${main.lib}/commons-codec-1.10.jar"/>
<property name="main.commons-codec.url"
- value="${repository.m2}/maven2/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"/>
+ value="${repository.m2}/maven2/commons-codec/commons-codec/1.10/commons-codec-1.10.jar"/>
<property name="main.log4j.jar" location="${main.lib}/log4j-1.2.17.jar"/>
<property name="main.log4j.url" value="${repository.m2}/maven2/log4j/log4j/1.2.17/log4j-1.2.17.jar"/>
<property name="main.junit.jar" location="${main.lib}/junit-4.12.jar"/>
@@ -436,7 +436,8 @@ under the License.
<include name="ant-1.8*"/>
<include name="asm-all-4*"/>
<include name="commons-codec-1.5*"/>
- <include name="commons-logging-1.1.jar"/>
+ <include name="commons-codec-1.9*"/>
+ <include name="commons-logging-1.1*.jar"/>
<include name="jacoco-0.6*"/>
<include name="jacoco-0.7.1*"/>
<include name="jacoco-0.7.2*"/>
@@ -1796,8 +1797,8 @@ under the License.
<auxClasspath path="${ooxml.xsds.jar}" />
<auxClasspath path="ooxml-lib/ooxml-security-1.0.jar" />
<auxClasspath path="ooxml-lib/xmlbeans-2.6.0.jar" />
- <auxClasspath path="lib/commons-codec-1.9.jar" />
- <auxClasspath path="lib/commons-logging-1.1.3.jar" />
+ <auxClasspath path="${main.commons-codec.jar}" />
+ <auxClasspath path="${main.commons-logging.jar}" />
<auxClasspath path="lib/junit-4.12.jar" />
<sourcePath path="src/java" />
<sourcePath path="src/ooxml/java" />
@@ -1819,8 +1820,8 @@ under the License.
<auxClasspath path="${ooxml.xsds.jar}" />
<auxClasspath path="ooxml-lib/ooxml-security-1.0.jar" />
<auxClasspath path="ooxml-lib/xmlbeans-2.6.0.jar" />
- <auxClasspath path="lib/commons-codec-1.9.jar" />
- <auxClasspath path="lib/commons-logging-1.1.3.jar" />
+ <auxClasspath path="${main.commons-codec.jar}" />
+ <auxClasspath path="${main.commons-logging.jar}" />
<auxClasspath path="lib/junit-4.12.jar" />
<sourcePath path="src/java" />
<sourcePath path="src/ooxml/java" />