[maven2-core] 26/38: Removed the dependency on backport-util-concurrent from the poms (Closes: #713371)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository maven2-core.

commit e7097e8c2e337810055e6bea9d8dd0c98586b1e1
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Jun 23 07:55:30 2013 +0000

    Removed the dependency on backport-util-concurrent from the poms (Closes: #713371)
---
 debian/changelog                                   |  8 +++++++
 .../0004-remove-backport-util-concurrent.patch     | 27 ++++++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 03c5183..e210a18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+maven2-core (2.2.1-10) unstable; urgency=low
+
+  * Team upload.
+  * Removed the dependency on backport-util-concurrent from the poms
+    (Closes: #713371)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Sun, 23 Jun 2013 01:25:08 +0200
+
 maven2-core (2.2.1-9) unstable; urgency=low
 
   * Team upload
diff --git a/debian/patches/0004-remove-backport-util-concurrent.patch b/debian/patches/0004-remove-backport-util-concurrent.patch
index 1d6f3e2..0eac647 100644
--- a/debian/patches/0004-remove-backport-util-concurrent.patch
+++ b/debian/patches/0004-remove-backport-util-concurrent.patch
@@ -18,3 +18,30 @@ Forwarded: not-needed
  
  public class DefaultArtifactResolver
      extends AbstractLogEnabled
+--- a/maven-artifact-manager/pom.xml
++++ b/maven-artifact-manager/pom.xml
+@@ -61,10 +61,6 @@
+       <artifactId>wagon-provider-api</artifactId>
+     </dependency>
+     <dependency>
+-      <groupId>backport-util-concurrent</groupId>
+-      <artifactId>backport-util-concurrent</artifactId>
+-    </dependency>
+-    <dependency>
+       <groupId>easymock</groupId>
+       <artifactId>easymock</artifactId>
+       <version>1.2_Java1.3</version>
+--- a/pom.xml
++++ b/pom.xml
+@@ -466,11 +466,6 @@
+         <version>1.5.6</version>
+       </dependency>
+       <dependency>
+-        <groupId>backport-util-concurrent</groupId>
+-        <artifactId>backport-util-concurrent</artifactId>
+-        <version>3.1</version>
+-      </dependency>
+-      <dependency>
+         <groupId>easymock</groupId>
+         <artifactId>easymock</artifactId>
+         <version>1.2_Java1.3</version>

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