[jetty9] 46/99: Refreshed the patches

[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 5889d63b6b7e9e686a82223e2eb24ecc2a307fec
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jul 29 15:48:52 2014 +0200

    Refreshed the patches
---
 debian/changelog                                  |  7 +++++--
 debian/maven.ignoreRules                          |  1 +
 debian/patches/aggregate-doc.patch                |  9 +--------
 debian/patches/annotations-find-asm-commons.patch |  4 +---
 debian/patches/disable-modules.patch              | 11 ++---------
 debian/patches/disable-osgi-tests.patch           | 16 ++++++----------
 debian/patches/maven-bundle-plugin-version.patch  |  9 +--------
 7 files changed, 17 insertions(+), 40 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 18fe563..28f05d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
-jetty8 (8.1.3-10) UNRELEASED; urgency=medium
+jetty8 (8.1.15-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Refreshed the patches
+    - Ignore the Maven dependency on the Mycila maven-license-plugin
   * debian/watch: Watch the tags from the Git repository
 
- -- Emmanuel Bourg <ebourg at apache.org>  Wed, 30 Jul 2014 17:14:53 +0200
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 30 Jul 2014 16:01:22 +0200
 
 jetty8 (8.1.3-9) unstable; urgency=low
 
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 549ece6..0d2445a 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1,4 +1,5 @@
 * maven-release-plugin * * * *
+com.mycila.maven-license-plugin maven-license-plugin * * * *
 org.apache.derby derby * * * *
 org.apache.maven.plugins maven-assembly-plugin * * * *
 org.apache.maven.plugins maven-dependency-plugin * * * *
diff --git a/debian/patches/aggregate-doc.patch b/debian/patches/aggregate-doc.patch
index ab5d33f..a4f1591 100644
--- a/debian/patches/aggregate-doc.patch
+++ b/debian/patches/aggregate-doc.patch
@@ -1,16 +1,9 @@
 From: Jakub Adam <jakub.adam at ktknet.cz>
 Date: Thu, 12 Apr 2012 22:46:39 +0200
 Subject: aggregate-doc
-
----
- pom.xml |    2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/pom.xml b/pom.xml
-index 9933028..571e228 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -281,6 +281,8 @@
+@@ -315,6 +315,8 @@
            <groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-javadoc-plugin</artifactId>
            <configuration>
diff --git a/debian/patches/annotations-find-asm-commons.patch b/debian/patches/annotations-find-asm-commons.patch
index 7317350..8a3eafe 100644
--- a/debian/patches/annotations-find-asm-commons.patch
+++ b/debian/patches/annotations-find-asm-commons.patch
@@ -6,11 +6,9 @@ Subject: annotations-find-asm-commons
  jetty-annotations/pom.xml |    5 +++++
  1 files changed, 5 insertions(+), 0 deletions(-)
 
-diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml
-index 9939183..950385c 100644
 --- a/jetty-annotations/pom.xml
 +++ b/jetty-annotations/pom.xml
-@@ -99,5 +99,10 @@
+@@ -105,5 +105,10 @@
        <groupId>org.eclipse.jetty.orbit</groupId>
        <artifactId>org.objectweb.asm</artifactId>
      </dependency>
diff --git a/debian/patches/disable-modules.patch b/debian/patches/disable-modules.patch
index 601fb3c..a39532f 100644
--- a/debian/patches/disable-modules.patch
+++ b/debian/patches/disable-modules.patch
@@ -1,16 +1,9 @@
 From: Jakub Adam <jakub.adam at ktknet.cz>
 Date: Thu, 1 Mar 2012 21:33:06 +0100
 Subject: disable-modules
-
----
- pom.xml |   14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/pom.xml b/pom.xml
-index bb07f25..bb90727 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -379,19 +379,19 @@
+@@ -412,19 +412,19 @@
      <module>jetty-start</module>
      <module>jetty-nested</module>
      <module>jetty-overlay-deployer</module>
@@ -36,7 +29,7 @@ index bb07f25..bb90727 100644
    </modules>
    <dependencyManagement>
      <dependencies>
-@@ -523,7 +523,7 @@
+@@ -566,7 +566,7 @@
          <jdk>[1.7,)</jdk>
        </activation>
        <modules>
diff --git a/debian/patches/disable-osgi-tests.patch b/debian/patches/disable-osgi-tests.patch
index ea91109..14104d8 100644
--- a/debian/patches/disable-osgi-tests.patch
+++ b/debian/patches/disable-osgi-tests.patch
@@ -1,21 +1,17 @@
 From: Jakub Adam <jakub.adam at ktknet.cz>
 Date: Thu, 1 Mar 2012 21:29:17 +0100
 Subject: disable-osgi-tests
-
----
- jetty-osgi/pom.xml |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml
-index 428cd22..ab23218 100644
 --- a/jetty-osgi/pom.xml
 +++ b/jetty-osgi/pom.xml
-@@ -24,7 +24,7 @@
+@@ -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</module>
-+    <!--module>test-jetty-osgi</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/maven-bundle-plugin-version.patch b/debian/patches/maven-bundle-plugin-version.patch
index d671021..a204777 100644
--- a/debian/patches/maven-bundle-plugin-version.patch
+++ b/debian/patches/maven-bundle-plugin-version.patch
@@ -1,16 +1,9 @@
 From: Jakub Adam <jakub.adam at ktknet.cz>
 Date: Thu, 1 Mar 2012 21:32:54 +0100
 Subject: maven-bundle-plugin-version
-
----
- pom.xml |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/pom.xml b/pom.xml
-index 1e872a8..86d79e5 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -233,6 +233,7 @@
+@@ -268,6 +268,7 @@
          <plugin>
            <groupId>org.apache.felix</groupId>
            <artifactId>maven-bundle-plugin</artifactId>

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