Author: kwright
Date: Tue May 20 20:16:18 2014
New Revision: 1596387
URL: http://svn.apache.org/r1596387
Log:
Fix for CONNECTORS-940.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/build.xml
manifoldcf/trunk/pom.xml
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1596387&r1=1596386&r2=1596387&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Tue May 20 20:16:18 2014
@@ -3,6 +3,9 @@ $Id$
======================= 1.7-dev =====================
+CONNECTORS-940: Upgrade slf4j and commons-logging to latest versions.
+(Karl Wright)
+
CONNECTORS-933: Simplified chinese localizations.
(Mingchun Zhao)
Modified: manifoldcf/trunk/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1596387&r1=1596386&r2=1596387&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Tue May 20 20:16:18 2014
@@ -905,7 +905,7 @@ Use Apache Forrest version forrest-0.9-d
</antcall>
<antcall target="download-via-maven"><param name="target" value="lib"/>
<param name="project-path" value="commons-logging"/>
- <param name="artifact-version" value="1.1.1"/>
+ <param name="artifact-version" value="1.1.3"/>
<param name="artifact-name" value="commons-logging"/>
<param name="artifact-type" value="jar"/>
</antcall>
@@ -925,7 +925,7 @@ Use Apache Forrest version forrest-0.9-d
<target name="download-slf4j">
<mkdir dir="lib"/>
- <property name="slf4j-version" value="1.6.6"/>
+ <property name="slf4j-version" value="1.7.7"/>
<property name="slf4j-package" value="org/slf4j"/>
<antcall target="download-via-maven"><param name="project-path"
value="${slf4j-package}"/><param name="artifact-version"
value="${slf4j-version}"/><param name="target" value="lib"/>
<param name="artifact-name" value="slf4j-api"/>
Modified: manifoldcf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/pom.xml?rev=1596387&r1=1596386&r2=1596387&view=diff
==============================================================================
--- manifoldcf/trunk/pom.xml (original)
+++ manifoldcf/trunk/pom.xml Tue May 20 20:16:18 2014
@@ -45,7 +45,7 @@
<jetty.version>7.5.4.v20111024</jetty.version>
<commons-codec.version>1.5</commons-codec.version>
<commons-io.version>2.1</commons-io.version>
- <commons-logging.version>1.1.1</commons-logging.version>
+ <commons-logging.version>1.1.3</commons-logging.version>
<commons-collections.version>3.2.1</commons-collections.version>
<commons-fileupload.version>1.2.2</commons-fileupload.version>
<httpcomponent.httpclient.version>4.3.3</httpcomponent.httpclient.version>
@@ -66,7 +66,7 @@
<jdbcpool.version>0.99</jdbcpool.version>
<json.version>20090211</json.version>
<velocity.version>1.7</velocity.version>
- <slf4j.version>1.6.6</slf4j.version>
+ <slf4j.version>1.7.7</slf4j.version>
<jaxb.version>2.2.6</jaxb.version>
<zookeeper.version>3.4.5</zookeeper.version>
</properties>
