[pkg-java] r7593 - in trunk/maven-resources-plugin/debian: . patches

[twerner at alioth.debian.org]

Author: twerner
Date: 2008-12-08 11:06:30 +0000 (Mon, 08 Dec 2008)
New Revision: 7593

Added:
   trunk/maven-resources-plugin/debian/patches/
   trunk/maven-resources-plugin/debian/patches/pom.diff
   trunk/maven-resources-plugin/debian/patches/series
Modified:
   trunk/maven-resources-plugin/debian/
   trunk/maven-resources-plugin/debian/build.xml
   trunk/maven-resources-plugin/debian/control
   trunk/maven-resources-plugin/debian/rules
Log:
package builds now



Property changes on: trunk/maven-resources-plugin/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Modified: trunk/maven-resources-plugin/debian/build.xml
===================================================================
--- trunk/maven-resources-plugin/debian/build.xml	2008-12-08 10:35:58 UTC (rev 7592)
+++ trunk/maven-resources-plugin/debian/build.xml	2008-12-08 11:06:30 UTC (rev 7593)
@@ -20,7 +20,7 @@
       <arg value="plugin:descriptor"/>
     </java>
     <ant target="package" antfile="${maven.build.xml}" dir=".">
-      <property name="artifactId" value="maven-compiler-plugin"/>
+      <property name="artifactId" value="maven-resources-plugin"/>
     </ant>
   </target>
 

Modified: trunk/maven-resources-plugin/debian/control
===================================================================
--- trunk/maven-resources-plugin/debian/control	2008-12-08 10:35:58 UTC (rev 7592)
+++ trunk/maven-resources-plugin/debian/control	2008-12-08 11:06:30 UTC (rev 7593)
@@ -3,7 +3,9 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends: default-jdk, ant, debhelper (>= 5), cdbs, quilt, maven-ant-helper
+Build-Depends: openjdk-6-jdk, ant, debhelper (>= 5), cdbs, quilt, maven-ant-helper,
+ maven2, libmaven-filtering-java, libplexus-interpolation-java,
+ libmaven-plugin-tools-java
 Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-resources-plugin
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-resources-plugin/

Added: trunk/maven-resources-plugin/debian/patches/pom.diff
===================================================================
--- trunk/maven-resources-plugin/debian/patches/pom.diff	                        (rev 0)
+++ trunk/maven-resources-plugin/debian/patches/pom.diff	2008-12-08 11:06:30 UTC (rev 7593)
@@ -0,0 +1,88 @@
+Index: maven-resources-plugin-2.3/pom.xml
+===================================================================
+--- maven-resources-plugin-2.3.orig/pom.xml	2008-12-08 00:28:06.000000000 +0100
++++ maven-resources-plugin-2.3/pom.xml	2008-12-07 23:40:20.000000000 +0100
+@@ -22,13 +22,16 @@
+ <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">
+   <modelVersion>4.0.0</modelVersion>
+ 
++  <!--
+   <parent>
+     <artifactId>maven-plugins</artifactId>
+     <groupId>org.apache.maven.plugins</groupId>
+     <version>12</version>
+   </parent>
++  -->
+ 
+   <artifactId>maven-resources-plugin</artifactId>
++  <groupId>org.apache.maven.plugins</groupId>
+   <version>2.3</version>
+   <packaging>maven-plugin</packaging>
+ 
+@@ -58,20 +61,35 @@
+   </issueManagement>
+ 
+   <dependencies>
++    <!--
+     <dependency>
+       <groupId>org.apache.maven</groupId>
+       <artifactId>maven-plugin-api</artifactId>
+       <version>2.0.6</version>
+     </dependency>
++    -->
+     <dependency>
+       <groupId>org.apache.maven</groupId>
+       <artifactId>maven-project</artifactId>
+-      <version>2.0.6</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-core</artifactId>
++      <version>2.0.9</version>
++      <scope>system</scope>
++      <systemPath>/usr/share/java/maven2.jar</systemPath>
++    </dependency>
++    -->
+     <dependency>
+       <groupId>org.codehaus.plexus</groupId>
+       <artifactId>plexus-utils</artifactId>
+-      <version>1.5.6</version>
++      <version>1.4.8</version>
++      <scope>system</scope>
++      <systemPath>/usr/share/java/plexus-utils.jar</systemPath>
+     </dependency>
+ 
+     <dependency>
+@@ -80,14 +98,28 @@
+       <version>1.0-beta-2</version>
+     </dependency>
+ 
++    <!--
+     <dependency>
+       <groupId>org.apache.maven.shared</groupId>
+       <artifactId>maven-plugin-testing-harness</artifactId>
+       <version>1.0-beta-1</version>
+       <scope>test</scope>
+     </dependency>
++    -->
+   </dependencies>
+ 
++  <build>
++    <pluginManagement>
++      <plugins>
++	<plugin>
++	  <groupId>org.apache.maven.plugins</groupId>
++	  <artifactId>maven-plugin-plugin</artifactId>
++	  <version>2.4.3</version>
++	</plugin>
++      </plugins>
++    </pluginManagement>
++  </build>
++
+   <profiles>
+     <profile>
+       <id>run-its</id>

Added: trunk/maven-resources-plugin/debian/patches/series
===================================================================
--- trunk/maven-resources-plugin/debian/patches/series	                        (rev 0)
+++ trunk/maven-resources-plugin/debian/patches/series	2008-12-08 11:06:30 UTC (rev 7593)
@@ -0,0 +1 @@
+pom.diff

Modified: trunk/maven-resources-plugin/debian/rules
===================================================================
--- trunk/maven-resources-plugin/debian/rules	2008-12-08 10:35:58 UTC (rev 7592)
+++ trunk/maven-resources-plugin/debian/rules	2008-12-08 11:06:30 UTC (rev 7593)
@@ -6,9 +6,8 @@
 
 PACKAGE              := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
 VERSION              := $(shell dpkg-parsechangelog | egrep '^Version:' | sed 's/Version: \(.*\)-.*/\1/')
-JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := maven2 plexus-compiler-api plexus-compiler-manager \
-  plexus-utils
+JAVA_HOME            := /usr/lib/jvm/java-6-openjdk
+DEB_JARS             := maven2 maven-filtering plexus-utils
 DEB_ANT_BUILD_TARGET := package #javadoc
 DEB_ANT_BUILDFILE    := debian/build.xml
 DEB_ANT_ARGS         := -Dversion=$(VERSION)