This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository uima-addons.
commit 92ec490ef66d5c78c5f8f0c91c8b4a44844a30de Author: Emmanuel Bourg <[email protected]> Date: Tue May 17 10:29:04 2016 +0200 Transition to Jetty 8 --- debian/changelog | 7 +++++++ debian/control | 3 +-- debian/maven.rules | 2 +- debian/patches/jetty-compatibility.patch | 31 +++++++++++++++++++++++++++++++ debian/patches/series | 1 + 5 files changed, 41 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index a67be65..fb697c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +uima-addons (2.3.1-5) UNRELEASED; urgency=medium + + * Team upload. + * Transition to Jetty 8 + + -- Emmanuel Bourg <[email protected]> Tue, 17 May 2016 10:27:26 +0200 + uima-addons (2.3.1-4) unstable; urgency=medium * Team upload. diff --git a/debian/control b/debian/control index 476c271..fed7004 100644 --- a/debian/control +++ b/debian/control @@ -14,8 +14,7 @@ Build-Depends-Indep: ant, libcommons-logging-java-doc, libhttpclient-java, libjavacc-maven-plugin-java, - libjetty-java, - libjetty-java-doc, + libjetty8-java, liblog4j1.2-java, liblog4j1.2-java-doc, libmaven-antrun-plugin-java, diff --git a/debian/maven.rules b/debian/maven.rules index d326eb7..3ed4231 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -21,7 +21,7 @@ log4j log4j jar s/1\.2\..*/1.2.x/ * * junit junit jar s/.*/4\.x/ * * commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * * s/ant/org.apache.ant/ * * s/.*/debian/ * * -org.mortbay.jetty * * s/6\..*/6.x/ * * +s/org.mortbay.jetty/org.eclipse.jetty/ s/jetty/jetty-servlet/ * s/.*/debian/ * * javax.servlet servlet-api jar s/.*/2.5/ * * s/org.apache.tomcat/javax.servlet/ servlet-api jar s/.*/2.5/ * * diff --git a/debian/patches/jetty-compatibility.patch b/debian/patches/jetty-compatibility.patch new file mode 100644 index 0000000..67ac6dd --- /dev/null +++ b/debian/patches/jetty-compatibility.patch @@ -0,0 +1,31 @@ +Description: Port the Jetty 6 code to Jetty 8 +Author: Emmanuel Bourg <[email protected]> +Forwarded: no +--- a/SimpleServer/src/main/java/org/apache/uima/simpleserver/util/JettyUtils.java ++++ b/SimpleServer/src/main/java/org/apache/uima/simpleserver/util/JettyUtils.java +@@ -28,11 +28,11 @@ + import javax.servlet.Servlet; + + import org.apache.uima.simpleserver.servlet.SimpleServerServlet; +-import org.mortbay.jetty.Connector; +-import org.mortbay.jetty.Server; +-import org.mortbay.jetty.nio.SelectChannelConnector; +-import org.mortbay.jetty.servlet.ServletHandler; +-import org.mortbay.jetty.servlet.ServletHolder; ++import org.eclipse.jetty.server.Connector; ++import org.eclipse.jetty.server.Server; ++import org.eclipse.jetty.server.nio.SelectChannelConnector; ++import org.eclipse.jetty.servlet.ServletHandler; ++import org.eclipse.jetty.servlet.ServletHolder; + + public class JettyUtils { + +@@ -120,7 +120,7 @@ + return server; + } + +- public static void addServletWithMapping(Server server, Class<?> servlet, String pathSpec) { ++ public static void addServletWithMapping(Server server, Class<? extends Servlet> servlet, String pathSpec) { + ((ServletHandler) server.getHandler()).addServletWithMapping(servlet, pathSpec); + } + diff --git a/debian/patches/series b/debian/patches/series index 42d5aca..ce239ab 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ maven_modules.diff httpclient.diff +jetty-compatibility.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/uima-addons.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
