[maven] 05/08: Updated the version of the maven-war-plugin to 2.2 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 f620290955bf0f7376a467d0b45d25894d7c4877
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Dec 9 14:45:16 2015 +0100

    Updated the version of the maven-war-plugin to 2.2 in the super pom
---
 debian/changelog                    | 1 +
 debian/patches/plugins_version.diff | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2c6b3bd..b9e7d6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ maven (3.3.9-3) UNRELEASED; urgency=medium
   * Updated the versions of the plugins in the super pom:
     - maven-dependency-plugin: 2.7 -> 2.8 (Closes: #807437)
     - maven-ejb-plugin: 2.2 -> 2.3
+    - maven-war-plugin: 2.1.1 -> 2.2
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 09 Dec 2015 13:05:07 +0100
 
diff --git a/debian/patches/plugins_version.diff b/debian/patches/plugins_version.diff
index 0f1802f..b4f3cff 100644
--- a/debian/patches/plugins_version.diff
+++ b/debian/patches/plugins_version.diff
@@ -141,8 +141,7 @@ Forwarded: not-needed
 +                org.apache.maven.plugins:maven-surefire-plugin:2.17:test
                </test>
                <package>
--                org.apache.maven.plugins:maven-war-plugin:2.2:war
-+                org.apache.maven.plugins:maven-war-plugin:2.1.1:war
+                 org.apache.maven.plugins:maven-war-plugin:2.2:war
                </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