[maven] 01/04: Removed add_dependencies.diff (no longer required)

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Feb 17 15:10:37 GMT 2016


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

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

commit 307988b80bde84365336940b83b0bf6508965b53
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Feb 17 12:04:49 2016 +0100

    Removed add_dependencies.diff (no longer required)
---
 debian/changelog                     |  7 +++++++
 debian/patches/add_dependencies.diff | 19 -------------------
 debian/patches/series                |  1 -
 3 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 533d249..258a139 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+maven (3.3.9-4) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Removed add_dependencies.diff (no longer required)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 17 Feb 2016 12:04:21 +0100
+
 maven (3.3.9-3) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/add_dependencies.diff b/debian/patches/add_dependencies.diff
deleted file mode 100644
index d424dab..0000000
--- a/debian/patches/add_dependencies.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Explicit dependency on plexus-container-default
- since FTBFS otherwise.
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2012-01-21
-Forwarded: no
---- a/pom.xml
-+++ b/pom.xml
-@@ -258,6 +258,11 @@
-       </dependency>
-       <dependency>
-         <groupId>org.codehaus.plexus</groupId>
-+        <artifactId>plexus-container-default</artifactId>
-+        <version>${plexusVersion}</version>
-+      </dependency>
-+      <dependency>
-+        <groupId>org.codehaus.plexus</groupId>
-         <artifactId>plexus-classworlds</artifactId>
-         <version>${classWorldsVersion}</version>
-       </dependency>
diff --git a/debian/patches/series b/debian/patches/series
index 1d170ec..e7c38f1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 plugins_version.diff
 dep_versions.diff
-add_dependencies.diff
 modello-configuration.patch
 build-offline.patch

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



More information about the pkg-java-commits mailing list