You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2013/09/28 13:58:03 UTC
svn commit: r1527177 - in /lucene/dev/branches/lucene_solr_4_5: ./ solr/
solr/CHANGES.txt solr/contrib/ solr/contrib/analysis-extras/README.txt
solr/contrib/analysis-extras/build.xml solr/contrib/analysis-extras/ivy.xml
Author: sarowe
Date: Sat Sep 28 11:58:03 2013
New Revision: 1527177
URL: http://svn.apache.org/r1527177
Log:
SOLR-5286: revert changes committed on this issue; the internal and 3rd party dependencies in the analysis-extras contrib are used to put these jars into the Solr distribution. I didn't revert the compile step building the depended-on Lucene modules, since they aren't needed for compilation. I added comments in build.xml and ivy.xml telling people not to do this again. I reworded the README.txt to explain dependencies per feature instead of lumping them all together. I did not revert the pom.xml.template changes, since the dependencies are not required for compilation or runtime use of the code in the analysis-extras contrib. (merged trunk r1527175)
Modified:
lucene/dev/branches/lucene_solr_4_5/ (props changed)
lucene/dev/branches/lucene_solr_4_5/solr/ (props changed)
lucene/dev/branches/lucene_solr_4_5/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene_solr_4_5/solr/contrib/ (props changed)
lucene/dev/branches/lucene_solr_4_5/solr/contrib/analysis-extras/README.txt
lucene/dev/branches/lucene_solr_4_5/solr/contrib/analysis-extras/build.xml
lucene/dev/branches/lucene_solr_4_5/solr/contrib/analysis-extras/ivy.xml
Modified: lucene/dev/branches/lucene_solr_4_5/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_5/solr/CHANGES.txt?rev=1527177&r1=1527176&r2=1527177&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_5/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_5/solr/CHANGES.txt Sat Sep 28 11:58:03 2013
@@ -260,9 +260,6 @@ Other Changes
* SOLR-5173: Solr-core's Maven configuration includes test-only Hadoop
dependencies as indirect compile-time dependencies.
(Chris Collins, Steve Rowe)
-
-* SOLR-5286: Remove vestigial Chinese and Polish analysis jars from the
- analysis-extras contrib configuration. (Steve Rowe)
================== 4.4.0 ==================
Modified: lucene/dev/branches/lucene_solr_4_5/solr/contrib/analysis-extras/README.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_5/solr/contrib/analysis-extras/README.txt?rev=1527177&r1=1527176&r2=1527177&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_5/solr/contrib/analysis-extras/README.txt (original)
+++ lucene/dev/branches/lucene_solr_4_5/solr/contrib/analysis-extras/README.txt Sat Sep 28 11:58:03 2013
@@ -1,13 +1,16 @@
The analysis-extras plugin provides additional analyzers that rely
upon large dependencies/dictionaries.
-It includes integration with ICU for multilingual support.
+It includes integration with ICU for multilingual support, and
+analyzers for Chinese and Polish.
-Relies upon the following lucene component (in lucene-libs/):
+ICU relies upon lucene-libs/lucene-analyzers-icu-X.Y.jar
+and lib/icu4j-X.Y.jar
- * lucene-analyzers-icu-X.Y.jar
+Smartcn relies upon lucene-libs/lucene-analyzers-smartcn-X.Y.jar
-And the following third-party library (in lib/):
+Stempel relies on lucene-libs/lucene-analyzers-stempel-X.Y.jar
- * icu4j-X.Y.jar
+Morfologik relies on lucene-libs/lucene-analyzers-morfologik-X.Y.jar
+and lib/morfologik-*.jar
Modified: lucene/dev/branches/lucene_solr_4_5/solr/contrib/analysis-extras/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_5/solr/contrib/analysis-extras/build.xml?rev=1527177&r1=1527176&r2=1527177&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_5/solr/contrib/analysis-extras/build.xml (original)
+++ lucene/dev/branches/lucene_solr_4_5/solr/contrib/analysis-extras/build.xml Sat Sep 28 11:58:03 2013
@@ -27,6 +27,14 @@
<path id="analysis.extras.lucene.libs">
<pathelement location="${analyzers-icu.jar}"/>
+ <!--
+ Although the smartcn, stempel, and morfologik jars are not dependencies of
+ code in the analysis-extras contrib, they must remain here in order to
+ populate the Solr distribution
+ -->
+ <pathelement location="${analyzers-smartcn.jar}"/>
+ <pathelement location="${analyzers-stempel.jar}"/>
+ <pathelement location="${analyzers-morfologik.jar}"/>
</path>
<path id="classpath">
@@ -35,7 +43,14 @@
<path refid="solr.base.classpath"/>
</path>
- <target name="module-jars-to-solr" depends="jar-analyzers-icu">
+
+ <!--
+ Although the smartcn, stempel, and morfologik jars are not dependencies of
+ code in the analysis-extras contrib, they must remain here in order to
+ populate the Solr distribution
+ -->
+ <target name="module-jars-to-solr"
+ depends="jar-analyzers-icu, jar-analyzers-smartcn, jar-analyzers-stempel, jar-analyzers-morfologik">
<mkdir dir="${build.dir}/lucene-libs"/>
<copy todir="${build.dir}/lucene-libs" preservelastmodified="true" flatten="true" failonerror="true" overwrite="true">
<path refid="analysis.extras.lucene.libs" />
Modified: lucene/dev/branches/lucene_solr_4_5/solr/contrib/analysis-extras/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_5/solr/contrib/analysis-extras/ivy.xml?rev=1527177&r1=1527176&r2=1527177&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_5/solr/contrib/analysis-extras/ivy.xml (original)
+++ lucene/dev/branches/lucene_solr_4_5/solr/contrib/analysis-extras/ivy.xml Sat Sep 28 11:58:03 2013
@@ -20,6 +20,14 @@
<info organisation="org.apache.solr" module="analysis-extras"/>
<dependencies>
<dependency org="com.ibm.icu" name="icu4j" rev="49.1" transitive="false"/>
+ <!--
+ Although the 3rd party morfologik jars are not dependencies of code in
+ the analysis-extras contrib, they must remain here in order to
+ populate the Solr distribution
+ -->
+ <dependency org="org.carrot2" name="morfologik-polish" rev="1.7.1" transitive="false"/>
+ <dependency org="org.carrot2" name="morfologik-fsa" rev="1.7.1" transitive="false"/>
+ <dependency org="org.carrot2" name="morfologik-stemming" rev="1.7.1" transitive="false"/>
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>