This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository activemq.
commit 5fe437193d10efec6ce7350ed20261bd9a8f4ef1 Author: Markus Koschany <[email protected]> Date: Sun Jun 26 15:40:44 2016 +0200 Drop disable-broker-test-dependency.patch because a maven.Ignore rule works fine. --- .../patches/disable-broker-test-dependency.patch | 131 --------------------- debian/patches/series | 1 - 2 files changed, 132 deletions(-) diff --git a/debian/patches/disable-broker-test-dependency.patch b/debian/patches/disable-broker-test-dependency.patch deleted file mode 100644 index 3079ffa..0000000 --- a/debian/patches/disable-broker-test-dependency.patch +++ /dev/null @@ -1,131 +0,0 @@ -From: Markus Koschany <[email protected]> -Date: Sat, 12 Mar 2016 00:18:25 +0100 -Subject: disable broker test dependency - -Disable broker test-jar dependency which would cause a FTBFS because we don't -build the tests. I'm not sure but adding an additional rule to maven.ignoreRules -might achieve the same. ---- - activemq-console/pom.xml | 4 ++-- - activemq-fileserver/pom.xml | 4 ++-- - activemq-kahadb-store/pom.xml | 4 ++-- - activemq-mqtt/pom.xml | 4 ++-- - activemq-ra/pom.xml | 4 ++-- - activemq-spring/pom.xml | 4 ++-- - 6 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/activemq-console/pom.xml b/activemq-console/pom.xml -index 67d1864..9d49a14 100644 ---- a/activemq-console/pom.xml -+++ b/activemq-console/pom.xml -@@ -90,12 +90,12 @@ - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - </dependency> -- <dependency> -+ <!--<dependency> - <groupId>${project.groupId}</groupId> - <artifactId>activemq-broker</artifactId> - <type>test-jar</type> - <scope>test</scope> -- </dependency> -+ </dependency>--> - - <!-- needed for TestPurgeCommand, but not for compile. --> - <dependency> -diff --git a/activemq-fileserver/pom.xml b/activemq-fileserver/pom.xml -index 332a54d..3a51cd9 100755 ---- a/activemq-fileserver/pom.xml -+++ b/activemq-fileserver/pom.xml -@@ -82,12 +82,12 @@ - <type>test-jar</type> - <scope>test</scope> - </dependency> -- <dependency> -+ <!--<dependency> - <groupId>${project.groupId}</groupId> - <artifactId>activemq-broker</artifactId> - <type>test-jar</type> - <scope>test</scope> -- </dependency> -+ </dependency>--> - <dependency> - <groupId>org.eclipse.jetty.aggregate</groupId> - <artifactId>jetty-all</artifactId> -diff --git a/activemq-kahadb-store/pom.xml b/activemq-kahadb-store/pom.xml -index 98777c0..9f19437 100755 ---- a/activemq-kahadb-store/pom.xml -+++ b/activemq-kahadb-store/pom.xml -@@ -119,12 +119,12 @@ - <!-- =============================== --> - <!-- Testing Dependencies --> - <!-- =============================== --> -- <dependency> -+ <!--<dependency> - <groupId>${project.groupId}</groupId> - <artifactId>activemq-broker</artifactId> - <type>test-jar</type> - <scope>test</scope> -- </dependency> -+ </dependency>--> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> -diff --git a/activemq-mqtt/pom.xml b/activemq-mqtt/pom.xml -index 8819b32..b663b5f 100755 ---- a/activemq-mqtt/pom.xml -+++ b/activemq-mqtt/pom.xml -@@ -129,12 +129,12 @@ - <!-- =============================== --> - <!-- Testing Dependencies --> - <!-- =============================== --> -- <dependency> -+ <!--<dependency> - <groupId>${project.groupId}</groupId> - <artifactId>activemq-broker</artifactId> - <type>test-jar</type> - <scope>test</scope> -- </dependency> -+ </dependency>--> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-kahadb-store</artifactId> -diff --git a/activemq-ra/pom.xml b/activemq-ra/pom.xml -index 36a764d..0d48312 100755 ---- a/activemq-ra/pom.xml -+++ b/activemq-ra/pom.xml -@@ -52,13 +52,13 @@ - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId> - </dependency> -- <dependency> -+ <!--<dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-broker</artifactId> - <version>${project.version}</version> - <classifier>tests</classifier> - <scope>test</scope> -- </dependency> -+ </dependency>--> - <dependency> - <groupId>org.jmock</groupId> - <artifactId>jmock-junit4</artifactId> -diff --git a/activemq-spring/pom.xml b/activemq-spring/pom.xml -index 7f411ee..5ee43c5 100755 ---- a/activemq-spring/pom.xml -+++ b/activemq-spring/pom.xml -@@ -162,12 +162,12 @@ - <artifactId>spring-test</artifactId> - <scope>test</scope> - </dependency> -- <dependency> -+ <!--<dependency> - <groupId>${project.groupId}</groupId> - <artifactId>activemq-broker</artifactId> - <type>test-jar</type> - <scope>test</scope> -- </dependency> -+ </dependency>--> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> diff --git a/debian/patches/series b/debian/patches/series index cbacda5..e82db40 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ exclude-jmdns.patch -disable-broker-test-dependency.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 _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
