[lucene-solr] 02/04: Fixed a test failure with commons-codec 1.10

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository lucene-solr.

commit d40679272902481135dd17d6e60e428cffc3d6c6
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jul 13 14:07:46 2015 +0200

    Fixed a test failure with commons-codec 1.10
---
 debian/changelog                                 |  1 +
 debian/patches/commons-codec-compatibility.patch | 20 ++++++++++++++++++++
 debian/patches/series                            |  1 +
 3 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index fb4578a..ced11d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ lucene-solr (3.6.2+dfsg-7) UNRELEASED; urgency=medium
 
   * Team upload.
   * Removed the dependency on libgeronimo-stax-1.2-spec-java
+  * Fixed a test failure with commons-codec 1.10
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 13 Jul 2015 10:19:53 +0200
 
diff --git a/debian/patches/commons-codec-compatibility.patch b/debian/patches/commons-codec-compatibility.patch
new file mode 100644
index 0000000..38fc328
--- /dev/null
+++ b/debian/patches/commons-codec-compatibility.patch
@@ -0,0 +1,20 @@
+Description: Fix the compatibility with Commons Codec 1.10
+ This patch can be dropped after upgrading to lucene-solr 5
+Origin: backport, https://svn.apache.org/r1638250
+--- a/solr/core/src/test/org/apache/solr/analysis/TestBeiderMorseFilterFactory.java
++++ b/solr/core/src/test/org/apache/solr/analysis/TestBeiderMorseFilterFactory.java
+@@ -31,10 +31,10 @@
+     factory.init(DEFAULT_VERSION_PARAM);
+     TokenStream ts = factory.create(new MockTokenizer(new StringReader("Weinberg"), MockTokenizer.WHITESPACE, false));
+     assertTokenStreamContents(ts,
+-        new String[] { "vDnbirk", "vanbirk", "vinbirk", "wDnbirk", "wanbirk", "winbirk" },
+-        new int[] { 0, 0, 0, 0, 0, 0 },
+-        new int[] { 8, 8, 8, 8, 8, 8 },
+-        new int[] { 1, 0, 0, 0, 0, 0 });
++        new String[] { "vDnbYrk", "vDnbirk", "vanbYrk", "vanbirk", "vinbYrk", "vinbirk", "wDnbirk", "wanbirk", "winbirk" },
++        new int[] { 0, 0, 0, 0, 0, 0, 0, 0, 0},
++        new int[] { 8, 8, 8, 8, 8, 8, 8, 8, 8},
++        new int[] { 1, 0, 0, 0, 0, 0, 0, 0, 0});
+   }
+   
+   public void testLanguageSet() throws Exception {
diff --git a/debian/patches/series b/debian/patches/series
index ad076e6..ae65253 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ remove-prettify.patch
 CVE-2013-6397.patch
 CVE-2013-6407_CVE-2013-6408.patch
 jetty8-compatibility.patch
+commons-codec-compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lucene-solr.git