This is an automated email from the git hooks/post-receive script. xhaakon-guest pushed a commit to branch master in repository jetty9.
commit 1d3ee4197f104248593dd4ae5c95a9a5a5c00bd7 Author: Jakub Adam <[email protected]> Date: Tue Aug 4 23:23:23 2015 +0200 Refresh patches --- debian/patches/disable-modules.patch | 53 +++++------------------- debian/patches/disable-osgi-tests.patch | 8 ++-- debian/patches/maven-bundle-plugin-version.patch | 6 +-- 3 files changed, 18 insertions(+), 49 deletions(-) diff --git a/debian/patches/disable-modules.patch b/debian/patches/disable-modules.patch index 49701fa..1c22525 100644 --- a/debian/patches/disable-modules.patch +++ b/debian/patches/disable-modules.patch @@ -3,14 +3,14 @@ Date: Thu, 1 Mar 2012 21:33:06 +0100 Subject: disable-modules --- - pom.xml | 26 +++++++++++++------------- - 1 file changed, 13 insertions(+), 13 deletions(-) + pom.xml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml -index 741c4bb..700ab2b 100644 +index 2aaf90d..1ef6e09 100644 --- a/pom.xml +++ b/pom.xml -@@ -507,27 +507,27 @@ +@@ -426,7 +426,7 @@ </repository> </repositories> <modules> @@ -19,47 +19,16 @@ index 741c4bb..700ab2b 100644 <module>jetty-util</module> <module>jetty-jmx</module> <module>jetty-io</module> - <module>jetty-http</module> -- <module>jetty-http2</module> -+ <!--module>jetty-http2</module--> - <module>jetty-continuation</module> - <module>jetty-server</module> -- <module>jetty-xml</module> -+ <!--module>jetty-xml</module--> +@@ -436,7 +436,7 @@ + <module>jetty-xml</module> <module>jetty-security</module> <module>jetty-servlet</module> - <module>jetty-webapp</module> -- <module>jetty-fcgi</module> -- <module>jetty-websocket</module> -- <module>jetty-servlets</module> -- <module>jetty-util-ajax</module> -+ <!--module>jetty-webapp</module--> -+ <!--module>jetty-fcgi</module--> -+ <!--module>jetty-websocket</module--> -+ <!--module>jetty-servlets</module--> -+ <!--module>jetty-util-ajax</module> - <module>apache-jsp</module> - <module>apache-jstl</module> - <module>jetty-maven-plugin</module> -- <module>jetty-jspc-maven-plugin</module> -- <module>jetty-deploy</module> -+ <module>jetty-jspc-maven-plugin</module--> -+ <!--module>jetty-deploy</module> - <module>jetty-start</module> - <module>jetty-plus</module> - <module>jetty-annotations</module> -@@ -538,8 +538,8 @@ - <module>jetty-client</module> - <module>jetty-proxy</module> - <module>jetty-jaspi</module> -- <module>jetty-rewrite</module> -- <module>jetty-nosql</module> -+ <module>jetty-rewrite</module--> -+ <!--module>jetty-nosql</module> - <module>jetty-infinispan</module> - <module>tests</module> - <module>examples</module> -@@ -549,7 +549,7 @@ ++ <!--module>jetty-webapp</module> + <module>jetty-spdy</module> + <module>jetty-fcgi</module> + <module>jetty-websocket</module> +@@ -468,7 +468,7 @@ <module>jetty-monitor</module> <module>jetty-http-spi</module> <module>jetty-osgi</module> diff --git a/debian/patches/disable-osgi-tests.patch b/debian/patches/disable-osgi-tests.patch index 345d861..5becc02 100644 --- a/debian/patches/disable-osgi-tests.patch +++ b/debian/patches/disable-osgi-tests.patch @@ -7,7 +7,7 @@ Subject: disable-osgi-tests 1 file changed, 2 insertions(+) diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml -index 50a3cce..1a8e55e 100644 +index 7dc9926..04d529e 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml @@ -23,10 +23,12 @@ @@ -17,9 +17,9 @@ index 50a3cce..1a8e55e 100644 +<!-- <module>test-jetty-osgi-webapp</module> <module>test-jetty-osgi-context</module> - <module>jetty-osgi-alpn</module> <module>test-jetty-osgi</module> + <module>jetty-osgi-alpn</module> +--> </modules> - <build> - <resources> + <profiles> + <profile> diff --git a/debian/patches/maven-bundle-plugin-version.patch b/debian/patches/maven-bundle-plugin-version.patch index 7d842ed..fbc8a93 100644 --- a/debian/patches/maven-bundle-plugin-version.patch +++ b/debian/patches/maven-bundle-plugin-version.patch @@ -7,14 +7,14 @@ Subject: maven-bundle-plugin-version 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml -index 12e89a2..741c4bb 100644 +index bb6a400..2aaf90d 100644 --- a/pom.xml +++ b/pom.xml -@@ -316,6 +316,7 @@ +@@ -290,6 +290,7 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.5</version> <extensions>true</extensions> <configuration> - <supportedProjectTypes> + <instructions> -- 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
