[maven] 06/08: Updated the version of the maven-ear-plugin to 2.8 in the super pom

[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 d7d32fd43b1d92e3ef44fc7dd0ef7258408abcde
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Dec 9 15:12:41 2015 +0100

    Updated the version of the maven-ear-plugin to 2.8 in the super pom
---
 debian/changelog                    |  1 +
 debian/patches/plugins_version.diff | 11 +++--------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b9e7d6a..340984e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ maven (3.3.9-3) UNRELEASED; urgency=medium
   * Declare that Maven 3.3.9 breaks gradle (<< 2.7-4) (Closes: #805985)
   * Updated the versions of the plugins in the super pom:
     - maven-dependency-plugin: 2.7 -> 2.8 (Closes: #807437)
+    - maven-ear-plugin: 2.3.2 -> 2.8
     - maven-ejb-plugin: 2.2 -> 2.3
     - maven-war-plugin: 2.1.1 -> 2.2
 
diff --git a/debian/patches/plugins_version.diff b/debian/patches/plugins_version.diff
index b4f3cff..e136e4d 100644
--- a/debian/patches/plugins_version.diff
+++ b/debian/patches/plugins_version.diff
@@ -149,20 +149,15 @@ Forwarded: not-needed
                </install>
                <deploy>
                  org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
-@@ -247,16 +247,16 @@
-             <!-- START SNIPPET: ear-lifecycle -->
-             <phases>
-               <generate-resources>
--                org.apache.maven.plugins:maven-ear-plugin:2.8:generate-application-xml
-+                org.apache.maven.plugins:maven-ear-plugin:2.3.2:generate-application-xml
+@@ -250,13 +250,13 @@
+                 org.apache.maven.plugins:maven-ear-plugin:2.8:generate-application-xml
                </generate-resources>
                <process-resources>
 -                org.apache.maven.plugins:maven-resources-plugin:2.6:resources
 +                org.apache.maven.plugins:maven-resources-plugin:2.3:resources
                </process-resources>
                <package>
--                org.apache.maven.plugins:maven-ear-plugin:2.8:ear
-+                org.apache.maven.plugins:maven-ear-plugin:2.3.2:ear
+                 org.apache.maven.plugins:maven-ear-plugin:2.8:ear
                </package>
                <install>
 -                org.apache.maven.plugins:maven-install-plugin:2.4:install

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