You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by rw...@apache.org on 2012/10/27 12:00:19 UTC
svn commit: r1402773 - in /stanbol/trunk: commons/solr/core/
commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/
enhancer/engines/metaxa/ entityhub/indexing/destination/solryard/
entityhub/indexing/destination/solryard/src/test/resources/t...
Author: rwesten
Date: Sat Oct 27 10:00:18 2012
New Revision: 1402773
URL: http://svn.apache.org/viewvc?rev=1402773&view=rev
Log:
Upgrade form Solr/Lucene 3.2 to version 3.6.1 (STANOL-790). For details about the necessary changes see comment on STANBOL-790. This only lists the dependency/version changes.
## Dependency Upgrades in the Parent POM
* commons-beanutils:commons-beanutils:1.7.0 to 1.8.3
* via org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-beanutils:1.8.3_1
* removal of commons-httpclient:commons-httpclient:3.1 from the parent pom. Modules that still need httpcomponents < 4.+ need to manage those within there modules
* all org.apache.httpcomponents from version 4.2 to 4.2.1
* Apache Lucene/Solr from version 3.2 to 3.6.1
* addition of lucene-phonetic
* Downgrade from jakarta-regexp:jakarta-regexp:1.4 to version 1.3 because version 1.3 is available as OSGI bundle via org.apache.servicemix.bundles:org.apache.servicemix.bundles.regexp:1.3_3
* stax-api is now provided by org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.0:2.1.0
* org.codehaus.woodstox:wstx-asl:3.2.7 upgraded to 3.2.9 and provided via org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox:3.2.9_3
## Added Bundles to the stanbolcommons bundlelist
Users that use custom Stanbol Launcher configurations (esp. if the stanbolcommons bundlelist is not included) will need to adapt their configuration accordingly.
<bundle> <!-- commons-beanutils as bundle provided by servicemix.apache.org -->
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.commons-beanutils</artifactId>
<version>1.8.3_1</version>
</bundle>
<bundle>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient-osgi</artifactId>
<version>4.2.1</version>
</bundle>
<bundle><!-- Stax parser as bundle provided by servicemix.apache.org -->
<groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
<version>2.1.0</version>
</bundle>
<bundle> <!-- woodstox Stax impl as bundle provided by servicemix.apache.org -->
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
<version>3.2.9_3</version>
</bundle>
<bundle> <!-- jarkata regexp as bundle provided by servicemix.apache.org -->
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.regexp</artifactId>
<version>1.3_3</version>
</bundle>
Modified:
stanbol/trunk/commons/solr/core/pom.xml
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java
stanbol/trunk/enhancer/engines/metaxa/pom.xml
stanbol/trunk/entityhub/indexing/destination/solryard/pom.xml
stanbol/trunk/entityhub/indexing/destination/solryard/src/test/resources/testConfigs/withSolrConf/indexing/config/simple/conf/schema.xml
stanbol/trunk/entityhub/yard/solr/src/main/resources/solr/core/default.solrindex.zip
stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
stanbol/trunk/parent/pom.xml
Modified: stanbol/trunk/commons/solr/core/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/core/pom.xml?rev=1402773&r1=1402772&r2=1402773&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/core/pom.xml (original)
+++ stanbol/trunk/commons/solr/core/pom.xml Sat Oct 27 10:00:18 2012
@@ -118,11 +118,10 @@
!org.apache.oro.*,
!org.apache.lucene.analysis.cn.smart.*,
!org.apache.lucene.analysis.pl.*,
+ !org.apache.lucene.analysis.ja.*,
!org.apache.lucene.analysis.stempel.*,
+ !org.apache.lucene.search.grouping.*,
!org.egothor.stemmer.*,
- !org.w3c.dom.html,
- !org.w3c.dom.*,
- !org.xml.sax.*,
org.apache.stanbol.commons.solr,
org.apache.stanbol.commons.solr.utils,
org.apache.solr.client.solrj,
@@ -150,16 +149,11 @@
*
</Import-Package>
<Embed-Dependency>
- solr-solrj, solr-core, solr-noggit, solr-dataimporthandler,
- solr-analysis-extras,
+ solr-solrj, solr-core, solr-dataimporthandler,
+ solr-analysis-extras, commons-httpclient,
lucene-core, lucene-analyzers, lucene-highlighter, lucene-memory,
lucene-spatial, lucene-spellchecker, lucene-misc, lucene-queries,
- lucene-icu, icu4j,
- xalan, lucene-xercesImpl, serializer, xml-apis,
- commons-codec, commons-httpclient, commons-beanutils,
- solr-commons-csv, commons-collections, commons-fileupload,
- commons-io, commons-lang,
- stax-api,wstx-asl, jakarta-regexp, xml-resolver, portlet-api,
+ lucene-icu, lucene-phonetic,
velocity, velocity-tools
</Embed-Dependency>
</instructions>
@@ -185,14 +179,11 @@
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
</dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-xercesImpl</artifactId>
- </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ </dependency>
<!-- Solr/Lucene dependencies (needed for using embedded Solr servers) -->
<dependency>
@@ -203,18 +194,6 @@
<groupId>org.apache.solr</groupId>
<artifactId>solr-dataimporthandler</artifactId>
</dependency>
- <!-- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-dataimporthandler-extras</artifactId>
- </dependency> -->
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-noggit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-commons-csv</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-analysis-extras</artifactId>
@@ -256,18 +235,12 @@
<artifactId>lucene-icu</artifactId>
</dependency>
<dependency>
- <groupId>com.ibm.icu</groupId>
- <artifactId>icu4j</artifactId>
- </dependency>
-
- <!-- additional Solr Dependencies -->
- <dependency>
- <groupId>jakarta-regexp</groupId>
- <artifactId>jakarta-regexp</artifactId>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-phonetic</artifactId>
</dependency>
<dependency>
- <groupId>javax.portlet</groupId>
- <artifactId>portlet-api</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.regexp</artifactId>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
@@ -286,49 +259,37 @@
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-beanutils</artifactId>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>
<dependency>
- <groupId>xml-resolver</groupId>
- <artifactId>xml-resolver</artifactId>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- </dependency>
-<!-- Lucene comes with an own Xerces version and Solr uses xPath. This results
- in the usage of the Xalan version of Java with the Xerxes version of lucene.
- If this is a problem we need also to provide xalan and a compatible version
- of the xml-apis -->
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.7.1</version>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
</dependency>
<dependency>
- <groupId>xalan</groupId>
- <artifactId>serializer</artifactId>
- <version>2.7.1</version>
- </dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.3.04</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
</dependency>
+<!-- NOTE: With Solr/Lucene 3.6.1 there is no longer a Lucene specific
+ Xerces. Because of that we can use the XML stuff exported by the
+ System Bundle from the JDK-->
<!-- The Solr-Core depends on the Servlet API and in case of running an
- EmbeddedSolrServer the servlet-api is not available -->
+ EmbeddedSolrServer the servlet-api is not available.
+ However this bundle assumes that servlet-api and portlet-api are
+ provided-->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- Solr has support of velocity templating (respone writer). This is not
Modified: stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java?rev=1402773&r1=1402772&r2=1402773&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java (original)
+++ stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java Sat Oct 27 10:00:18 2012
@@ -120,7 +120,7 @@ public class SolrServerAdapter {
private final CloseHook closeHook = new CloseHook() {
@Override
- public void close(SolrCore core) {
+ public void preClose(SolrCore core) {
Collection<String> names = server.getCoreNames(core);
if(names != null){
synchronized (registrations) {
@@ -143,6 +143,11 @@ public class SolrServerAdapter {
//update the OSGI service for the CoreContainer
updateServerRegistration();
}
+
+ @Override
+ public void postClose(SolrCore core) {
+ //nothing to do
+ }
};
/**
* Creates and Initialise a Solr {@link CoreContainer} based on the provided
@@ -180,6 +185,10 @@ public class SolrServerAdapter {
File solrCof = new File(solrDir,parsedServerProperties.getSolrXml());
ClassLoader classLoader = updateContextClassLoader();
try {
+ log.info(">> +++++++++++++++++++++++");
+ XPathFactory.newInstance();
+ log.info(">> {}",org.xml.sax.InputSource.class.getClassLoader());
+ log.info(">> +++++++++++++++++++++++");
container.load(solrDir.getAbsolutePath(), solrCof);
} finally {
Thread.currentThread().setContextClassLoader(classLoader);
Modified: stanbol/trunk/enhancer/engines/metaxa/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/engines/metaxa/pom.xml?rev=1402773&r1=1402772&r2=1402773&view=diff
==============================================================================
--- stanbol/trunk/enhancer/engines/metaxa/pom.xml (original)
+++ stanbol/trunk/enhancer/engines/metaxa/pom.xml Sat Oct 27 10:00:18 2012
@@ -173,6 +173,7 @@
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
</dependency>
<dependency>
Modified: stanbol/trunk/entityhub/indexing/destination/solryard/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/indexing/destination/solryard/pom.xml?rev=1402773&r1=1402772&r2=1402773&view=diff
==============================================================================
--- stanbol/trunk/entityhub/indexing/destination/solryard/pom.xml (original)
+++ stanbol/trunk/entityhub/indexing/destination/solryard/pom.xml Sat Oct 27 10:00:18 2012
@@ -104,7 +104,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.solr.core</artifactId>
- <version>0.9.0-incubating</version>
+ <version>0.10.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
Modified: stanbol/trunk/entityhub/indexing/destination/solryard/src/test/resources/testConfigs/withSolrConf/indexing/config/simple/conf/schema.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/indexing/destination/solryard/src/test/resources/testConfigs/withSolrConf/indexing/config/simple/conf/schema.xml?rev=1402773&r1=1402772&r2=1402773&view=diff
==============================================================================
--- stanbol/trunk/entityhub/indexing/destination/solryard/src/test/resources/testConfigs/withSolrConf/indexing/config/simple/conf/schema.xml (original)
+++ stanbol/trunk/entityhub/indexing/destination/solryard/src/test/resources/testConfigs/withSolrConf/indexing/config/simple/conf/schema.xml Sat Oct 27 10:00:18 2012
@@ -50,7 +50,7 @@
used for ISBN numbers, article numbers, string representations of
unsupported data types ...
-->
- <fieldType name="string" class="solr.StrField" sortMissingLast="true" omitNorms="true"/>
+ <fieldType name="string" class="solr.StrField" sortMissingLast="true" omitNorms="false"/>
<!--
This can be used as alternative to "string" to enable case insensitive
searches on string values.
@@ -66,7 +66,7 @@
<!-- boolean type: "true" or "false" used to store values with the datatype "xsd:boolean" -->
- <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true" omitNorms="true"/>
+ <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true" omitNorms="false"/>
<!--Binary data type. The data should be sent/retrieved in as Base64 encoded Strings.
Currently not used by the SolrYard implementation, but reserved for future use. -->
<fieldtype name="binary" class="solr.BinaryField"/>
@@ -79,11 +79,11 @@
for all numeric fields of that types. See Solr documentation for
suitable values and examples.
-->
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="long" class="solr.TrieLongField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="date" class="solr.TrieDateField" omitNorms="true" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="false" positionIncrementGap="0"/>
+ <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" omitNorms="false" positionIncrementGap="0"/>
+ <fieldType name="long" class="solr.TrieLongField" precisionStep="0" omitNorms="false" positionIncrementGap="0"/>
+ <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" omitNorms="false" positionIncrementGap="0"/>
+ <fieldType name="date" class="solr.TrieDateField" omitNorms="false" precisionStep="0" positionIncrementGap="0"/>
<!--
Numeric and date field types that do activate indexing values at various
@@ -91,11 +91,11 @@
This can be used to activate hierarchival indexing for specific
fields. See Notes within the field section.
-->
- <fieldType name="tint" class="solr.TrieIntField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="tfloat" class="solr.TrieFloatField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="tlong" class="solr.TrieLongField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="tdate" class="solr.TrieDateField" omitNorms="true" precisionStep="6" positionIncrementGap="0"/>
+ <fieldType name="tint" class="solr.TrieIntField" precisionStep="8" omitNorms="false" positionIncrementGap="0"/>
+ <fieldType name="tfloat" class="solr.TrieFloatField" precisionStep="8" omitNorms="false" positionIncrementGap="0"/>
+ <fieldType name="tlong" class="solr.TrieLongField" precisionStep="8" omitNorms="false" positionIncrementGap="0"/>
+ <fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" omitNorms="false" positionIncrementGap="0"/>
+ <fieldType name="tdate" class="solr.TrieDateField" omitNorms="false" precisionStep="6" positionIncrementGap="0"/>
<!--
Natural Language Texts
Modified: stanbol/trunk/entityhub/yard/solr/src/main/resources/solr/core/default.solrindex.zip
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/yard/solr/src/main/resources/solr/core/default.solrindex.zip?rev=1402773&r1=1402772&r2=1402773&view=diff
==============================================================================
Binary files - no diff available.
Modified: stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml?rev=1402773&r1=1402772&r2=1402773&view=diff
==============================================================================
--- stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml (original)
+++ stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml Sat Oct 27 10:00:18 2012
@@ -116,17 +116,41 @@
<artifactId>commons-fileupload</artifactId>
<version>1.2.2</version>
</bundle>
+ <bundle> <!-- commons-beanutils as bundle provided by servicemix.apache.org -->
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-beanutils</artifactId>
+ <version>1.8.3_1</version>
+ </bundle>
<bundle>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore-osgi</artifactId>
- <version>4.2</version>
+ <version>4.2.1</version>
</bundle>
- <bundle> <!-- Bundle for org.json -->
- <!-- this bundle was suggested in the release vote of felix.webconsole 4.0.0 -->
+ <bundle>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-osgi</artifactId>
+ <version>4.2.1</version>
+ </bundle>
+ <bundle> <!-- org.json as bundle provided by geronimo.apache.org-->
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>json</artifactId>
<version>20090211_1</version>
</bundle>
+ <bundle><!-- Stax parser as bundle provided by servicemix.apache.org -->
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
+ <version>2.1.0</version>
+ </bundle>
+ <bundle> <!-- woodstox Stax impl as bundle provided by servicemix.apache.org -->
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
+ <version>3.2.9_3</version>
+ </bundle>
+ <bundle> <!-- jarkata regexp as bundle provided by servicemix.apache.org -->
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.regexp</artifactId>
+ <version>1.3_3</version>
+ </bundle>
<!-- not a bundle (need to be embedded)
<bundle>
<groupId>org.apache.httpcomponents</groupId>
Modified: stanbol/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/parent/pom.xml?rev=1402773&r1=1402772&r2=1402773&view=diff
==============================================================================
--- stanbol/trunk/parent/pom.xml (original)
+++ stanbol/trunk/parent/pom.xml Sat Oct 27 10:00:18 2012
@@ -59,7 +59,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jersey-version>1.12</jersey-version>
<freemarker-version>2.3.19</freemarker-version>
- <solr-version>3.2.0</solr-version>
+ <solr-version>3.6.1</solr-version>
<pax-exam-version>2.3.0.M1</pax-exam-version>
<sourceReleaseAssemblyDescriptor>stanbol-source-release-zip-tar</sourceReleaseAssemblyDescriptor>
</properties>
@@ -667,10 +667,12 @@
<artifactId>commons-io</artifactId>
<version>1.4</version>
</dependency>
+ <!-- As commons-beanutils:commons-beanutils is not bundle we use the
+ org.apache.stanbol.servicemix version instead -->
<dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-beanutils</artifactId>
+ <version>1.8.3_1</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
@@ -709,24 +711,19 @@
<version>1.2.2</version>
</dependency>
<dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient-osgi</artifactId>
- <version>4.2</version>
+ <version>4.2.1</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore-osgi</artifactId>
- <version>4.2</version>
+ <version>4.2.1</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
- <version>4.2</version>
+ <version>4.2.1</version>
</dependency>
<!-- Joda Time -->
@@ -910,28 +907,34 @@
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
<version>${solr-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-core</artifactId>
<version>${solr-version}</version>
- <exclusions>
+ <!-- exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
</exclusion>
- </exclusions>
+ </exclusions -->
</dependency>
- <dependency>
+ <!-- dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-commons-csv</artifactId>
<version>${solr-version}</version>
- </dependency>
- <dependency>
+ </dependency -->
+ <!-- dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-noggit</artifactId>
<version>${solr-version}</version>
- </dependency>
+ </dependency -->
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-dataimporthandler</artifactId>
@@ -995,6 +998,11 @@
<artifactId>lucene-queries</artifactId>
<version>${solr-version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-phonetic</artifactId>
+ <version>${solr-version}</version>
+ </dependency>
<!-- Snowball moved to analyzer in 3.1<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-snowball</artifactId>
@@ -1020,11 +1028,6 @@
<artifactId>icu4j</artifactId>
<version>4.8.1.1</version>
</dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-xercesImpl</artifactId>
- <version>${solr-version}</version>
- </dependency>
<!-- other unused Lucene bundes
<dependency>
<groupId>org.apache.lucene</groupId>
@@ -1046,10 +1049,25 @@
<artifactId>lucene-stempel</artifactId>
<version>${solr-version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-kuromoji</artifactId>
+ <version>${solr-version}</version>
+ </dependency>
-->
<!-- Other Solr/Lucene dependendies -->
<!-- StAX Parser (used by Solr/Lucene) -->
<dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
+ <version>2.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
+ <version>3.2.9_3</version>
+ </dependency>
+ <!-- dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
<version>1.0.1</version>
@@ -1059,11 +1077,11 @@
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
<version>3.2.7</version>
- </dependency>
- <dependency> <!-- required by Solr 3.2 -->
- <groupId>jakarta-regexp</groupId>
- <artifactId>jakarta-regexp</artifactId>
- <version>1.4</version>
+ </dependency -->
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.regexp</artifactId>
+ <version>1.3_3</version>
</dependency>
<dependency> <!-- required by Solr 3.2 -->
<groupId>xml-resolver</groupId>