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.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1527175 13f79535-47bb-0310-9956-ffa450edef68

solr/CHANGES.txt

@@ -343,9 +343,6 @@ Other Changes
   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 ==================
 
 Versions of Major Components

solr/contrib/analysis-extras/README.txt

@@ -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
  

solr/contrib/analysis-extras/build.xml

@@ -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" />

solr/contrib/analysis-extras/ivy.xml

@@ -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>