From f20c9a19d7b37cab9b11ef1950114450da91cf84 Mon Sep 17 00:00:00 2001
From: Steven Rowe <sarowe@apache.org>
Date: Sat, 28 Sep 2013 08:56:20 +0000
Subject: [PATCH] SOLR-5286: Remove vestigial Chinese and Polish analysis jars
 from the analysis-extras contrib configuration

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1527168 13f79535-47bb-0310-9956-ffa450edef68
---
 .../solr/contrib/analysis-extras/pom.xml.template      | 10 ----------
 solr/CHANGES.txt                                       |  3 +++
 solr/contrib/analysis-extras/README.txt                | 10 ++--------
 solr/contrib/analysis-extras/build.xml                 |  8 ++------
 solr/contrib/analysis-extras/ivy.xml                   |  3 ---
 5 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template b/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template
index 86864e23f3f..6c4584e8ecf 100644
--- a/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template
+++ b/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template
@@ -67,16 +67,6 @@
       <artifactId>lucene-analyzers-icu</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-analyzers-smartcn</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-analyzers-stempel</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <!-- SOLR-3263: Test scope dep is required to avoid jar signing conflicts -->
       <groupId>javax.servlet</groupId>
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 2e70367986a..fa260479c02 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -342,6 +342,9 @@ 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 ==================
 
diff --git a/solr/contrib/analysis-extras/README.txt b/solr/contrib/analysis-extras/README.txt
index c7cfbc37f60..7f80e47fdbc 100644
--- a/solr/contrib/analysis-extras/README.txt
+++ b/solr/contrib/analysis-extras/README.txt
@@ -1,19 +1,13 @@
 The analysis-extras plugin provides additional analyzers that rely
 upon large dependencies/dictionaries.
 
-It includes integration with ICU for multilingual support, and 
-analyzers for Chinese and Polish.
+It includes integration with ICU for multilingual support.
 
-Relies upon the following lucene components (in lucene-libs/):
+Relies upon the following lucene component (in lucene-libs/):
 
  * lucene-analyzers-icu-X.Y.jar
- * lucene-analyzers-smartcn-X.Y.jar
- * lucene-analyzers-stempel-X.Y.jar
- * lucene-analyzers-morfologik-X.Y.jar
- * lucene-analyzers-smartcn-X.Y.jar
 
 And the following third-party library (in lib/):
 
  * icu4j-X.Y.jar
- * morfologik-*.jar
  
diff --git a/solr/contrib/analysis-extras/build.xml b/solr/contrib/analysis-extras/build.xml
index 398b7201ea6..379e360bf40 100644
--- a/solr/contrib/analysis-extras/build.xml
+++ b/solr/contrib/analysis-extras/build.xml
@@ -27,9 +27,6 @@
   
   <path id="analysis.extras.lucene.libs">
     <pathelement location="${analyzers-icu.jar}"/>
-    <pathelement location="${analyzers-smartcn.jar}"/>
-    <pathelement location="${analyzers-stempel.jar}"/>
-    <pathelement location="${analyzers-morfologik.jar}"/>
   </path>
 
   <path id="classpath">
@@ -38,14 +35,13 @@
     <path refid="solr.base.classpath"/>
   </path>
 
-  <target name="module-jars-to-solr"
-          depends="jar-analyzers-icu, jar-analyzers-smartcn, jar-analyzers-stempel, jar-analyzers-morfologik">
+  <target name="module-jars-to-solr" depends="jar-analyzers-icu">
     <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" />
     </copy>
   </target>
 
-  <target name="compile-core" depends="jar-analyzers-icu, jar-analyzers-smartcn, jar-analyzers-stempel, jar-analyzers-morfologik, solr-contrib-build.compile-core"/>
+  <target name="compile-core" depends="jar-analyzers-icu, solr-contrib-build.compile-core"/>
   <target name="dist" depends="module-jars-to-solr, common-solr.dist"/>
 </project>
diff --git a/solr/contrib/analysis-extras/ivy.xml b/solr/contrib/analysis-extras/ivy.xml
index b8a1bfb7e36..a1afdb027da 100644
--- a/solr/contrib/analysis-extras/ivy.xml
+++ b/solr/contrib/analysis-extras/ivy.xml
@@ -20,9 +20,6 @@
     <info organisation="org.apache.solr" module="analysis-extras"/>
     <dependencies>
       <dependency org="com.ibm.icu" name="icu4j" rev="49.1" transitive="false"/>
-      <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>