svn commit: r1769036 - in /manifoldcf/trunk: CHANGES.txt build.xml connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java pom.xml

[sh...@apache.org]

Author: shinichiro
Date: Thu Nov 10 05:33:29 2016
New Revision: 1769036

URL: http://svn.apache.org/viewvc?rev=1769036&view=rev
Log:
Fix for CONNECTORS-1338

Modified:
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/build.xml
    manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
    manifoldcf/trunk/pom.xml

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1769036&r1=1769035&r2=1769036&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Thu Nov 10 05:33:29 2016
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 2.6-dev =====================
 
+CONNECTORS-1338: Upgrade to SolrJ 6.3.0.
+(Shinichiro Abe)
+
 CONNETORS-1343: Allow maximum year in report UI to be set based
 on current year.
 (Markus Schuch)

Modified: manifoldcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1769036&r1=1769035&r2=1769036&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Thu Nov 10 05:33:29 2016
@@ -1968,7 +1968,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="5.5.2"/>
+            <param name="artifact-version" value="6.3.0"/>
             <param name="artifact-name" value="solr-solrj"/>
             <param name="artifact-type" value="jar"/>
         </antcall>

Modified: manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java?rev=1769036&r1=1769035&r2=1769036&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java (original)
+++ manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java Thu Nov 10 05:33:29 2016
@@ -46,7 +46,6 @@ import org.apache.http.auth.AuthScope;
 import org.apache.http.auth.Credentials;
 import org.apache.http.auth.UsernamePasswordCredentials;
 
-import org.apache.manifoldcf.core.util.URLEncoder;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
@@ -161,7 +160,10 @@ public class HttpPoster
     
     try
     {
-      CloudSolrClient cloudSolrServer = new CloudSolrClient(zookeeperHosts, new ModifiedLBHttpSolrClient(HttpClientUtil.createClient(null)));
+      CloudSolrClient cloudSolrServer = new CloudSolrClient.Builder()
+        .withZkHost(zookeeperHosts)
+        .withLBHttpSolrClient(new ModifiedLBHttpSolrClient(HttpClientUtil.createClient(null)))
+        .build();
       cloudSolrServer.setZkClientTimeout(zkClientTimeout);
       cloudSolrServer.setZkConnectTimeout(zkConnectTimeout);
       cloudSolrServer.setDefaultCollection(collection);

Modified: manifoldcf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/pom.xml?rev=1769036&r1=1769035&r2=1769036&view=diff
==============================================================================
--- manifoldcf/trunk/pom.xml (original)
+++ manifoldcf/trunk/pom.xml Thu Nov 10 05:33:29 2016
@@ -64,7 +64,7 @@
     <httpcomponent.httpclient.version>4.5.1</httpcomponent.httpclient.version>
     <httpcomponent.httpcore.version>4.4.4</httpcomponent.httpcore.version>
     <httpcomponent.httpmime.version>4.5.1</httpcomponent.httpmime.version>
-    <solr.version>5.5.2</solr.version>
+    <solr.version>6.3.0</solr.version>
     <noggit.version>0.6</noggit.version>
     <commons-el.version>1.0</commons-el.version>
     <commons-lang.version>2.6</commons-lang.version>