You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2014/10/14 10:11:51 UTC
svn commit: r1631663 - in /manifoldcf/branches/dev_1x: ./ CHANGES.txt
build.xml pom.xml
Author: kwright
Date: Tue Oct 14 08:11:50 2014
New Revision: 1631663
URL: http://svn.apache.org/r1631663
Log:
Pull up fix for CONNECTORS-1042 from trunk
Modified:
manifoldcf/branches/dev_1x/ (props changed)
manifoldcf/branches/dev_1x/CHANGES.txt
manifoldcf/branches/dev_1x/build.xml
manifoldcf/branches/dev_1x/pom.xml
Propchange: manifoldcf/branches/dev_1x/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1626638-1626639
Modified: manifoldcf/branches/dev_1x/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/CHANGES.txt?rev=1631663&r1=1631662&r2=1631663&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/CHANGES.txt (original)
+++ manifoldcf/branches/dev_1x/CHANGES.txt Tue Oct 14 08:11:50 2014
@@ -3,6 +3,9 @@ $Id$
======================= 1.8-dev =====================
+CONNECTORS-1042: Upgrade solrj and zookeeper versions.
+(Karl Wright)
+
CONNECTORS-1061: More fixes for the Alfresco webscript connector
UI, and create a UI test.
(Karl Wright)
Modified: manifoldcf/branches/dev_1x/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/build.xml?rev=1631663&r1=1631662&r2=1631663&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/build.xml (original)
+++ manifoldcf/branches/dev_1x/build.xml Tue Oct 14 08:11:50 2014
@@ -1627,7 +1627,7 @@ Use Apache Forrest version forrest-0.9-d
<antcall target="download-via-maven">
<param name="target" value="lib"/>
<param name="project-path" value="org/apache/solr"/>
- <param name="artifact-version" value="4.7.0"/>
+ <param name="artifact-version" value="4.10.0"/>
<param name="artifact-name" value="solr-solrj"/>
<param name="artifact-type" value="jar"/>
</antcall>
@@ -1645,7 +1645,7 @@ Use Apache Forrest version forrest-0.9-d
<antcall target="download-via-maven">
<param name="target" value="lib"/>
<param name="project-path" value="org/apache/zookeeper"/>
- <param name="artifact-version" value="3.4.5"/>
+ <param name="artifact-version" value="3.4.6"/>
<param name="artifact-name" value="zookeeper"/>
<param name="artifact-type" value="jar"/>
</antcall>
Modified: manifoldcf/branches/dev_1x/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/pom.xml?rev=1631663&r1=1631662&r2=1631663&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/pom.xml (original)
+++ manifoldcf/branches/dev_1x/pom.xml Tue Oct 14 08:11:50 2014
@@ -59,7 +59,7 @@
<httpcomponent.httpclient.version>4.3.5</httpcomponent.httpclient.version>
<httpcomponent.httpcore.version>4.3.2</httpcomponent.httpcore.version>
<httpcomponent.httpmime.version>4.3.5</httpcomponent.httpmime.version>
- <solr.version>4.7.0</solr.version>
+ <solr.version>4.10.0</solr.version>
<noggit.version>0.5</noggit.version>
<commons-el.version>1.0</commons-el.version>
<commons-lang.version>2.6</commons-lang.version>
@@ -76,7 +76,7 @@
<velocity.version>1.7</velocity.version>
<slf4j.version>1.7.7</slf4j.version>
<jaxb.version>2.2.6</jaxb.version>
- <zookeeper.version>3.4.5</zookeeper.version>
+ <zookeeper.version>3.4.6</zookeeper.version>
<xmlbeans.version>2.6.0</xmlbeans.version>
<poi.version>3.10.1</poi.version>
</properties>