From ed661a276457196c7ebee91fe3075c2c77e8baf9 Mon Sep 17 00:00:00 2001
From: Sean Flanigan <sflaniga@redhat.com>
Date: Mon, 23 Jul 2018 15:24:36 +1000
Subject: [PATCH] Remove refs to solr (#780)

* Remove refs to solr
* Stop excluding woodstox-core-lgpl
* Remove audit.ignore for solr
---
 parent/pom.xml                 |  3 --
 server/functional-test/pom.xml | 12 -----
 server/pom.xml                 | 99 ----------------------------------
 server/services/pom.xml        | 19 -------
 server/zanata-model/pom.xml    |  6 ---
 server/zanata-war/pom.xml      | 19 -------
 6 files changed, 158 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 3eb3227b93..ef18d010ca 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1006,13 +1006,10 @@
         <audit.quiet>true</audit.quiet>
 
         <!-- TODO ignore by ID, not GAV (need https://github.com/OSSIndex/ossindex-maven-plugin/pull/20) -->
-        <!-- solr: ignore https://ossindex.net/resource/cve/8404719967 since we don't cluster solr -->
         <!-- wildfly: due to https://github.com/OSSIndex/ossindex-maven-plugin/issues/19 -->
         <!-- picketlink*, jgroups: because we use the app server's version (scope=provided)-->
         <!-- ognl is test only (via concordion) -->
         <audit.ignore>
-          org.apache.solr:solr-core:5.3.1,
-          org.apache.solr:solr-solrj:5.3.1,
           org.wildfly.core:wildfly-server:2.0.10.Final,
           org.jgroups:jgroups,
           org.picketlink:picketlink-common,
diff --git a/server/functional-test/pom.xml b/server/functional-test/pom.xml
index f1fe7bce96..b41977d87b 100644
--- a/server/functional-test/pom.xml
+++ b/server/functional-test/pom.xml
@@ -135,10 +135,6 @@
           <groupId>xerces</groupId>
           <artifactId>xercesImpl</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>org.apache.solr</groupId>
-          <artifactId>solr-core</artifactId>
-        </exclusion>
       </exclusions>
     </dependency>
 
@@ -149,14 +145,6 @@
       <classifier>tests</classifier>
       <scope>test</scope>
       <exclusions>
-        <exclusion>
-          <groupId>org.apache.solr</groupId>
-          <artifactId>solr-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.solr</groupId>
-          <artifactId>solr-solrj</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>org.apache.httpcomponents</groupId>
           <artifactId>httpclient</artifactId>
diff --git a/server/pom.xml b/server/pom.xml
index 5d126c8aa9..5f4a0d6018 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -55,7 +55,6 @@
     <commonmark.spec.version>18.0</commonmark.spec.version>
     -->
 
-    <solr.version>${lucene.version}</solr.version>
     <seam.version>2.3.1.Final</seam.version>
     <slf4j.version>1.7.25</slf4j.version>
     <gwteventservice.version>1.2.1</gwteventservice.version>
@@ -1622,104 +1621,6 @@
         <version>${lucene.version}</version>
       </dependency>
 
-      <!-- Solr dependencies -->
-      <dependency>
-        <groupId>org.apache.solr</groupId>
-        <artifactId>solr-core</artifactId>
-        <version>${solr.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>*</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.restlet.jee</groupId>
-            <artifactId>*</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.restlet.jee</groupId>
-            <artifactId>org.restlet</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.restlet.jee</groupId>
-            <artifactId>org.restlet.ext.servlet</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>net.java.dev.stax-utils</groupId>
-            <artifactId>stax-utils</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-io</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>*</artifactId>
-          </exclusion>
-
-          <exclusion>
-            <groupId>org.apache.solr</groupId>
-            <artifactId>solr-lucene-analyzers</artifactId>
-          </exclusion>
-          <!-- NB: https://hibernate.atlassian.net/browse/HSEARCH-380 -->
-          <exclusion>
-            <groupId>org.apache.solr</groupId>
-            <artifactId>solr-lucene-core</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.apache.solr</groupId>
-            <artifactId>solr-solrj</artifactId>
-          </exclusion>
-          <exclusion>
-            <artifactId>servlet-api</artifactId>
-            <groupId>javax.servlet</groupId>
-          </exclusion>
-          <exclusion>
-            <groupId>woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.solr</groupId>
-        <artifactId>solr-solrj</artifactId>
-        <version>${solr.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.solr</groupId>
-        <artifactId>solr-analysis-extras</artifactId>
-        <version>${solr.version}</version>
-      </dependency>
       <dependency>
         <groupId>net.customware.gwt.presenter</groupId>
         <artifactId>gwt-presenter</artifactId>
diff --git a/server/services/pom.xml b/server/services/pom.xml
index 638c172b96..fe5e577f3c 100644
--- a/server/services/pom.xml
+++ b/server/services/pom.xml
@@ -111,9 +111,6 @@
             <!-- Used for StringUtils lib -->
             <!-- Needed by ui rendering at runtime -->
             <usedDependency>javax.servlet.jsp:jsp-api</usedDependency>
-            <!-- Used for different content analyzers based on langugage for search. -->
-            <usedDependency>org.apache.solr:solr-core</usedDependency>
-            <usedDependency>org.apache.solr:solr-solrj</usedDependency>
             <!-- Used for unit tests via persistence.xml
                  (org.hibernate.testing.cache.CachingRegionFactory) -->
             <usedDependency>org.hibernate:hibernate-testing</usedDependency>
@@ -733,12 +730,6 @@
     <dependency>
       <groupId>net.sf.okapi.filters</groupId>
       <artifactId>okapi-filter-ts</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.codehaus.woodstox</groupId>
-          <artifactId>woodstox-core-lgpl</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>net.sf.okapi</groupId>
@@ -880,16 +871,6 @@
       </exclusions>
     </dependency>
 
-    <!-- Solr dependencies -->
-    <dependency>
-      <groupId>org.apache.solr</groupId>
-      <artifactId>solr-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.solr</groupId>
-      <artifactId>solr-solrj</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-search-orm</artifactId>
diff --git a/server/zanata-model/pom.xml b/server/zanata-model/pom.xml
index b652d18992..09a97d99ef 100644
--- a/server/zanata-model/pom.xml
+++ b/server/zanata-model/pom.xml
@@ -182,12 +182,6 @@
       <artifactId>lucene-core</artifactId>
     </dependency>
 
-    <!-- Solr -->
-    <dependency>
-      <groupId>org.apache.solr</groupId>
-      <artifactId>solr-core</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.codehaus.jackson</groupId>
       <artifactId>jackson-mapper-asl</artifactId>
diff --git a/server/zanata-war/pom.xml b/server/zanata-war/pom.xml
index 7d73351c17..6b915c87c6 100644
--- a/server/zanata-war/pom.xml
+++ b/server/zanata-war/pom.xml
@@ -118,9 +118,6 @@
             <!-- Used for StringUtils lib -->
             <!-- Needed by ui rendering at runtime -->
             <usedDependency>javax.servlet.jsp:jsp-api</usedDependency>
-            <!-- Used for different content analyzers based on langugage for search. -->
-            <usedDependency>org.apache.solr:solr-core</usedDependency>
-            <usedDependency>org.apache.solr:solr-solrj</usedDependency>
             <!-- Used for unit tests via persistence.xml
                  (org.hibernate.testing.cache.CachingRegionFactory) -->
             <usedDependency>org.hibernate:hibernate-testing</usedDependency>
@@ -1125,12 +1122,6 @@
       <dependency>
         <groupId>net.sf.okapi.filters</groupId>
         <artifactId>okapi-filter-ts</artifactId>
-        <exclusions>
-          <exclusion>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>woodstox-core-lgpl</artifactId>
-          </exclusion>
-        </exclusions>
       </dependency>
     <dependency>
       <groupId>net.sf.okapi</groupId>
@@ -1261,16 +1252,6 @@
       </exclusions>
     </dependency>
 
-    <!-- Solr dependencies -->
-    <dependency>
-      <groupId>org.apache.solr</groupId>
-      <artifactId>solr-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.solr</groupId>
-      <artifactId>solr-solrj</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-search-orm</artifactId>