[activemq] 09/13: Drop disable-jetty-all-dependency.patch and ignore jetty-all artifact instead.

[Markus Koschany]

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

apo pushed a commit to branch master
in repository activemq.

commit d3f29dc80a1b20c6ea25069a285ff85f7a9c7e6c
Author: Markus Koschany <apo at debian.org>
Date:   Sun Jun 26 16:00:40 2016 +0200

    Drop disable-jetty-all-dependency.patch and ignore jetty-all artifact instead.
---
 debian/maven.ignoreRules                          |  1 +
 debian/patches/disable-jetty-all-dependency.patch | 26 -----------------------
 debian/patches/series                             |  1 -
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 5b835c5..bbd240e 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -51,6 +51,7 @@ org.eclipse.paho * * * *
 org.linkedin * * * *
 org.jencks * * * *
 org.springframework.osgi * * * *
+org.eclipse.jetty.aggregate jetty-all * * * *
 
 # Replaced by glassfish-j2ee
 org.apache.geronimo.specs geronimo-jta_1.0.1B_spec * * * *
diff --git a/debian/patches/disable-jetty-all-dependency.patch b/debian/patches/disable-jetty-all-dependency.patch
deleted file mode 100644
index b2250ef..0000000
--- a/debian/patches/disable-jetty-all-dependency.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Tue, 15 Mar 2016 19:06:49 +0100
-Subject: disable jetty-all dependency
-
----
- activemq-fileserver/pom.xml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/activemq-fileserver/pom.xml b/activemq-fileserver/pom.xml
-index 3a51cd9..85a7f70 100755
---- a/activemq-fileserver/pom.xml
-+++ b/activemq-fileserver/pom.xml
-@@ -88,11 +88,11 @@
-       <type>test-jar</type>
-       <scope>test</scope>
-     </dependency>-->
--    <dependency>
-+    <!--<dependency>
-       <groupId>org.eclipse.jetty.aggregate</groupId>
-       <artifactId>jetty-all</artifactId>
-       <scope>test</scope>
--    </dependency>
-+    </dependency>-->
-     <dependency>
-       <groupId>org.slf4j</groupId>
-       <artifactId>slf4j-log4j12</artifactId>
diff --git a/debian/patches/series b/debian/patches/series
index e82db40..7738535 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 exclude-jmdns.patch
-disable-jetty-all-dependency.patch
 init-debian-default-values.patch
 activemq-spring.patch

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