[Git][java-team/h2database][master] 2 commits: Depend on liblucene4.10-java instead of liblucene3-java

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / h2database


Commits:
140b3683 by Emmanuel Bourg at 2018-12-04T08:04:43Z
Depend on liblucene4.10-java instead of liblucene3-java

- - - - -
8b046377 by Emmanuel Bourg at 2018-12-04T08:04:50Z
Upload to unstable

- - - - -


6 changed files:

- debian/changelog
- debian/control
- debian/libh2-java.classpath
- debian/patches/01-use-jar-files-from-debian.patch
- + debian/patches/06-lucene-compatibility.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,9 @@
-h2database (1.4.197-4) UNRELEASED; urgency=medium
+h2database (1.4.197-4) unstable; urgency=medium
 
+  * Depend on liblucene4.10-java instead of liblucene3-java
   * Use salsa.debian.org Vcs-* URLs
 
- -- Emmanuel Bourg <ebourg at apache.org>  Mon, 03 Dec 2018 23:45:59 +0100
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 04 Dec 2018 00:35:36 +0100
 
 h2database (1.4.197-3) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -8,7 +8,7 @@ Build-Depends:
  default-jdk,
  javahelper,
  libjts-java,
- liblucene3-java,
+ liblucene4.10-java,
  libosgi-compendium-java,
  libservlet3.1-java,
  libslf4j-java,
@@ -23,7 +23,7 @@ Architecture: all
 Depends: ${misc:Depends}
 Suggests:
  libjts-java,
- liblucene3-java,
+ liblucene4.10-java,
  libslf4j-java
 Description: H2 Database Engine
  H2 is a relational database management system supporting a subset


=====================================
debian/libh2-java.classpath
=====================================
@@ -1 +1 @@
-usr/share/java/h2.jar /usr/share/java/lucene3-core.jar /usr/share/java/slf4j-api.jar
+usr/share/java/h2.jar /usr/share/java/lucene-core-4.10.4.jar /usr/share/java/slf4j-api.jar


=====================================
debian/patches/01-use-jar-files-from-debian.patch
=====================================
@@ -12,7 +12,7 @@ Forwarded: not-needed
 
 --- a/src/tools/org/h2/build/Build.java
 +++ b/src/tools/org/h2/build/Build.java
-@@ -285,14 +285,12 @@
+@@ -285,14 +285,14 @@
          switchSource(debugInfo);
          clean();
          mkdir("temp");
@@ -25,7 +25,9 @@ Forwarded: not-needed
 -                File.pathSeparator + "ext/org.osgi.enterprise-4.2.0.jar" +
 -                File.pathSeparator + "ext/jts-core-1.15.0.jar" +
 +                File.pathSeparator + "/usr/share/java/servlet-api-3.1.jar" +
-+                File.pathSeparator + "/usr/share/java/lucene3-core.jar" +
++                File.pathSeparator + "/usr/share/java/lucene-analyzers-common-4.10.4.jar" +
++                File.pathSeparator + "/usr/share/java/lucene-core-4.10.4.jar" +
++                File.pathSeparator + "/usr/share/java/lucene-queryparser-4.10.4.jar" +
 +                File.pathSeparator + "/usr/share/java/slf4j-api.jar" +
 +                File.pathSeparator + "/usr/share/java/osgi.compendium.jar" +
 +                File.pathSeparator + "/usr/share/java/jts-core.jar" +


=====================================
debian/patches/06-lucene-compatibility.patch
=====================================
@@ -0,0 +1,22 @@
+Description: Ensures the compatibility with the latest version of Lucene in Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/src/main/org/h2/fulltext/FullTextLucene.java
++++ b/src/main/org/h2/fulltext/FullTextLucene.java
+@@ -26,7 +26,7 @@
+ import org.apache.lucene.index.IndexWriter;
+ import org.apache.lucene.index.IndexWriterConfig;
+ import org.apache.lucene.index.Term;
+-import org.apache.lucene.queryParser.QueryParser;
++import org.apache.lucene.queryparser.classic.QueryParser;
+ import org.apache.lucene.search.IndexSearcher;
+ import org.apache.lucene.search.Query;
+ import org.apache.lucene.search.ScoreDoc;
+@@ -763,7 +763,6 @@
+ 
+         private static void closeSearcher(IndexSearcher searcher) {
+             IndexReader indexReader = searcher.getIndexReader();
+-            try { searcher.close(); } catch(IOException ignore) {/**/}
+             try { indexReader.close(); } catch(IOException ignore) {/**/}
+         }
+     }


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@
 03-osgi-compatibility.patch
 04-reproducible-javadoc.patch
 TestCrashAPI.patch
+06-lucene-compatibility.patch



View it on GitLab: https://salsa.debian.org/java-team/h2database/compare/67a9a59513d94eae3782e520c0d9653d9e8f419f...8b046377fad8e0ec7357561aa99a077244673fcd

-- 
View it on GitLab: https://salsa.debian.org/java-team/h2database/compare/67a9a59513d94eae3782e520c0d9653d9e8f419f...8b046377fad8e0ec7357561aa99a077244673fcd
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20181204/876f292d/attachment.html>