manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1840325 - in /manifoldcf/trunk: CHANGES.txt build.xml connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java pom.xml
Date Fri, 07 Sep 2018 21:53:39 GMT
Author: kwright
Date: Fri Sep  7 21:53:39 2018
New Revision: 1840325

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

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

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1840325&r1=1840324&r2=1840325&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Fri Sep  7 21:53:39 2018
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 2.11-dev =====================
 
+CONNECTORS-1531: Support Solrj 7.4.0.
+(Julien Massiera, Karl Wright)
+
 CONNECTORS-1528: Fix Canonicalization tab in Web Connector, and add
 IIS support (map to lowercase and collapse multiple slashes to one).
 (Kishore Kumar, Karl Wright)

Modified: manifoldcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1840325&r1=1840324&r2=1840325&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Fri Sep  7 21:53:39 2018
@@ -67,7 +67,7 @@
     <property name="jaxb-api.version" value="2.2.11"/>
     <property name="jaxb-impl.version" value="2.2.11"/>
     <property name="jaxws.version" value="2.2.6"/>
-    <property name="solrj.version" value="7.0.0"/>
+    <property name="solrj.version" value="7.4.0"/>
     <property name="noggit.version" value="0.8"/>
     <property name="commons-math3.version" value="3.4.1"/>
     <property name="chemistry.version" value="1.1.0"/>

Modified: manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java?rev=1840325&r1=1840324&r2=1840325&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java
(original)
+++ manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java
Fri Sep  7 21:53:39 2018
@@ -228,32 +228,18 @@ public class ModifiedHttpSolrClient exte
           contentStream[0] = content;
           break;
         }
-        if (contentStream[0] instanceof RequestWriter.LazyContentStream) {
-          postOrPut.setEntity(new InputStreamEntity(contentStream[0].getStream(), -1) {
-            @Override
-            public Header getContentType() {
-              return new BasicHeader("Content-Type", contentStream[0].getContentType());
-            }
+        postOrPut.setEntity(new InputStreamEntity(contentStream[0].getStream(), -1) {
+          @Override
+          public Header getContentType() {
+            return new BasicHeader("Content-Type", contentStream[0].getContentType());
+          }
 
-            @Override
-            public boolean isRepeatable() {
-              return false;
-            }
+          @Override
+          public boolean isRepeatable() {
+            return false;
+          }
 
-          });
-        } else {
-          postOrPut.setEntity(new InputStreamEntity(contentStream[0].getStream(), -1) {
-            @Override
-            public Header getContentType() {
-              return new BasicHeader("Content-Type", contentStream[0].getContentType());
-            }
-
-            @Override
-            public boolean isRepeatable() {
-              return false;
-            }
-          });
-        }
+        });
         return postOrPut;
       }
     }

Modified: manifoldcf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/pom.xml?rev=1840325&r1=1840324&r2=1840325&view=diff
==============================================================================
--- manifoldcf/trunk/pom.xml (original)
+++ manifoldcf/trunk/pom.xml Fri Sep  7 21:53:39 2018
@@ -65,7 +65,7 @@
     <httpcomponent.httpclient.version>4.5.3</httpcomponent.httpclient.version>
     <httpcomponent.httpcore.version>4.4.6</httpcomponent.httpcore.version>
     <httpcomponent.httpmime.version>4.5.3</httpcomponent.httpmime.version>
-    <solr.version>7.0.0</solr.version>
+    <solr.version>7.4.0</solr.version>
     <noggit.version>0.8</noggit.version>
     <commons-el.version>1.0</commons-el.version>
     <commons-lang.version>2.6</commons-lang.version>



Mime
View raw message