This is an automated email from the git hooks/post-receive script. bengen pushed a commit to branch master in repository lucene4.10.
commit eee4bab0f9084bb4d27cac291caf1c9ff1404309 Author: Hilko Bengen <[email protected]> Date: Sun Mar 29 17:22:25 2015 +0200 Re-added code that was removed upstream so we can use JavaCC --- ...ream-removal-of-deprecated-QueryParser-co.patch | 59 ++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 60 insertions(+) diff --git a/debian/patches/0005-Revert-upstream-removal-of-deprecated-QueryParser-co.patch b/debian/patches/0005-Revert-upstream-removal-of-deprecated-QueryParser-co.patch new file mode 100644 index 0000000..4d82a13 --- /dev/null +++ b/debian/patches/0005-Revert-upstream-removal-of-deprecated-QueryParser-co.patch @@ -0,0 +1,59 @@ +From: Hilko Bengen <[email protected]> +Date: Sun, 29 Mar 2015 17:18:01 +0200 +Subject: Revert upstream removal of deprecated QueryParser constructor + variant that caused FTBFS with JavaCC-regenerated files + +--- + .../lucene/queryparser/classic/QueryParser.jj | 22 +++++++++++++++++++++- + 1 file changed, 21 insertions(+), 1 deletion(-) + +diff --git a/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.jj b/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.jj +index 19ec625..585a7fb 100644 +--- a/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.jj ++++ b/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.jj +@@ -36,6 +36,7 @@ import org.apache.lucene.search.BooleanClause; + import org.apache.lucene.search.Query; + import org.apache.lucene.search.TermRangeQuery; + import org.apache.lucene.search.TermQuery; ++import org.apache.lucene.util.Version; + + /** + * This class is generated by JavaCC. The most important method is +@@ -99,6 +100,14 @@ import org.apache.lucene.search.TermQuery; + * <p><b>NOTE</b>: there is a new QueryParser in contrib, which matches + * the same syntax as this class, but is more modular, + * enabling substantial customization to how a query is created. ++ * ++ * <a name="version"/> ++ * <p><b>NOTE</b>: You must specify the required {@link Version} ++ * compatibility when creating QueryParser: ++ * <ul> ++ * <li> As of 3.1, {@link #setAutoGeneratePhraseQueries} is false by ++ * default. ++ * </ul> + */ + public class QueryParser extends QueryParserBase { + /** The default operator for parsing queries. +@@ -107,10 +116,21 @@ public class QueryParser extends QueryParserBase { + static public enum Operator { OR, AND } + + /** Create a query parser. ++ * @param matchVersion Lucene version to match. See <a href="#version">above</a>. ++ * @param f the default field for query terms. ++ * @param a used to find terms in the query text. ++ * @deprecated Use {@link #QueryParser(String, Analyzer)} ++ */ ++ public QueryParser(Version matchVersion, String f, Analyzer a) { ++ this(new FastCharStream(new StringReader(""))); ++ init(matchVersion, f, a); ++ } ++ ++ /** Create a query parser. + * @param f the default field for query terms. + * @param a used to find terms in the query text. + */ +- public QueryParser(String f, Analyzer a) { ++ public QueryParser(String f, Analyzer a) { + this(new FastCharStream(new StringReader(""))); + init(f, a); + } diff --git a/debian/patches/series b/debian/patches/series index 03afcea..cb0161f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ 0002-Use-javax.servlet-servlet-api-directly.patch 0003-Adjust-build-dep-versions-as-needed.patch 0004-disable-ivy-retrieve-and-set-javacchome.patch +0005-Revert-upstream-removal-of-deprecated-QueryParser-co.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lucene4.10.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
