[maven2-core] 21/38: * Team upload. * Update maven-war-plugin version from 2.1-beta-1 to 2.1.1.

[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 dc8a33b051c3e3e313ed883dd03372b667bdd3df
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Tue Oct 11 21:47:45 2011 +0000

    * Team upload.
    * Update maven-war-plugin version from 2.1-beta-1 to 2.1.1.
---
 debian/changelog                                 |  7 +++++++
 debian/patches/0002-update-plugin-versions.patch | 18 +++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d923246..83ae39e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+maven2-core (2.2.1-7) unstable; urgency=low
+
+  * Team upload.
+  * Update maven-war-plugin version from 2.1-beta-1 to 2.1.1.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 11 Oct 2011 23:28:23 +0200
+
 maven2-core (2.2.1-6) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/patches/0002-update-plugin-versions.patch b/debian/patches/0002-update-plugin-versions.patch
index 79b429d..f15b57c 100644
--- a/debian/patches/0002-update-plugin-versions.patch
+++ b/debian/patches/0002-update-plugin-versions.patch
@@ -6,11 +6,11 @@ Subject: [PATCH] update plugin versions
  .../org/apache/maven/project/pom-4.0.0.xml         |   20 ++++++++++----------
  1 files changed, 10 insertions(+), 10 deletions(-)
 
-diff --git a/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml b/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
-index 00e84c1..1a036e7 100644
+Index: b/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
+===================================================================
 --- a/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
 +++ b/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
-@@ -72,15 +72,15 @@ under the License.
+@@ -72,15 +72,15 @@
         <plugins>
           <plugin>
             <artifactId>maven-antrun-plugin</artifactId>
@@ -29,7 +29,7 @@ index 00e84c1..1a036e7 100644
           </plugin>
           <plugin>
             <artifactId>maven-compiler-plugin</artifactId>
-@@ -88,7 +88,7 @@ under the License.
+@@ -88,7 +88,7 @@
           </plugin>
           <plugin>
             <artifactId>maven-dependency-plugin</artifactId>
@@ -38,7 +38,7 @@ index 00e84c1..1a036e7 100644
           </plugin>
           <plugin>
             <artifactId>maven-deploy-plugin</artifactId>
-@@ -96,15 +96,15 @@ under the License.
+@@ -96,15 +96,15 @@
           </plugin>
           <plugin>
             <artifactId>maven-ear-plugin</artifactId>
@@ -57,7 +57,7 @@ index 00e84c1..1a036e7 100644
           </plugin>
           <plugin>
             <artifactId>maven-jar-plugin</artifactId>
-@@ -112,11 +112,11 @@ under the License.
+@@ -112,11 +112,11 @@
           </plugin>
           <plugin>
             <artifactId>maven-javadoc-plugin</artifactId>
@@ -71,7 +71,7 @@ index 00e84c1..1a036e7 100644
           </plugin>
           <plugin>
             <artifactId>maven-rar-plugin</artifactId>
-@@ -132,7 +132,7 @@ under the License.
+@@ -132,7 +132,7 @@
           </plugin>
           <plugin>
             <artifactId>maven-site-plugin</artifactId>
@@ -80,12 +80,12 @@ index 00e84c1..1a036e7 100644
           </plugin>
           <plugin>
             <artifactId>maven-source-plugin</artifactId>
-@@ -144,7 +144,7 @@ under the License.
+@@ -144,7 +144,7 @@
           </plugin>
           <plugin>
             <artifactId>maven-war-plugin</artifactId>
 -           <version>2.1-alpha-2</version>
-+           <version>2.1-beta-1</version>
++           <version>2.1.1</version>
           </plugin>
         </plugins>
       </pluginManagement>

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