SOLR-4106: Javac/ ivy path warnings with morfologik fixed by updating to Morfologik 1.5.5 (no functional changes).

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1428823 13f79535-47bb-0310-9956-ffa450edef68
2013-01-04 12:42:00 +00:00 · 2013-01-04 12:42:00 +00:00 · 0d05a14bd6
parent 7e57636e39
commit 0d05a14bd6
16 changed files with 16 additions and 13 deletions
--- a/dev-tools/maven/pom.xml.template
+++ b/dev-tools/maven/pom.xml.template
@ -353,7 +353,7 @@
      <dependency>
        <groupId>org.carrot2</groupId>
        <artifactId>morfologik-polish</artifactId>
-        <version>1.5.3</version>
+        <version>1.5.5</version>
      </dependency>
      <dependency>
        <groupId>org.codehaus.woodstox</groupId>
--- a/lucene/analysis/morfologik/ivy.xml
+++ b/lucene/analysis/morfologik/ivy.xml
@ -19,9 +19,9 @@
 <ivy-module version="2.0">
    <info organisation="org.apache.lucene" module="analyzers-morfologik"/>
    <dependencies>
-      <dependency org="org.carrot2" name="morfologik-polish" rev="1.5.3" transitive="false"/>
-      <dependency org="org.carrot2" name="morfologik-fsa" rev="1.5.3" transitive="false"/>
-      <dependency org="org.carrot2" name="morfologik-stemming" rev="1.5.3" transitive="false"/>
+      <dependency org="org.carrot2" name="morfologik-polish" rev="1.5.5" transitive="false"/>
+      <dependency org="org.carrot2" name="morfologik-fsa" rev="1.5.5" transitive="false"/>
+      <dependency org="org.carrot2" name="morfologik-stemming" rev="1.5.5" transitive="false"/>
      <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/> 
    </dependencies>
 </ivy-module>
--- a/lucene/licenses/morfologik-fsa-1.5.3.jar.sha1
+++ b/lucene/licenses/morfologik-fsa-1.5.3.jar.sha1
@ -1 +0,0 @@
-d1f729cd3019e6d86485226202f84458141a5688
--- a/lucene/licenses/morfologik-fsa-1.5.5.jar.sha1
+++ b/lucene/licenses/morfologik-fsa-1.5.5.jar.sha1
@ -0,0 +1 @@
+7965a39db114f7c404b71d38bc7f0e6a332c4e73
--- a/lucene/licenses/morfologik-polish-1.5.3.jar.sha1
+++ b/lucene/licenses/morfologik-polish-1.5.3.jar.sha1
@ -1 +0,0 @@
-8217b6f7ad018ceda0e824b2e60340000da4397a
--- a/lucene/licenses/morfologik-polish-1.5.5.jar.sha1
+++ b/lucene/licenses/morfologik-polish-1.5.5.jar.sha1
@ -0,0 +1 @@
+b4a3a9746cab8b2c99c33d2ceeda2ece3f8d8ef2
--- a/lucene/licenses/morfologik-stemming-1.5.3.jar.sha1
+++ b/lucene/licenses/morfologik-stemming-1.5.3.jar.sha1
@ -1 +0,0 @@
-c4ead57b78fa71b00553ff21da6fb5a326e914e8
--- a/lucene/licenses/morfologik-stemming-1.5.5.jar.sha1
+++ b/lucene/licenses/morfologik-stemming-1.5.5.jar.sha1
@ -0,0 +1 @@
+e5dc913adeba3b89539cd5f82e5b88d136a1d85b
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@ -442,6 +442,9 @@ Bug Fixes
 Other Changes
 ----------------------

+* SOLR-4106: Javac/ ivy path warnings with morfologik fixed by
+  upgrading to Morfologik 1.5.5 (Robert Muir, Dawid Weiss)
+
 * SOLR-3899: SolrCore should not log at warning level when the index directory
  changes - it's an info event. (Tobias Bergman, Mark Miller)

--- a/solr/contrib/analysis-extras/ivy.xml
+++ b/solr/contrib/analysis-extras/ivy.xml
@ -20,9 +20,9 @@
    <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.5.3" transitive="false"/>
-      <dependency org="org.carrot2" name="morfologik-fsa" rev="1.5.3" transitive="false"/>
-      <dependency org="org.carrot2" name="morfologik-stemming" rev="1.5.3" transitive="false"/>
+      <dependency org="org.carrot2" name="morfologik-polish" rev="1.5.5" transitive="false"/>
+      <dependency org="org.carrot2" name="morfologik-fsa" rev="1.5.5" transitive="false"/>
+      <dependency org="org.carrot2" name="morfologik-stemming" rev="1.5.5" transitive="false"/>
      <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/> 
    </dependencies>
 </ivy-module>
--- a/solr/licenses/morfologik-fsa-1.5.3.jar.sha1
+++ b/solr/licenses/morfologik-fsa-1.5.3.jar.sha1
@ -1 +0,0 @@
-d1f729cd3019e6d86485226202f84458141a5688
--- a/solr/licenses/morfologik-fsa-1.5.5.jar.sha1
+++ b/solr/licenses/morfologik-fsa-1.5.5.jar.sha1
@ -0,0 +1 @@
+7965a39db114f7c404b71d38bc7f0e6a332c4e73
--- a/solr/licenses/morfologik-polish-1.5.3.jar.sha1
+++ b/solr/licenses/morfologik-polish-1.5.3.jar.sha1
@ -1 +0,0 @@
-8217b6f7ad018ceda0e824b2e60340000da4397a
--- a/solr/licenses/morfologik-polish-1.5.5.jar.sha1
+++ b/solr/licenses/morfologik-polish-1.5.5.jar.sha1
@ -0,0 +1 @@
+b4a3a9746cab8b2c99c33d2ceeda2ece3f8d8ef2
--- a/solr/licenses/morfologik-stemming-1.5.3.jar.sha1
+++ b/solr/licenses/morfologik-stemming-1.5.3.jar.sha1
@ -1 +0,0 @@
-c4ead57b78fa71b00553ff21da6fb5a326e914e8
--- a/solr/licenses/morfologik-stemming-1.5.5.jar.sha1
+++ b/solr/licenses/morfologik-stemming-1.5.5.jar.sha1
@ -0,0 +1 @@
+e5dc913adeba3b89539cd5f82e5b88d136a1d85b