This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jetty9.
commit 648013c51f46bcc9ffb47d264f0e8c706b63809f Author: Emmanuel Bourg <[email protected]> Date: Wed Nov 25 17:26:29 2015 +0100 Ignore the modules with a --ignore parameter in debian/libjetty8-java.poms instead of a patch --- debian/changelog | 2 ++ debian/libjetty8-java.poms | 18 +++++++++++---- debian/maven.ignoreRules | 2 ++ debian/patches/disable-modules.patch | 40 --------------------------------- debian/patches/disable-osgi-tests.patch | 17 -------------- debian/patches/series | 2 -- 6 files changed, 18 insertions(+), 63 deletions(-) diff --git a/debian/changelog b/debian/changelog index 11befae..d61c368 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ jetty8 (8.1.18-2) UNRELEASED; urgency=medium * Replaced the dependency on libasm3-java with libasm4-java and fixed the compatibility with servlets containing Java 8 lambda expressions. * Build with the DH sequencer instead of CDBS + * Ignore the modules with a --ignore parameter in debian/libjetty8-java.poms + instead of a patch -- Emmanuel Bourg <[email protected]> Wed, 25 Nov 2015 09:43:59 +0100 diff --git a/debian/libjetty8-java.poms b/debian/libjetty8-java.poms index a90d0a5..63afeb9 100644 --- a/debian/libjetty8-java.poms +++ b/debian/libjetty8-java.poms @@ -29,16 +29,12 @@ pom.xml --no-parent jetty-aggregate/pom.xml --ignore jetty-continuation/pom.xml --java-lib --usj-name=jetty8-continuation jetty-deploy/pom.xml --java-lib --usj-name=jetty8-deploy -jetty-distribution/pom.xml --ignore -jetty-http-spi/pom.xml --java-lib --usj-name=jetty8-http-spi jetty-http/pom.xml --java-lib --usj-name=jetty8-http jetty-io/pom.xml --java-lib --usj-name=jetty8-io jetty-jaspi/pom.xml --java-lib --usj-name=jetty8-jaspi jetty-jmx/pom.xml --java-lib --usj-name=jetty8-jmx jetty-jsp/pom.xml --java-lib --usj-name=jetty8-jsp jetty-nested/pom.xml --java-lib --usj-name=jetty8-nested -jetty-nosql/pom.xml --ignore -jetty-osgi/pom.xml --ignore jetty-overlay-deployer/pom.xml --java-lib --usj-name=jetty8-overlay-deployer jetty-policy/pom.xml --java-lib --usj-name=jetty8-policy jetty-rewrite/pom.xml --java-lib --usj-name=jetty8-rewrite @@ -60,3 +56,17 @@ jetty-jndi/pom.xml --java-lib --usj-name=jetty8-jndi - jetty-monitor/pom.xml --java-lib --usj-name=jetty8-monitor --package=libjetty8-extra-java jetty-plus/pom.xml --java-lib --usj-name=jetty8-plus --package=libjetty8-extra-java test-jetty-servlet/pom.xml --java-lib --usj-name=jetty8-test-servlet --package=libjetty8-extra-java + +# Ignored +jetty-distribution/pom.xml --ignore +jetty-http-spi/pom.xml --ignore +jetty-nosql/pom.xml --ignore +jetty-osgi/pom.xml --ignore +jetty-spdy/pom.xml --ignore +test-continuation/pom.xml --ignore +test-continuation-jetty6/pom.xml --ignore +test-jetty-webapp/pom.xml --ignore +test-jetty-nested/pom.xml --ignore +example-jetty-embedded/pom.xml --ignore +example-async-rest/pom.xml --ignore +tests/pom.xml --ignore diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index 44505e5..04ba6c4 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -1,4 +1,6 @@ + com.mycila.maven-license-plugin maven-license-plugin * * * * +com.sun.net.httpserver http * * * * org.apache.derby derby * * * * org.apache.maven.plugins maven-assembly-plugin * * * * org.apache.maven.plugins maven-dependency-plugin * * * * diff --git a/debian/patches/disable-modules.patch b/debian/patches/disable-modules.patch deleted file mode 100644 index c60a6a0..0000000 --- a/debian/patches/disable-modules.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: Jakub Adam <[email protected]> -Date: Thu, 1 Mar 2012 21:33:06 +0100 -Subject: disable-modules ---- a/pom.xml -+++ b/pom.xml -@@ -426,19 +426,19 @@ - <module>jetty-start</module> - <module>jetty-nested</module> - <module>jetty-overlay-deployer</module> -- <module>jetty-osgi</module> -+ <!--module>jetty-osgi</module> - <module>jetty-nosql</module> -- <module>jetty-http-spi</module> -+ <module>jetty-http-spi</module--> - <module>jetty-jsp</module> -- <module>jetty-distribution</module> -- <module>test-continuation</module> -+ <!--module>jetty-distribution</module> -+ <module>test-continuation</module--> - <!--module>test-continuation-jetty6</module--> - <module>test-jetty-servlet</module> -- <module>test-jetty-webapp</module> -+ <!--module>test-jetty-webapp</module> - <module>test-jetty-nested</module> - <module>example-jetty-embedded</module> - <module>example-async-rest</module> -- <module>tests</module> -+ <module>tests</module--> - </modules> - <dependencyManagement> - <dependencies> -@@ -580,7 +580,7 @@ - <jdk>[1.7,)</jdk> - </activation> - <modules> -- <module>jetty-spdy</module> -+ <!--module>jetty-spdy</module--> - </modules> - </profile> - <profile> diff --git a/debian/patches/disable-osgi-tests.patch b/debian/patches/disable-osgi-tests.patch deleted file mode 100644 index 14104d8..0000000 --- a/debian/patches/disable-osgi-tests.patch +++ /dev/null @@ -1,17 +0,0 @@ -From: Jakub Adam <[email protected]> -Date: Thu, 1 Mar 2012 21:29:17 +0100 -Subject: disable-osgi-tests ---- a/jetty-osgi/pom.xml -+++ b/jetty-osgi/pom.xml -@@ -24,9 +24,11 @@ - <module>jetty-osgi-boot-jsp</module> - <module>jetty-osgi-boot-warurl</module> - <module>jetty-osgi-httpservice</module> -+<!-- - <module>test-jetty-osgi-webapp</module> - <module>test-jetty-osgi-context</module> - <module>test-jetty-osgi</module> -+--> - </modules> - <build> - <resources> diff --git a/debian/patches/series b/debian/patches/series index 3c2fefa..2260846 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,5 @@ annotations-find-asm-commons.patch -disable-osgi-tests.patch maven-bundle-plugin-version.patch -disable-modules.patch aggregate-doc.patch adjust-configuration.patch fix-servletcontext-security-check.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jetty9.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
