Skip to content

Commit

Permalink
Remove refs to solr (#780)
Browse files Browse the repository at this point in the history
* Remove refs to solr
* Stop excluding woodstox-core-lgpl
* Remove audit.ignore for solr
seanf authored Jul 23, 2018

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent 0cda5a3 commit ed661a2
Showing 6 changed files with 0 additions and 158 deletions.
3 changes: 0 additions & 3 deletions parent/pom.xml
Original file line number Diff line number Diff line change
@@ -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,
12 changes: 0 additions & 12 deletions server/functional-test/pom.xml
Original file line number Diff line number Diff line change
@@ -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>
99 changes: 0 additions & 99 deletions server/pom.xml
Original file line number Diff line number Diff line change
@@ -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>
19 changes: 0 additions & 19 deletions server/services/pom.xml
Original file line number Diff line number Diff line change
@@ -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>
6 changes: 0 additions & 6 deletions server/zanata-model/pom.xml
Original file line number Diff line number Diff line change
@@ -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>
19 changes: 0 additions & 19 deletions server/zanata-war/pom.xml
Original file line number Diff line number Diff line change
@@ -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>

0 comments on commit ed661a2

Please sign in to comment.