This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jetty8.
commit 8aa96c3f5e499b4f96669c5478676ac6fd3532a3 Author: Emmanuel Bourg <[email protected]> Date: Tue May 17 11:20:43 2016 +0200 Removed the dependency on libjetty-java and dropped support for Jetty 6 continuations --- debian/changelog | 2 ++ debian/control | 1 - debian/maven.ignoreRules | 1 + debian/maven.rules | 1 - .../patches/drop-jetty6-continuations-support.patch | 20 ++++++++++++++++++++ debian/patches/series | 1 + 6 files changed, 24 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 40966d6..f594150 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ jetty8 (8.1.19-2) UNRELEASED; urgency=medium * Team upload. * Depend on libasm-java (>= 5.0) instead of libasm4-java + * Removed the dependency on libjetty-java and dropped support + for Jetty 6 continuations * Standards-Version updated to 3.9.8 (no changes) * Use a secure Vcs-Git URL diff --git a/debian/control b/debian/control index b370130..4ac8073 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,6 @@ Build-Depends: ant-optional, libbuild-helper-maven-plugin-java, libgeronimo-jta-1.1-spec-java, libmail-java, - libjetty-java, libjstl1.1-java, libmaven-bundle-plugin-java, libmaven-javadoc-plugin-java, diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index 04ba6c4..04b0c39 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -20,4 +20,5 @@ org.eclipse.jetty.orbit org.apache.taglibs.standard.glassfish * * * * org.eclipse.jetty.orbit org.eclipse.jdt.core * * * * org.eclipse.jetty.toolchain jetty-test-helper * * * * org.eclipse.jetty.toolchain jetty-version-maven-plugin * * * * +org.mortbay.jetty jetty-util * * * * org.ops4j.pax.exam * * * * * diff --git a/debian/maven.rules b/debian/maven.rules index 07c6e6e..694cf1e 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -17,4 +17,3 @@ s/org.eclipse.jetty.orbit/javax.servlet.jsp/ s/javax.servlet.jsp/jsp-api/ jar s/ s/org.eclipse.jetty.orbit/javax.servlet/ s/javax.servlet.jsp.jstl/jstl/ jar s/.*/1.1/ * * s/org.eclipse.jetty.orbit/org.apache.tomcat/ s/org.apache.jasper.glassfish/tomcat-jasper/ jar s/.*/debian/ * * s/org.mortbay.jetty/javax.servlet/ servlet-api jar s/.*/3.0/ * * -org.mortbay.jetty jetty-util * s/6\..*/6.x/ * * diff --git a/debian/patches/drop-jetty6-continuations-support.patch b/debian/patches/drop-jetty6-continuations-support.patch new file mode 100644 index 0000000..6d2ef91 --- /dev/null +++ b/debian/patches/drop-jetty6-continuations-support.patch @@ -0,0 +1,20 @@ +Description: Drop the Jetty 6 continuation support. +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/jetty-continuation/pom.xml ++++ b/jetty-continuation/pom.xml +@@ -15,6 +15,14 @@ + <build> + <plugins> + <plugin> ++ <artifactId>maven-compiler-plugin</artifactId> ++ <configuration> ++ <excludes> ++ <exclude>**/Jetty6*.java</exclude> ++ </excludes> ++ </configuration> ++ </plugin> ++ <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> diff --git a/debian/patches/series b/debian/patches/series index 2260846..b333359 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ adjust-configuration.patch fix-servletcontext-security-check.patch initialize-tomcat-jasper.patch asm-upgrade.patch +drop-jetty6-continuations-support.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jetty8.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
