remove duplicate solrj dependency and update indexer

Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/979f4a73
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/979f4a73
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/979f4a73

Branch: refs/heads/master
Commit: 979f4a739d1410541eb426bbd6d244743b578e96
Parents: ceadfcb
Author: Tom Barber <[email protected]>
Authored: Wed Jul 26 13:43:52 2017 +0100
Committer: Tom Barber <[email protected]>
Committed: Wed Jul 26 13:43:52 2017 +0100

----------------------------------------------------------------------
 core/pom.xml                                                    | 5 -----
 .../java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java     | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/oodt/blob/979f4a73/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 2565703..cbb6195 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -70,11 +70,6 @@ the License.
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.apache.solr</groupId>
-        <artifactId>solr-solrj</artifactId>
-        <version>1.3.0</version>
-      </dependency>
-      <dependency>
         <groupId>com.amazonaws</groupId>
         <artifactId>aws-java-sdk</artifactId>
         <version>1.7.4</version>

http://git-wip-us.apache.org/repos/asf/oodt/blob/979f4a73/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java
----------------------------------------------------------------------
diff --git 
a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java 
b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java
index 44ee93a..6d453bd 100755
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java
@@ -133,7 +133,7 @@ public class SolrIndexer {
 
                LOG.info("Using Solr: " + this.solrUrl + " FileManager: " + 
this.fmUrl);
                SystemDefaultHttpClient httpClient = new 
SystemDefaultHttpClient();
-               server = new HttpSolrClient(this.solrUrl, httpClient);
+               server = new HttpSolrClient.Builder(this.solrUrl).build();
 
 //             server = new SolrClient(this.solrUrl);
 

Reply via email to