From f678783d466471a6472914038b4e83518879abcb Mon Sep 17 00:00:00 2001
From: Dominik Stadler <centic@apache.org>
Date: Tue, 13 Oct 2015 16:37:22 +0000
Subject: [PATCH] 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
---
 .classpath         |  4 ++--
 build.xml          | 19 ++++++++++---------
 maven/poi.pom      |  4 ++--
 sonar/main/pom.xml |  4 ++--
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/.classpath b/.classpath
index b7be443674..395d777808 100644
--- a/.classpath
+++ b/.classpath
@@ -17,8 +17,8 @@
 	<classpathentry kind="src" path="src/integrationtest"/>
 	<classpathentry kind="lib" path="lib/ant-1.9.4.jar"/>
 	<classpathentry kind="lib" path="lib/ant-launcher-1.9.4.jar"/>
-	<classpathentry kind="lib" path="lib/commons-codec-1.9.jar"/>
-	<classpathentry kind="lib" path="lib/commons-logging-1.1.3.jar"/>
+	<classpathentry kind="lib" path="lib/commons-codec-1.10.jar"/>
+	<classpathentry kind="lib" path="lib/commons-logging-1.2.jar"/>
 	<classpathentry kind="lib" path="lib/log4j-1.2.17.jar"/>
 	<classpathentry kind="lib" path="ooxml-lib/xmlbeans-2.6.0.jar"/>
 	<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
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" />
diff --git a/maven/poi.pom b/maven/poi.pom
index 6f2c4243ab..7c1b4cf84f 100644
--- a/maven/poi.pom
+++ b/maven/poi.pom
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.1.3</version>
+      <version>1.2</version>
       <scope>runtime</scope>
       <optional>true</optional>
     </dependency>
@@ -76,7 +76,7 @@
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
-      <version>1.9</version>
+      <version>1.10</version>
     </dependency>
 
     <dependency>
diff --git a/sonar/main/pom.xml b/sonar/main/pom.xml
index d962229758..67cf12801c 100644
--- a/sonar/main/pom.xml
+++ b/sonar/main/pom.xml
@@ -104,12 +104,12 @@
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.9</version>
+            <version>1.10</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.1.3</version>
+            <version>1.2</version>
         </dependency>
     </dependencies>
 </project>
-- 
2.39.5