[pkg-java] r7659 - in trunk/maven-debian-helper: maven-debian-helper/src/main/resources/org/apache/maven/project maven-debian-plugin

[twerner at alioth.debian.org]

Author: twerner
Date: 2008-12-14 19:40:07 +0000 (Sun, 14 Dec 2008)
New Revision: 7659

Modified:
   trunk/maven-debian-helper/maven-debian-helper/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
   trunk/maven-debian-helper/maven-debian-plugin/pom.xml
Log:
add the plexus-utils dependency to the super pom


Modified: trunk/maven-debian-helper/maven-debian-helper/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
===================================================================
--- trunk/maven-debian-helper/maven-debian-helper/src/main/resources/org/apache/maven/project/pom-4.0.0.xml	2008-12-14 19:18:52 UTC (rev 7658)
+++ trunk/maven-debian-helper/maven-debian-helper/src/main/resources/org/apache/maven/project/pom-4.0.0.xml	2008-12-14 19:40:07 UTC (rev 7659)
@@ -22,6 +22,18 @@
   <modelVersion>4.0.0</modelVersion>
   <name>Maven Default Project</name>
 
+  <!-- workaround because mavens tries to load version 1.1 of
+       plexus-utils -->
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>plexus-utils</artifactId>
+      <version>1.5.6</version>
+      <scope>system</scope>
+      <systemPath>/usr/share/java/plexus-utils.jar</systemPath>
+    </dependency>
+  </dependencies>
+
   <repositories>
     <repository>
       <id>central</id>

Modified: trunk/maven-debian-helper/maven-debian-plugin/pom.xml
===================================================================
--- trunk/maven-debian-helper/maven-debian-plugin/pom.xml	2008-12-14 19:18:52 UTC (rev 7658)
+++ trunk/maven-debian-helper/maven-debian-plugin/pom.xml	2008-12-14 19:40:07 UTC (rev 7659)
@@ -11,14 +11,4 @@
   <artifactId>maven-debian-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <name>Maven Debian Plugin</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-      <version>1.5.6</version>
-      <scope>system</scope>
-      <systemPath>/usr/share/java/plexus-utils.jar</systemPath>
-    </dependency>
-  </dependencies>
 </project>