manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1596987 - in /manifoldcf/branches/release-1.6-branch: ./ CHANGES.txt build.xml pom.xml
Date Thu, 22 May 2014 23:34:35 GMT
Author: kwright
Date: Thu May 22 23:34:34 2014
New Revision: 1596987

URL: http://svn.apache.org/r1596987
Log:
Pull up fix for CONNECTORS-940 from trunk

Modified:
    manifoldcf/branches/release-1.6-branch/   (props changed)
    manifoldcf/branches/release-1.6-branch/CHANGES.txt
    manifoldcf/branches/release-1.6-branch/build.xml
    manifoldcf/branches/release-1.6-branch/pom.xml

Propchange: manifoldcf/branches/release-1.6-branch/
------------------------------------------------------------------------------
  Merged /manifoldcf/trunk:r1596387

Modified: manifoldcf/branches/release-1.6-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.6-branch/CHANGES.txt?rev=1596987&r1=1596986&r2=1596987&view=diff
==============================================================================
--- manifoldcf/branches/release-1.6-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.6-branch/CHANGES.txt Thu May 22 23:34:34 2014
@@ -6,6 +6,9 @@ $Id$
 CONNECTORS-941: Solr connector not working properly with basic auth.
 (Erlend Garåsen, Karl Wright)
 
+CONNECTORS-940: Upgrade slf4j and commons-logging to latest versions.
+(Karl Wright)
+
 CONNECTORS-938: Allow JSPs to all work properly with Java 8.
 (Arcadius Ahouansou, Ahmet Arslan)
 

Modified: manifoldcf/branches/release-1.6-branch/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.6-branch/build.xml?rev=1596987&r1=1596986&r2=1596987&view=diff
==============================================================================
--- manifoldcf/branches/release-1.6-branch/build.xml (original)
+++ manifoldcf/branches/release-1.6-branch/build.xml Thu May 22 23:34:34 2014
@@ -901,7 +901,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>
@@ -921,7 +921,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/branches/release-1.6-branch/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.6-branch/pom.xml?rev=1596987&r1=1596986&r2=1596987&view=diff
==============================================================================
--- manifoldcf/branches/release-1.6-branch/pom.xml (original)
+++ manifoldcf/branches/release-1.6-branch/pom.xml Thu May 22 23:34:34 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>



Mime
View raw message