From 87ff7107b5be85e120afd3a7cba077c873a10d58 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Jun 14 2017 08:56:21 +0000 Subject: Update to latest upstream revision Drop upstreamed patch Port to lucene 6 Enable fast test suite --- diff --git a/h2-1.4.192.pom b/h2-1.4.192.pom deleted file mode 100644 index 4b4ecbd..0000000 --- a/h2-1.4.192.pom +++ /dev/null @@ -1,30 +0,0 @@ - - 4.0.0 - com.h2database - h2 - 1.4.192 - jar - H2 Database Engine - http://www.h2database.com - H2 Database Engine - - - MPL 2.0 or EPL 1.0 - http://h2database.com/html/license.html - repo - - - - scm:git:https://github.com/h2database/h2database - https://github.com/h2database/h2database - - - - thomas.tom.mueller - Thomas Mueller - thomas.tom.mueller at gmail dot com - - - - - \ No newline at end of file diff --git a/h2-1.4.196.pom b/h2-1.4.196.pom new file mode 100644 index 0000000..0122b4c --- /dev/null +++ b/h2-1.4.196.pom @@ -0,0 +1,30 @@ + + 4.0.0 + com.h2database + h2 + 1.4.196 + jar + H2 Database Engine + http://www.h2database.com + H2 Database Engine + + + MPL 2.0 or EPL 1.0 + http://h2database.com/html/license.html + repo + + + + scm:git:https://github.com/h2database/h2database + https://github.com/h2database/h2database + + + + thomas.tom.mueller + Thomas Mueller + thomas.tom.mueller at gmail dot com + + + + + \ No newline at end of file diff --git a/h2.spec b/h2.spec index 36843b8..d6cf29b 100644 --- a/h2.spec +++ b/h2.spec @@ -1,22 +1,21 @@ Name: h2 -Version: 1.4.192 -Release: 2%{?dist} +Version: 1.4.196 +Release: 1%{?dist} Summary: Java SQL database License: EPL or MPLv1.1 URL: http://www.h2database.com -Source0: http://www.h2database.com/h2-2016-05-26.zip +Source0: http://www.h2database.com/h2-2017-06-10.zip Source1: http://repo2.maven.org/maven2/com/h2database/h2/%{version}/h2-%{version}.pom -Patch0: port-to-servlet-3.1.0.patch -Patch1: port-to-lucene-5.patch +Patch0: port-to-lucene-6.patch BuildArch: noarch BuildRequires: javapackages-local -BuildRequires: lucene -BuildRequires: lucene-analysis -BuildRequires: lucene-queryparser +BuildRequires: lucene >= 6.1.0 +BuildRequires: lucene-analysis >= 6.1.0 +BuildRequires: lucene-queryparser >= 6.1.0 BuildRequires: slf4j BuildRequires: felix-osgi-core BuildRequires: glassfish-servlet-api @@ -36,7 +35,6 @@ This package contains the API documentation for %{name}. %prep %setup -q -n %{name} %patch0 -p2 -%patch1 -p2 # Because no Fedora package provides org.osgi.service.jdbc interfaces yet rm src/main/org/h2/util/OsgiDataSourceFactory.java @@ -53,22 +51,26 @@ find -name '*.dll' -delete sed -i -e '/downloadTest();/d' -e '/download();/d' \ src/tools/org/h2/build/Build.java +# Tests that use the network +sed -i -e '/TestNetUtils/d' \ + src/test/org/h2/test/TestAll.java + # Use system libraries instead mkdir ext ln -s -T $(build-classpath jts) ext/jts-core-1.14.0.jar ln -s -T $(build-classpath glassfish-servlet-api) ext/servlet-api-3.1.0.jar ln -s -T $(build-classpath slf4j/api) ext/slf4j-api-1.6.0.jar ln -s -T $(build-classpath slf4j/nop) ext/slf4j-nop-1.6.0.jar -ln -s -T $(build-classpath lucene/lucene-core) ext/lucene-core-5.4.1.jar -ln -s -T $(build-classpath lucene/lucene-analyzers-common) ext/lucene-analyzers-common-5.4.1.jar -ln -s -T $(build-classpath lucene/lucene-queryparser) ext/lucene-queryparser-5.4.1.jar +ln -s -T $(build-classpath lucene/lucene-core) ext/lucene-core-6.1.0.jar +ln -s -T $(build-classpath lucene/lucene-analyzers-common) ext/lucene-analyzers-common-6.1.0.jar +ln -s -T $(build-classpath lucene/lucene-queryparser) ext/lucene-queryparser-6.1.0.jar ln -s -T $(build-classpath felix/org.osgi.core) ext/org.osgi.core-4.2.0.jar -echo " classic queryparser" >> src/tools/org/h2/build/doc/dictionary.txt +echo "classic queryparser" >> src/tools/org/h2/build/doc/dictionary.txt %build export JAVA_HOME=%{_jvmdir}/java -sh build.sh jar docs +sh build.sh jar docs testFast %install %mvn_artifact %SOURCE1 bin/h2-%{version}.jar @@ -83,6 +85,12 @@ sh build.sh jar docs %license src/docsrc/html/license.html %changelog +* Tue Jun 13 2017 Mat Booth - 1.4.196-1 +- Update to latest upstream revision +- Drop upstreamed patch +- Port to lucene 6 +- Enable fast test suite + * Fri Feb 10 2017 Fedora Release Engineering - 1.4.192-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/port-to-lucene-5.patch b/port-to-lucene-5.patch deleted file mode 100644 index 27f7732..0000000 --- a/port-to-lucene-5.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 7e707748a5d500c34b2d6350c0093c05c3d2775c Mon Sep 17 00:00:00 2001 -From: Mat Booth -Date: Mon, 8 Aug 2016 19:48:08 +0100 -Subject: [PATCH 2/2] Update to lucene 5 - ---- - h2/pom.xml | 13 ++++++++++++- - h2/src/main/META-INF/MANIFEST.MF | 16 ++++++++-------- - h2/src/main/org/h2/fulltext/FullTextLucene.java | 18 +++++++++--------- - h2/src/tools/org/h2/build/Build.java | 8 ++++++-- - 4 files changed, 35 insertions(+), 20 deletions(-) - -diff --git a/h2/src/main/META-INF/MANIFEST.MF b/h2/src/main/META-INF/MANIFEST.MF -index 9f219d1..49dc47d 100644 ---- a/h2/src/main/META-INF/MANIFEST.MF -+++ b/h2/src/main/META-INF/MANIFEST.MF -@@ -23,14 +23,14 @@ Import-Package: javax.management, - javax.sql, - javax.tools;resolution:=optional, - javax.transaction.xa;resolution:=optional, -- org.apache.lucene.analysis;version="[3.6.2,4.0.0)";resolution:=optional, -- org.apache.lucene.analysis.standard;version="[3.6.2,4.0.0)";resolution:=optional, -- org.apache.lucene.document;version="[3.6.2,4.0.0)";resolution:=optional, -- org.apache.lucene.index;version="[3.6.2,4.0.0)";resolution:=optional, -- org.apache.lucene.queryParser;version="[3.6.2,4.0.0)";resolution:=optional, -- org.apache.lucene.search;version="[3.6.2,4.0.0)";resolution:=optional, -- org.apache.lucene.store;version="[3.6.2,4.0.0)";resolution:=optional, -- org.apache.lucene.util;version="[3.6.2,4.0.0)";resolution:=optional, -+ org.apache.lucene.analysis;version="[5.4.1,6.0.0)";resolution:=optional, -+ org.apache.lucene.analysis.standard;version="[5.4.1,6.0.0)";resolution:=optional, -+ org.apache.lucene.document;version="[5.4.1,6.0.0)";resolution:=optional, -+ org.apache.lucene.index;version="[5.4.1,6.0.0)";resolution:=optional, -+ org.apache.lucene.queryParser;version="[5.4.1,6.0.0)";resolution:=optional, -+ org.apache.lucene.search;version="[5.4.1,6.0.0)";resolution:=optional, -+ org.apache.lucene.store;version="[5.4.1,6.0.0)";resolution:=optional, -+ org.apache.lucene.util;version="[5.4.1,6.0.0)";resolution:=optional, - com.vividsolutions.jts.geom;version="1.14.0";resolution:=optional, - com.vividsolutions.jts.io;version="1.14.0";resolution:=optional, - org.h2;version="[${version},1.5.0)", -diff --git a/h2/src/main/org/h2/fulltext/FullTextLucene.java b/h2/src/main/org/h2/fulltext/FullTextLucene.java -index f24bcab..d9c5b92 100644 ---- a/h2/src/main/org/h2/fulltext/FullTextLucene.java -+++ b/h2/src/main/org/h2/fulltext/FullTextLucene.java -@@ -19,10 +19,11 @@ import org.apache.lucene.analysis.standard.StandardAnalyzer; - import org.apache.lucene.document.DateTools; - import org.apache.lucene.document.Document; - import org.apache.lucene.document.Field; -+import org.apache.lucene.index.DirectoryReader; - import org.apache.lucene.index.IndexReader; - 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.h2.api.Trigger; -@@ -303,13 +304,14 @@ public class FullTextLucene extends FullText { - if (access == null) { - try { - Directory indexDir = path.startsWith(IN_MEMORY_PREFIX) ? -- new RAMDirectory() : FSDirectory.open(new File(path)); -- Analyzer analyzer = new StandardAnalyzer(Version.LUCENE_30); -- IndexWriterConfig conf = new IndexWriterConfig(Version.LUCENE_30, analyzer); -+ new RAMDirectory() : FSDirectory.open(new File(path).toPath()); -+ Analyzer analyzer = new StandardAnalyzer(); -+ analyzer.setVersion(Version.LUCENE_5_4_1); -+ IndexWriterConfig conf = new IndexWriterConfig(analyzer); - conf.setOpenMode(IndexWriterConfig.OpenMode.CREATE_OR_APPEND); - IndexWriter writer = new IndexWriter(indexDir, conf); - //see http://wiki.apache.org/lucene-java/NearRealtimeSearch -- IndexReader reader = IndexReader.open(writer, true); -+ IndexReader reader = DirectoryReader.open(writer, true); - access = new IndexAccess(); - access.writer = writer; - access.reader = reader; -@@ -394,7 +396,6 @@ public class FullTextLucene extends FullText { - synchronized (INDEX_ACCESS) { - try { - INDEX_ACCESS.remove(indexPath); -- access.searcher.close(); - access.reader.close(); - access.writer.close(); - } catch (Exception e) { -@@ -430,7 +431,7 @@ public class FullTextLucene extends FullText { - // reuse the same analyzer; it's thread-safe; - // also allows subclasses to control the analyzer used. - Analyzer analyzer = access.writer.getAnalyzer(); -- QueryParser parser = new QueryParser(Version.LUCENE_30, -+ QueryParser parser = new QueryParser( - LUCENE_FIELD_DATA, analyzer); - Query query = parser.parse(text); - // Lucene 3 insists on a hard limit and will not provide -@@ -604,9 +605,8 @@ public class FullTextLucene extends FullText { - try { - indexAccess.writer.commit(); - // recreate Searcher with the IndexWriter's reader. -- indexAccess.searcher.close(); - indexAccess.reader.close(); -- indexAccess.reader = IndexReader.open(indexAccess.writer, true); -+ indexAccess.reader = DirectoryReader.open(indexAccess.writer, true); - indexAccess.searcher = new IndexSearcher(indexAccess.reader); - } catch (IOException e) { - throw convertException(e); -diff --git a/h2/src/tools/org/h2/build/Build.java b/h2/src/tools/org/h2/build/Build.java -index a599656..24d97c6 100644 ---- a/h2/src/tools/org/h2/build/Build.java -+++ b/h2/src/tools/org/h2/build/Build.java -@@ -204,7 +204,9 @@ public class Build extends BuildBase { - download(); - String classpath = "temp" + - File.pathSeparator + "ext/servlet-api-3.1.0.jar" + -- File.pathSeparator + "ext/lucene-core-3.6.2.jar" + -+ File.pathSeparator + "ext/lucene-core-5.4.1.jar" + -+ File.pathSeparator + "ext/lucene-analyzers-common-5.4.1.jar" + -+ File.pathSeparator + "ext/lucene-queryparser-5.4.1.jar" + - File.pathSeparator + "ext/slf4j-api-1.6.0.jar" + - File.pathSeparator + "ext/org.osgi.core-4.2.0.jar" + - File.pathSeparator + "ext/org.osgi.enterprise-4.2.0.jar" + -@@ -595,7 +597,9 @@ public class Build extends BuildBase { - javadoc("-sourcepath", "src/main", "org.h2.jdbc", "org.h2.jdbcx", - "org.h2.tools", "org.h2.api", "org.h2.engine", "org.h2.fulltext", - "-classpath", -- "ext/lucene-core-3.6.2.jar" + -+ "ext/lucene-core-5.4.1.jar" + File.pathSeparator + -+ "ext/lucene-analyzers-common-5.4.1.jar" + File.pathSeparator + -+ "ext/lucene-queryparser-5.4.1.jar" + - File.pathSeparator + "ext/jts-core-1.14.0.jar", - "-docletpath", "bin" + File.pathSeparator + "temp", - "-doclet", "org.h2.build.doclet.Doclet"); --- -2.5.5 - diff --git a/port-to-lucene-6.patch b/port-to-lucene-6.patch new file mode 100644 index 0000000..dcab8fe --- /dev/null +++ b/port-to-lucene-6.patch @@ -0,0 +1,169 @@ +From 7e707748a5d500c34b2d6350c0093c05c3d2775c Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Mon, 8 Aug 2016 19:48:08 +0100 +Subject: [PATCH 2/2] Update to lucene 5 + +--- + h2/pom.xml | 13 ++++++++++++- + h2/src/main/META-INF/MANIFEST.MF | 16 ++++++++-------- + h2/src/main/org/h2/fulltext/FullTextLucene.java | 18 +++++++++--------- + h2/src/tools/org/h2/build/Build.java | 8 ++++++-- + 4 files changed, 35 insertions(+), 20 deletions(-) + +diff --git a/h2/src/main/META-INF/MANIFEST.MF b/h2/src/main/META-INF/MANIFEST.MF +index 9f219d1..49dc47d 100644 +--- a/h2/src/main/META-INF/MANIFEST.MF ++++ b/h2/src/main/META-INF/MANIFEST.MF +@@ -23,14 +23,14 @@ Import-Package: javax.management, + javax.sql, + javax.tools;resolution:=optional, + javax.transaction.xa;resolution:=optional, +- org.apache.lucene.analysis;version="[3.6.2,4.0.0)";resolution:=optional, +- org.apache.lucene.analysis.standard;version="[3.6.2,4.0.0)";resolution:=optional, +- org.apache.lucene.document;version="[3.6.2,4.0.0)";resolution:=optional, +- org.apache.lucene.index;version="[3.6.2,4.0.0)";resolution:=optional, +- org.apache.lucene.queryParser;version="[3.6.2,4.0.0)";resolution:=optional, +- org.apache.lucene.search;version="[3.6.2,4.0.0)";resolution:=optional, +- org.apache.lucene.store;version="[3.6.2,4.0.0)";resolution:=optional, +- org.apache.lucene.util;version="[3.6.2,4.0.0)";resolution:=optional, ++ org.apache.lucene.analysis;version="[6.1.0,7.0.0)";resolution:=optional, ++ org.apache.lucene.analysis.standard;version="[6.1.0,7.0.0)";resolution:=optional, ++ org.apache.lucene.document;version="[6.1.0,7.0.0)";resolution:=optional, ++ org.apache.lucene.index;version="[6.1.0,7.0.0)";resolution:=optional, ++ org.apache.lucene.queryParser;version="[6.1.0,7.0.0)";resolution:=optional, ++ org.apache.lucene.search;version="[6.1.0,7.0.0)";resolution:=optional, ++ org.apache.lucene.store;version="[6.1.0,7.0.0)";resolution:=optional, ++ org.apache.lucene.util;version="[6.1.0,7.0.0)";resolution:=optional, + com.vividsolutions.jts.geom;version="1.14.0";resolution:=optional, + com.vividsolutions.jts.io;version="1.14.0";resolution:=optional, + org.h2;version="[${version},1.5.0)", +diff --git a/h2/src/main/org/h2/fulltext/FullTextLucene.java b/h2/src/main/org/h2/fulltext/FullTextLucene.java +index f24bcab..d9c5b92 100644 +--- a/h2/src/main/org/h2/fulltext/FullTextLucene.java ++++ b/h2/src/main/org/h2/fulltext/FullTextLucene.java +@@ -19,10 +19,13 @@ + import org.apache.lucene.document.DateTools; + import org.apache.lucene.document.Document; + import org.apache.lucene.document.Field; ++import org.apache.lucene.document.StringField; ++import org.apache.lucene.document.TextField; ++import org.apache.lucene.index.DirectoryReader; + import org.apache.lucene.index.IndexReader; + 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.h2.api.Trigger; +@@ -303,13 +306,14 @@ + if (access == null) { + try { + Directory indexDir = path.startsWith(IN_MEMORY_PREFIX) ? +- new RAMDirectory() : FSDirectory.open(new File(path)); +- Analyzer analyzer = new StandardAnalyzer(Version.LUCENE_30); +- IndexWriterConfig conf = new IndexWriterConfig(Version.LUCENE_30, analyzer); ++ new RAMDirectory() : FSDirectory.open(new File(path).toPath()); ++ Analyzer analyzer = new StandardAnalyzer(); ++ analyzer.setVersion(Version.LUCENE_5_4_1); ++ IndexWriterConfig conf = new IndexWriterConfig(analyzer); + conf.setOpenMode(IndexWriterConfig.OpenMode.CREATE_OR_APPEND); + IndexWriter writer = new IndexWriter(indexDir, conf); + //see http://wiki.apache.org/lucene-java/NearRealtimeSearch +- IndexReader reader = IndexReader.open(writer, true); ++ IndexReader reader = DirectoryReader.open(writer, true, true); + access = new IndexAccess(); + access.writer = writer; + access.reader = reader; +@@ -394,7 +398,6 @@ + synchronized (INDEX_ACCESS) { + try { + INDEX_ACCESS.remove(indexPath); +- access.searcher.close(); + access.reader.close(); + access.writer.close(); + } catch (Exception e) { +@@ -430,7 +433,7 @@ + // reuse the same analyzer; it's thread-safe; + // also allows subclasses to control the analyzer used. + Analyzer analyzer = access.writer.getAnalyzer(); +- QueryParser parser = new QueryParser(Version.LUCENE_30, ++ QueryParser parser = new QueryParser( + LUCENE_FIELD_DATA, analyzer); + Query query = parser.parse(text); + // Lucene 3 insists on a hard limit and will not provide +@@ -604,9 +607,8 @@ + try { + indexAccess.writer.commit(); + // recreate Searcher with the IndexWriter's reader. +- indexAccess.searcher.close(); + indexAccess.reader.close(); +- indexAccess.reader = IndexReader.open(indexAccess.writer, true); ++ indexAccess.reader = DirectoryReader.open(indexAccess.writer, true, true); + indexAccess.searcher = new IndexSearcher(indexAccess.reader); + } catch (IOException e) { + throw convertException(e); +@@ -622,12 +624,12 @@ + protected void insert(Object[] row, boolean commitIndex) throws SQLException { + String query = getQuery(row); + Document doc = new Document(); +- doc.add(new Field(LUCENE_FIELD_QUERY, query, +- Field.Store.YES, Field.Index.NOT_ANALYZED)); ++ doc.add(new StringField(LUCENE_FIELD_QUERY, query, ++ Field.Store.YES)); + long time = System.currentTimeMillis(); +- doc.add(new Field(LUCENE_FIELD_MODIFIED, ++ doc.add(new StringField(LUCENE_FIELD_MODIFIED, + DateTools.timeToString(time, DateTools.Resolution.SECOND), +- Field.Store.YES, Field.Index.NOT_ANALYZED)); ++ Field.Store.YES)); + StatementBuilder buff = new StatementBuilder(); + for (int index : indexColumns) { + String columnName = columns[index]; +@@ -638,15 +640,14 @@ + if (columnName.startsWith(LUCENE_FIELD_COLUMN_PREFIX)) { + columnName = LUCENE_FIELD_COLUMN_PREFIX + columnName; + } +- doc.add(new Field(columnName, data, +- Field.Store.NO, Field.Index.ANALYZED)); ++ doc.add(new TextField(columnName, data, ++ Field.Store.NO)); + buff.appendExceptFirst(" "); + buff.append(data); + } + Field.Store storeText = STORE_DOCUMENT_TEXT_IN_INDEX ? + Field.Store.YES : Field.Store.NO; +- doc.add(new Field(LUCENE_FIELD_DATA, buff.toString(), storeText, +- Field.Index.ANALYZED)); ++ doc.add(new TextField(LUCENE_FIELD_DATA, buff.toString(), storeText)); + try { + indexAccess.writer.addDocument(doc); + if (commitIndex) { +diff --git a/h2/src/tools/org/h2/build/Build.java b/h2/src/tools/org/h2/build/Build.java +index a599656..24d97c6 100644 +--- a/h2/src/tools/org/h2/build/Build.java ++++ b/h2/src/tools/org/h2/build/Build.java +@@ -204,7 +204,9 @@ public class Build extends BuildBase { + download(); + String classpath = "temp" + + File.pathSeparator + "ext/servlet-api-3.1.0.jar" + +- File.pathSeparator + "ext/lucene-core-3.6.2.jar" + ++ File.pathSeparator + "ext/lucene-core-6.1.0.jar" + ++ File.pathSeparator + "ext/lucene-analyzers-common-6.1.0.jar" + ++ File.pathSeparator + "ext/lucene-queryparser-6.1.0.jar" + + File.pathSeparator + "ext/slf4j-api-1.6.0.jar" + + File.pathSeparator + "ext/org.osgi.core-4.2.0.jar" + + File.pathSeparator + "ext/org.osgi.enterprise-4.2.0.jar" + +@@ -595,7 +597,9 @@ public class Build extends BuildBase { + javadoc("-sourcepath", "src/main", "org.h2.jdbc", "org.h2.jdbcx", + "org.h2.tools", "org.h2.api", "org.h2.engine", "org.h2.fulltext", + "-classpath", +- "ext/lucene-core-3.6.2.jar" + ++ "ext/lucene-core-6.1.0.jar" + File.pathSeparator + ++ "ext/lucene-analyzers-common-6.1.0.jar" + File.pathSeparator + ++ "ext/lucene-queryparser-6.1.0.jar" + + File.pathSeparator + "ext/jts-core-1.14.0.jar", + "-docletpath", "bin" + File.pathSeparator + "temp", + "-doclet", "org.h2.build.doclet.Doclet"); +-- +2.5.5 diff --git a/port-to-servlet-3.1.0.patch b/port-to-servlet-3.1.0.patch deleted file mode 100644 index ecc144d..0000000 --- a/port-to-servlet-3.1.0.patch +++ /dev/null @@ -1,173 +0,0 @@ -From 47e5cb965d16ccefb62978239d03d4cc8c57c3b7 Mon Sep 17 00:00:00 2001 -From: Mat Booth -Date: Mon, 8 Aug 2016 16:42:53 +0100 -Subject: [PATCH] Update to servlet API version 3.1.0 from 3.0.1 - ---- - h2/pom.xml | 2 +- - h2/src/test/org/h2/test/server/TestWeb.java | 34 +++++++++++++++++++++++++++ - h2/src/test/org/h2/test/unit/TestServlet.java | 4 ++++ - h2/src/tools/org/h2/build/Build.java | 18 +++++++------- - 4 files changed, 48 insertions(+), 10 deletions(-) - -diff --git a/h2/src/test/org/h2/test/server/TestWeb.java b/h2/src/test/org/h2/test/server/TestWeb.java -index 9a20358..845084d 100644 ---- a/h2/src/test/org/h2/test/server/TestWeb.java -+++ b/h2/src/test/org/h2/test/server/TestWeb.java -@@ -28,12 +28,15 @@ import javax.servlet.ServletInputStream; - import javax.servlet.ServletOutputStream; - import javax.servlet.ServletRequest; - import javax.servlet.ServletResponse; -+import javax.servlet.WriteListener; - import javax.servlet.http.Cookie; - import javax.servlet.http.HttpServletRequest; - import javax.servlet.http.HttpServletResponse; - import javax.servlet.http.HttpSession; -+import javax.servlet.http.HttpUpgradeHandler; - import javax.servlet.http.Part; - import javax.servlet.ServletContext; -+import javax.servlet.ServletException; - - import org.h2.api.ErrorCode; - import org.h2.engine.Constants; -@@ -938,6 +941,22 @@ public class TestWeb extends TestBase { - return null; - } - -+ @Override -+ public long getContentLengthLong() { -+ return 0; -+ } -+ -+ @Override -+ public String changeSessionId() { -+ return null; -+ } -+ -+ @Override -+ public T upgrade(Class handlerClass) -+ throws IOException, ServletException { -+ return null; -+ } -+ - } - - /** -@@ -1017,6 +1036,11 @@ public class TestWeb extends TestBase { - } - - @Override -+ public void setContentLengthLong(long arg0) { -+ // ignore -+ } -+ -+ @Override - public void setContentType(String arg0) { - // ignore - } -@@ -1157,6 +1181,16 @@ public class TestWeb extends TestBase { - } - } - -+ @Override -+ public boolean isReady() { -+ return true; -+ } -+ -+ @Override -+ public void setWriteListener(WriteListener writeListener) { -+ // ignore -+ } -+ - } - - } -diff --git a/h2/src/test/org/h2/test/unit/TestServlet.java b/h2/src/test/org/h2/test/unit/TestServlet.java -index 6400dfe..3a3630c 100644 ---- a/h2/src/test/org/h2/test/unit/TestServlet.java -+++ b/h2/src/test/org/h2/test/unit/TestServlet.java -@@ -335,6 +335,10 @@ public class TestServlet extends TestBase { - throw new UnsupportedOperationException(); - } - -+ @Override -+ public String getVirtualServerName() { -+ throw new UnsupportedOperationException(); -+ } - - } - -diff --git a/h2/src/tools/org/h2/build/Build.java b/h2/src/tools/org/h2/build/Build.java -index b62b8ce..a599656 100644 ---- a/h2/src/tools/org/h2/build/Build.java -+++ b/h2/src/tools/org/h2/build/Build.java -@@ -125,7 +125,7 @@ public class Build extends BuildBase { - String cp = "temp" + File.pathSeparator + "bin" + - File.pathSeparator + "ext/emma-2.0.5312.jar" + - File.pathSeparator + "ext/postgresql-8.3-603.jdbc3.jar" + -- File.pathSeparator + "ext/servlet-api-3.0.1.jar" + -+ File.pathSeparator + "ext/servlet-api-3.1.0.jar" + - File.pathSeparator + "ext/lucene-core-3.6.2.jar" + - File.pathSeparator + "ext/h2mig_pagestore_addon.jar" + - File.pathSeparator + "ext/org.osgi.core-4.2.0.jar" + -@@ -203,7 +203,7 @@ public class Build extends BuildBase { - mkdir("temp"); - download(); - String classpath = "temp" + -- File.pathSeparator + "ext/servlet-api-3.0.1.jar" + -+ File.pathSeparator + "ext/servlet-api-3.1.0.jar" + - File.pathSeparator + "ext/lucene-core-3.6.2.jar" + - File.pathSeparator + "ext/slf4j-api-1.6.0.jar" + - File.pathSeparator + "ext/org.osgi.core-4.2.0.jar" + -@@ -296,9 +296,9 @@ public class Build extends BuildBase { - } - - private void downloadOrVerify(boolean offline) { -- downloadOrVerify("ext/servlet-api-3.0.1.jar", -- "javax/servlet", "javax.servlet-api", "3.0.1", -- "6bf0ebb7efd993e222fc1112377b5e92a13b38dd", offline); -+ downloadOrVerify("ext/servlet-api-3.1.0.jar", -+ "javax/servlet", "javax.servlet-api", "3.1.0", -+ "3cd63d075497751784b2fa84be59432f4905bf7c", offline); - downloadOrVerify("ext/lucene-core-3.6.2.jar", - "org/apache/lucene", "lucene-core", "3.6.2", - "9ec77e2507f9cc01756964c71d91efd8154a8c47", offline); -@@ -617,7 +617,7 @@ public class Build extends BuildBase { - "-d", "docs/javadocImpl2", - "-classpath", javaToolsJar + - File.pathSeparator + "ext/slf4j-api-1.6.0.jar" + -- File.pathSeparator + "ext/servlet-api-3.0.1.jar" + -+ File.pathSeparator + "ext/servlet-api-3.1.0.jar" + - File.pathSeparator + "ext/lucene-core-3.6.2.jar" + - File.pathSeparator + "ext/org.osgi.core-4.2.0.jar" + - File.pathSeparator + "ext/org.osgi.enterprise-4.2.0.jar" + -@@ -632,7 +632,7 @@ public class Build extends BuildBase { - "-d", "docs/javadocImpl3", - "-classpath", javaToolsJar + - File.pathSeparator + "ext/slf4j-api-1.6.0.jar" + -- File.pathSeparator + "ext/servlet-api-3.0.1.jar" + -+ File.pathSeparator + "ext/servlet-api-3.1.0.jar" + - File.pathSeparator + "ext/lucene-core-3.6.2.jar" + - File.pathSeparator + "ext/org.osgi.core-4.2.0.jar" + - File.pathSeparator + "ext/org.osgi.enterprise-4.2.0.jar" + -@@ -647,7 +647,7 @@ public class Build extends BuildBase { - File.pathSeparator + "src/tools", - "-classpath", javaToolsJar + - File.pathSeparator + "ext/slf4j-api-1.6.0.jar" + -- File.pathSeparator + "ext/servlet-api-3.0.1.jar" + -+ File.pathSeparator + "ext/servlet-api-3.1.0.jar" + - File.pathSeparator + "ext/lucene-core-3.6.2.jar" + - File.pathSeparator + "ext/org.osgi.core-4.2.0.jar" + - File.pathSeparator + "ext/org.osgi.enterprise-4.2.0.jar" + -@@ -916,7 +916,7 @@ public class Build extends BuildBase { - downloadTest(); - String cp = "temp" + File.pathSeparator + "bin" + - File.pathSeparator + "ext/postgresql-8.3-603.jdbc3.jar" + -- File.pathSeparator + "ext/servlet-api-3.0.1.jar" + -+ File.pathSeparator + "ext/servlet-api-3.1.0.jar" + - File.pathSeparator + "ext/lucene-core-3.6.2.jar" + - File.pathSeparator + "ext/h2mig_pagestore_addon.jar" + - File.pathSeparator + "ext/org.osgi.core-4.2.0.jar" + --- -2.5.5 - diff --git a/sources b/sources index 49108cc..cc35b03 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d8635dcbfa103ac0e3b0f19fd8ad32f7 h2-2016-05-26.zip +SHA512 (h2-2017-06-10.zip) = 61324134af7b5911e3fcd55ccb68eb8cde31123500fc1d12abf5c71dca9e3678b130150839cdaef6e1534679ebdebd8c6350820c50318bf0d5a5a95ac8cc863c