[maven] 13/16: No longer add the plexus-container-default dependency to maven-model-builder

[Emmanuel Bourg]

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

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

commit a5e0f6d71f6cc226a304c5e6fbb2911ee8cf51c8
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jul 7 00:05:16 2015 +0200

    No longer add the plexus-container-default dependency to maven-model-builder
---
 debian/changelog                     |  2 ++
 debian/patches/add_dependencies.diff | 13 -------------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6bc3056..c33fe51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ maven (3.1.1-1) UNRELEASED; urgency=medium
     - Removed the no_aop classifier from the sisu-guice dependency
     - Updated the Maven version in the rules of debian/maven.buildRules
     - New build dependencies on liblogback-java and libmockito-java
+    - No longer add the plexus-container-default dependency
+      to maven-model-builder
   * Moved the libraries to a separate libmaven3-core-java package
   * Removed the unused dependencies on commons-codec, commons-httpclient
     and commons-logging
diff --git a/debian/patches/add_dependencies.diff b/debian/patches/add_dependencies.diff
index 6204572..184aab7 100644
--- a/debian/patches/add_dependencies.diff
+++ b/debian/patches/add_dependencies.diff
@@ -3,19 +3,6 @@ Description: Explicit dependency on plexus-container-default
 Author: Damien Raude-Morvan <drazzib at debian.org>
 Last-Update: 2012-01-21
 Forwarded: no
---- a/maven-model-builder/pom.xml
-+++ b/maven-model-builder/pom.xml
-@@ -44,6 +44,10 @@
-       <artifactId>plexus-component-annotations</artifactId>
-     </dependency>
-     <dependency>
-+      <groupId>org.codehaus.plexus</groupId>
-+      <artifactId>plexus-container-default</artifactId>
-+    </dependency>
-+    <dependency>
-       <groupId>org.apache.maven</groupId>
-       <artifactId>maven-model</artifactId>
-     </dependency>
 --- a/pom.xml
 +++ b/pom.xml
 @@ -213,6 +213,11 @@

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