[pkg-java] r14174 - in trunk/maven2-core/debian: . patches

[Miguel Landaeta]

Author: nomadium-guest
Date: 2011-08-14 22:03:53 +0000 (Sun, 14 Aug 2011)
New Revision: 14174

Removed:
   trunk/maven2-core/debian/patches/0004-update-maven-antrun-plugin.patch
Modified:
   trunk/maven2-core/debian/changelog
   trunk/maven2-core/debian/patches/0002-update-plugin-versions.patch
   trunk/maven2-core/debian/patches/series
Log:
* Team upload.
* Update maven-plugin-plugin version from 2.5 to 2.8.


Modified: trunk/maven2-core/debian/changelog
===================================================================
--- trunk/maven2-core/debian/changelog	2011-08-14 22:01:37 UTC (rev 14173)
+++ trunk/maven2-core/debian/changelog	2011-08-14 22:03:53 UTC (rev 14174)
@@ -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.

Modified: trunk/maven2-core/debian/patches/0002-update-plugin-versions.patch
===================================================================
--- trunk/maven2-core/debian/patches/0002-update-plugin-versions.patch	2011-08-14 22:01:37 UTC (rev 14173)
+++ trunk/maven2-core/debian/patches/0002-update-plugin-versions.patch	2011-08-14 22:03:53 UTC (rev 14174)
@@ -10,7 +10,12 @@
 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 @@
           <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 @@
           </plugin>
         </plugins>
       </pluginManagement>
--- 

Deleted: trunk/maven2-core/debian/patches/0004-update-maven-antrun-plugin.patch
===================================================================
--- trunk/maven2-core/debian/patches/0004-update-maven-antrun-plugin.patch	2011-08-14 22:01:37 UTC (rev 14173)
+++ trunk/maven2-core/debian/patches/0004-update-maven-antrun-plugin.patch	2011-08-14 22:03:53 UTC (rev 14174)
@@ -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>

Modified: trunk/maven2-core/debian/patches/series
===================================================================
--- trunk/maven2-core/debian/patches/series	2011-08-14 22:01:37 UTC (rev 14173)
+++ trunk/maven2-core/debian/patches/series	2011-08-14 22:03:53 UTC (rev 14174)
@@ -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