This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository h2database.
commit 3dd5db158b70a659d908e57df4bc1d51818b591e Author: Emmanuel Bourg <[email protected]> Date: Mon Feb 16 10:48:27 2015 +0100 Build with the Servlet API 2.5 --- debian/control | 2 +- debian/patches/02-servlet-api-compatibility.patch | 13 +++++++++++++ debian/patches/series | 1 + debian/patches/use-jar-files-from-debian.patch | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 0083748..8be7f0a 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 8.0.0), maven-repo-helper Build-Depends-Indep: default-jdk, liblucene2-java, - libservlet2.4-java, + libservlet2.5-java, libslf4j-java, libequinox-osgi-java Standards-Version: 3.9.2 diff --git a/debian/patches/02-servlet-api-compatibility.patch b/debian/patches/02-servlet-api-compatibility.patch new file mode 100644 index 0000000..4eb761a --- /dev/null +++ b/debian/patches/02-servlet-api-compatibility.patch @@ -0,0 +1,13 @@ +--- a/src/test/org/h2/test/unit/TestServlet.java ++++ b/src/test/org/h2/test/unit/TestServlet.java +@@ -80,6 +80,10 @@ + throw new UnsupportedOperationException(); + } + ++ public String getContextPath() { ++ throw new UnsupportedOperationException(); ++ } ++ + public Enumeration<Object> getInitParameterNames() { + throw new UnsupportedOperationException(); + } diff --git a/debian/patches/series b/debian/patches/series index ed9b441..61114e8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ use-jar-files-from-debian.patch +02-servlet-api-compatibility.patch diff --git a/debian/patches/use-jar-files-from-debian.patch b/debian/patches/use-jar-files-from-debian.patch index 7ec323f..58dc520 100644 --- a/debian/patches/use-jar-files-from-debian.patch +++ b/debian/patches/use-jar-files-from-debian.patch @@ -16,7 +16,7 @@ Last-Update: 2011-07-13 - File.pathSeparator + "ext/" + getLuceneJar() + - File.pathSeparator + "ext/slf4j-api-1.6.0.jar" + - File.pathSeparator + "ext/org.osgi.core-1.2.0.jar" + -+ File.pathSeparator + "/usr/share/java/servlet-api.jar" + ++ File.pathSeparator + "/usr/share/java/servlet-api-2.5.jar" + + File.pathSeparator + "/usr/share/java/lucene-core.jar" + + File.pathSeparator + "/usr/share/java/slf4j-api.jar" + + File.pathSeparator + "/usr/share/java/org.eclipse.osgi.jar" + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/h2database.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
