fix merge
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/d833d1a2 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/d833d1a2 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/d833d1a2 Branch: refs/heads/development Commit: d833d1a2297ecf2781d788e01f954f1554e3514d Parents: f41853f Author: Tom Barber <[email protected]> Authored: Wed Jul 26 13:43:52 2017 +0100 Committer: Tom Barber <[email protected]> Committed: Wed Jul 26 23:18:22 2017 +0100 ---------------------------------------------------------------------- core/pom.xml | 5 ----- .../java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/d833d1a2/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index b4ab161..9ddeb67 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/d833d1a2/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 20ed97f..16ca7f1 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,6 +133,7 @@ public class SolrIndexer { LOG.info("Using Solr: " + this.solrUrl + " FileManager: " + this.fmUrl); + try { server = new CommonsHttpSolrServer(this.solrUrl); } catch (MalformedURLException e) {
