[pkg-java] r7614 - in trunk/maven-archiver/debian: . patches

[twerner at alioth.debian.org]

Author: twerner
Date: 2008-12-09 21:14:13 +0000 (Tue, 09 Dec 2008)
New Revision: 7614

Added:
   trunk/maven-archiver/debian/patches/
   trunk/maven-archiver/debian/patches/pom.diff
   trunk/maven-archiver/debian/patches/series
Log:
patch pom.xml


Added: trunk/maven-archiver/debian/patches/pom.diff
===================================================================
--- trunk/maven-archiver/debian/patches/pom.diff	                        (rev 0)
+++ trunk/maven-archiver/debian/patches/pom.diff	2008-12-09 21:14:13 UTC (rev 7614)
@@ -0,0 +1,86 @@
+Index: maven-archiver-2.3/pom.xml
+===================================================================
+--- maven-archiver-2.3.orig/pom.xml	2008-12-09 22:12:58.000000000 +0100
++++ maven-archiver-2.3/pom.xml	2008-12-09 21:35:11.000000000 +0100
+@@ -18,11 +18,13 @@
+   under the License.
+ -->
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
++  <!--
+   <parent>
+     <groupId>org.apache.maven.shared</groupId>
+     <artifactId>maven-shared-components</artifactId>
+     <version>8</version>
+   </parent>
++  -->
+   <modelVersion>4.0.0</modelVersion>
+   <groupId>org.apache.maven</groupId>
+   <artifactId>maven-archiver</artifactId>
+@@ -34,28 +36,44 @@
+     <url>http://svn.apache.org/viewcvs.cgi/maven/shared/tags/maven-archiver-2.3</url>
+   </scm>
+   <build>
++    <pluginManagement>
++      <plugins>
++	<plugin>
++	  <groupId>org.apache.maven.plugins</groupId>
++	  <artifactId>maven-resources-plugin</artifactId>
++	  <version>2.3</version>
++	</plugin>
++      </plugins>
++    </pluginManagement>
+     <plugins>
++      <!--
+       <plugin>
+         <artifactId>maven-source-plugin</artifactId>
+         <version>2.0.4</version>
+       </plugin>
+       <plugin>
+-        <!-- We require 2.0-beta-5 because the xml example on the index page suffers from DOXIA-189 -->
++	-->
++	<!-- We require 2.0-beta-5 because the xml example on the index page suffers from DOXIA-189 -->
++	<!--
+         <artifactId>maven-site-plugin</artifactId>
+         <version>2.0-beta-5</version>
+       </plugin>
+       <plugin>
+         <artifactId>maven-surefire-plugin</artifactId>
+         <version>2.3.1</version>
+-      </plugin>      
++      </plugin>
++      -->      
+     </plugins>
+   </build>
+   <dependencies>
+     <dependency>
+       <groupId>org.apache.maven</groupId>
+       <artifactId>maven-artifact</artifactId>
+-      <version>2.0</version>
++      <version>2.0.9</version>
++      <scope>system</scope>
++      <systemPath>/usr/share/java/maven2.jar</systemPath>
+     </dependency>
++    <!--
+     <dependency>
+       <groupId>org.apache.maven</groupId>
+       <artifactId>maven-model</artifactId>
+@@ -66,15 +84,18 @@
+       <artifactId>maven-project</artifactId>
+       <version>2.0</version>
+     </dependency>
++    -->
+     <dependency>
+       <groupId>org.codehaus.plexus</groupId>
+       <artifactId>plexus-archiver</artifactId>
+-      <version>1.0-alpha-9</version>
++      <version>1.0-alpha-10</version>
+     </dependency>
+     <dependency>
+       <groupId>org.codehaus.plexus</groupId>
+       <artifactId>plexus-utils</artifactId>
+       <version>1.4.9</version>
++      <scope>system</scope>
++      <systemPath>/usr/share/java/plexus-utils.jar</systemPath>
+     </dependency>
+     <dependency>
+       <groupId>junit</groupId>

Added: trunk/maven-archiver/debian/patches/series
===================================================================
--- trunk/maven-archiver/debian/patches/series	                        (rev 0)
+++ trunk/maven-archiver/debian/patches/series	2008-12-09 21:14:13 UTC (rev 7614)
@@ -0,0 +1 @@
+pom.diff