diff --git a/dev-tools/maven/pom.xml.template b/dev-tools/maven/pom.xml.template
index a9fe5daff02..a1b894f9912 100644
--- a/dev-tools/maven/pom.xml.template
+++ b/dev-tools/maven/pom.xml.template
@@ -353,7 +353,7 @@
org.carrot2
morfologik-polish
- 1.5.3
+ 1.5.5
org.codehaus.woodstox
diff --git a/lucene/analysis/morfologik/ivy.xml b/lucene/analysis/morfologik/ivy.xml
index c5fa7219474..5d93ef3f5dd 100644
--- a/lucene/analysis/morfologik/ivy.xml
+++ b/lucene/analysis/morfologik/ivy.xml
@@ -19,9 +19,9 @@
-
-
-
+
+
+
diff --git a/lucene/licenses/morfologik-fsa-1.5.3.jar.sha1 b/lucene/licenses/morfologik-fsa-1.5.3.jar.sha1
deleted file mode 100644
index 3d3b86d5f8c..00000000000
--- a/lucene/licenses/morfologik-fsa-1.5.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d1f729cd3019e6d86485226202f84458141a5688
diff --git a/lucene/licenses/morfologik-fsa-1.5.5.jar.sha1 b/lucene/licenses/morfologik-fsa-1.5.5.jar.sha1
new file mode 100644
index 00000000000..3a8935a11c7
--- /dev/null
+++ b/lucene/licenses/morfologik-fsa-1.5.5.jar.sha1
@@ -0,0 +1 @@
+7965a39db114f7c404b71d38bc7f0e6a332c4e73
diff --git a/lucene/licenses/morfologik-polish-1.5.3.jar.sha1 b/lucene/licenses/morfologik-polish-1.5.3.jar.sha1
deleted file mode 100644
index 6eb48a47896..00000000000
--- a/lucene/licenses/morfologik-polish-1.5.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8217b6f7ad018ceda0e824b2e60340000da4397a
diff --git a/lucene/licenses/morfologik-polish-1.5.5.jar.sha1 b/lucene/licenses/morfologik-polish-1.5.5.jar.sha1
new file mode 100644
index 00000000000..10c14c0b380
--- /dev/null
+++ b/lucene/licenses/morfologik-polish-1.5.5.jar.sha1
@@ -0,0 +1 @@
+b4a3a9746cab8b2c99c33d2ceeda2ece3f8d8ef2
diff --git a/lucene/licenses/morfologik-stemming-1.5.3.jar.sha1 b/lucene/licenses/morfologik-stemming-1.5.3.jar.sha1
deleted file mode 100644
index c31642be45d..00000000000
--- a/lucene/licenses/morfologik-stemming-1.5.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c4ead57b78fa71b00553ff21da6fb5a326e914e8
diff --git a/lucene/licenses/morfologik-stemming-1.5.5.jar.sha1 b/lucene/licenses/morfologik-stemming-1.5.5.jar.sha1
new file mode 100644
index 00000000000..c9824e4b2a0
--- /dev/null
+++ b/lucene/licenses/morfologik-stemming-1.5.5.jar.sha1
@@ -0,0 +1 @@
+e5dc913adeba3b89539cd5f82e5b88d136a1d85b
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 5ab7a23786c..e40a86d67f5 100644
--- 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)
diff --git a/solr/contrib/analysis-extras/ivy.xml b/solr/contrib/analysis-extras/ivy.xml
index 75a032c0c5b..aee7c746a35 100644
--- a/solr/contrib/analysis-extras/ivy.xml
+++ b/solr/contrib/analysis-extras/ivy.xml
@@ -20,9 +20,9 @@
-
-
-
+
+
+
diff --git a/solr/licenses/morfologik-fsa-1.5.3.jar.sha1 b/solr/licenses/morfologik-fsa-1.5.3.jar.sha1
deleted file mode 100644
index 3d3b86d5f8c..00000000000
--- a/solr/licenses/morfologik-fsa-1.5.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d1f729cd3019e6d86485226202f84458141a5688
diff --git a/solr/licenses/morfologik-fsa-1.5.5.jar.sha1 b/solr/licenses/morfologik-fsa-1.5.5.jar.sha1
new file mode 100644
index 00000000000..3a8935a11c7
--- /dev/null
+++ b/solr/licenses/morfologik-fsa-1.5.5.jar.sha1
@@ -0,0 +1 @@
+7965a39db114f7c404b71d38bc7f0e6a332c4e73
diff --git a/solr/licenses/morfologik-polish-1.5.3.jar.sha1 b/solr/licenses/morfologik-polish-1.5.3.jar.sha1
deleted file mode 100644
index 6eb48a47896..00000000000
--- a/solr/licenses/morfologik-polish-1.5.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8217b6f7ad018ceda0e824b2e60340000da4397a
diff --git a/solr/licenses/morfologik-polish-1.5.5.jar.sha1 b/solr/licenses/morfologik-polish-1.5.5.jar.sha1
new file mode 100644
index 00000000000..10c14c0b380
--- /dev/null
+++ b/solr/licenses/morfologik-polish-1.5.5.jar.sha1
@@ -0,0 +1 @@
+b4a3a9746cab8b2c99c33d2ceeda2ece3f8d8ef2
diff --git a/solr/licenses/morfologik-stemming-1.5.3.jar.sha1 b/solr/licenses/morfologik-stemming-1.5.3.jar.sha1
deleted file mode 100644
index c31642be45d..00000000000
--- a/solr/licenses/morfologik-stemming-1.5.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c4ead57b78fa71b00553ff21da6fb5a326e914e8
diff --git a/solr/licenses/morfologik-stemming-1.5.5.jar.sha1 b/solr/licenses/morfologik-stemming-1.5.5.jar.sha1
new file mode 100644
index 00000000000..c9824e4b2a0
--- /dev/null
+++ b/solr/licenses/morfologik-stemming-1.5.5.jar.sha1
@@ -0,0 +1 @@
+e5dc913adeba3b89539cd5f82e5b88d136a1d85b