This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository activemq.
commit 113ed17f7a22350615b430ea0589181b82b01b8b Author: Markus Koschany <[email protected]> Date: Sat Mar 19 15:04:42 2016 +0100 Add disable-org.linkedin-dependencies.patch --- .../disable-org.linkedin-dependencies.patch | 30 ++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 31 insertions(+) diff --git a/debian/patches/disable-org.linkedin-dependencies.patch b/debian/patches/disable-org.linkedin-dependencies.patch new file mode 100644 index 0000000..4092371 --- /dev/null +++ b/debian/patches/disable-org.linkedin-dependencies.patch @@ -0,0 +1,30 @@ +From: Markus Koschany <[email protected]> +Date: Sat, 19 Mar 2016 15:04:23 +0100 +Subject: disable org.linkedin dependencies + +--- + activemq-spring/pom.xml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/activemq-spring/pom.xml b/activemq-spring/pom.xml +index 7f411ee..13e188f 100755 +--- a/activemq-spring/pom.xml ++++ b/activemq-spring/pom.xml +@@ -87,7 +87,7 @@ + <version>${hawtdispatch-version}</version> + <scope>provided</scope> + </dependency> +- <dependency> ++ <!--<dependency> + <groupId>org.linkedin</groupId> + <artifactId>org.linkedin.zookeeper-impl</artifactId> + <version>${linkedin-zookeeper-version}</version> +@@ -98,7 +98,7 @@ + <artifactId>org.linkedin.util-core</artifactId> + <version>${linkedin-zookeeper-version}</version> + <scope>provided</scope> +- </dependency> ++ </dependency>--> + <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> diff --git a/debian/patches/series b/debian/patches/series index 9094414..6d8c29d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ exclude-jmdns.patch disable-broker-test-dependency.patch disable-jetty-all-dependency.patch init-debian-default-values.patch +disable-org.linkedin-dependencies.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
