[maven2-core] 19/38: * Team upload. * Update maven-plugin-plugin version from 2.5 to 2.8.

[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 4d497dacff730b3fa432c1de159d7c3e4a4e4d12
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Sun Aug 14 22:03:53 2011 +0000

    * Team upload.
    * Update maven-plugin-plugin version from 2.5 to 2.8.
---
 debian/changelog                                     |  7 +++++++
 debian/patches/0002-update-plugin-versions.patch     | 10 +++++++---
 debian/patches/0004-update-maven-antrun-plugin.patch | 16 ----------------
 debian/patches/series                                |  1 -
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5a12eff..56b86ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+maven2-core (2.2.1-6) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Update maven-plugin-plugin version from 2.5 to 2.8.
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Sun, 14 Aug 2011 14:51:42 -0430
+
 maven2-core (2.2.1-5) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/patches/0002-update-plugin-versions.patch b/debian/patches/0002-update-plugin-versions.patch
index f9013d6..79b429d 100644
--- a/debian/patches/0002-update-plugin-versions.patch
+++ b/debian/patches/0002-update-plugin-versions.patch
@@ -10,7 +10,12 @@ diff --git a/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0
 index 00e84c1..1a036e7 100644
 --- 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
-@@ -76,11 +76,11 @@ under the License.
+@@ -72,15 +72,15 @@ under the License.
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+-           <version>1.3</version>
++           <version>1.6</version>
           </plugin>       
           <plugin>
             <artifactId>maven-assembly-plugin</artifactId>
@@ -62,7 +67,7 @@ index 00e84c1..1a036e7 100644
           <plugin>
             <artifactId>maven-plugin-plugin</artifactId>
 -           <version>2.4.3</version>
-+           <version>2.5</version>
++           <version>2.8</version>
           </plugin>
           <plugin>
             <artifactId>maven-rar-plugin</artifactId>
@@ -84,4 +89,3 @@ index 00e84c1..1a036e7 100644
           </plugin>
         </plugins>
       </pluginManagement>
--- 
diff --git a/debian/patches/0004-update-maven-antrun-plugin.patch b/debian/patches/0004-update-maven-antrun-plugin.patch
deleted file mode 100644
index 2b5aebc..0000000
--- a/debian/patches/0004-update-maven-antrun-plugin.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Update version of maven-antrun-plugin
-Author: Miguel Landaeta <miguel at miguel.cc>
-Forwarded: no
-Last-Update: 2011-08-02
-
---- maven2-core-2.2.1.orig/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
-+++ maven2-core-2.2.1/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
-@@ -72,7 +72,7 @@ under the License.
-        <plugins>
-          <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
--           <version>1.3</version>
-+           <version>1.6</version>
-          </plugin>       
-          <plugin>
-            <artifactId>maven-assembly-plugin</artifactId>
diff --git a/debian/patches/series b/debian/patches/series
index 50d9ba7..b8a6a90 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0001-remove-webdav-support.patch
 0002-update-plugin-versions.patch
 0003-update-plexus-utils.patch
-0004-update-maven-antrun-plugin.patch

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