[jetty9] 37/99: Don't build jetty-spdy module with Java 7

[Jakub Adam]

This is an automated email from the git hooks/post-receive script.

xhaakon-guest pushed a commit to branch master
in repository jetty9.

commit 16e1791b2b08611dd4daa68e221ed6286bf105f0
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Fri Jul 26 19:47:27 2013 +0200

    Don't build jetty-spdy module with Java 7
---
 debian/changelog                     |  6 ++++++
 debian/patches/disable-modules.patch | 15 ++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e14c917..b49cbe7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+jetty8 (8.1.3-8) UNRELEASED; urgency=low
+
+  * Don't build jetty-spdy module with Java 7 (Closes: #717119).
+
+ -- Jakub Adam <jakub.adam at ktknet.cz>  Fri, 26 Jul 2013 19:45:24 +0200
+
 jetty8 (8.1.3-7) unstable; urgency=low
 
   * Removed dependencies on libgnujaf-java.
diff --git a/debian/patches/disable-modules.patch b/debian/patches/disable-modules.patch
index 764f7dd..601fb3c 100644
--- a/debian/patches/disable-modules.patch
+++ b/debian/patches/disable-modules.patch
@@ -3,11 +3,11 @@ Date: Thu, 1 Mar 2012 21:33:06 +0100
 Subject: disable-modules
 
 ---
- pom.xml |   12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
+ pom.xml |   14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index bb07f25..8c37297 100644
+index bb07f25..bb90727 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -379,19 +379,19 @@
@@ -36,3 +36,12 @@ index bb07f25..8c37297 100644
    </modules>
    <dependencyManagement>
      <dependencies>
+@@ -523,7 +523,7 @@
+         <jdk>[1.7,)</jdk>
+       </activation>
+       <modules>
+-        <module>jetty-spdy</module>
++        <!--module>jetty-spdy</module-->
+       </modules>
+     </profile>
+     <profile>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jetty9.git