[pkg-java] r7582 - in trunk/maven-compiler-plugin/debian: . patches

[twerner at alioth.debian.org]

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

Added:
   trunk/maven-compiler-plugin/debian/patches/
   trunk/maven-compiler-plugin/debian/patches/pom.diff
   trunk/maven-compiler-plugin/debian/patches/series
Modified:
   trunk/maven-compiler-plugin/debian/
   trunk/maven-compiler-plugin/debian/changelog
Log:
final changes



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

Modified: trunk/maven-compiler-plugin/debian/changelog
===================================================================
--- trunk/maven-compiler-plugin/debian/changelog	2008-12-07 19:36:39 UTC (rev 7581)
+++ trunk/maven-compiler-plugin/debian/changelog	2008-12-07 19:45:14 UTC (rev 7582)
@@ -1,5 +1,6 @@
 maven-compiler-plugin (2.0.2-1) unstable; urgency=low
 
-  * Initial release. (Closes: #xxxxxx)
+  UNRELEASED
+  * Initial release. (Closes: #508088)
 
  -- Torsten Werner <twerner at debian.org>  Thu, 04 Dec 2008 19:29:26 +0100

Added: trunk/maven-compiler-plugin/debian/patches/pom.diff
===================================================================
--- trunk/maven-compiler-plugin/debian/patches/pom.diff	                        (rev 0)
+++ trunk/maven-compiler-plugin/debian/patches/pom.diff	2008-12-07 19:45:14 UTC (rev 7582)
@@ -0,0 +1,88 @@
+Index: maven-compiler-plugin-2.0.2/pom.xml
+===================================================================
+--- maven-compiler-plugin-2.0.2.orig/pom.xml	2008-12-07 20:37:50.000000000 +0100
++++ maven-compiler-plugin-2.0.2/pom.xml	2008-12-07 20:05:54.000000000 +0100
+@@ -1,10 +1,13 @@
+ <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>
+     <artifactId>maven-plugins</artifactId>
+     <groupId>org.apache.maven.plugins</groupId>
+     <version>8</version>
+   </parent>
++  -->
+   <modelVersion>4.0.0</modelVersion>
++  <groupId>org.apache.maven.plugins</groupId>
+   <artifactId>maven-compiler-plugin</artifactId>
+   <packaging>maven-plugin</packaging>
+   <name>Maven Compiler Plugin</name>
+@@ -21,29 +24,39 @@
+     <dependency>
+       <groupId>org.apache.maven</groupId>
+       <artifactId>maven-plugin-api</artifactId>
+-      <version>2.0</version>
++      <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.0.4</version>
++      <version>1.4.8</version>
++      <scope>system</scope>
++      <systemPath>/usr/share/java/plexus-utils.jar</systemPath>
+     </dependency>
+     <dependency>
+       <groupId>org.codehaus.plexus</groupId>
+       <artifactId>plexus-compiler-api</artifactId>
+       <version>1.5.3</version>
++      <scope>system</scope>
++      <systemPath>/usr/share/java/plexus-compiler-api.jar</systemPath>
+     </dependency>
+     <dependency>
+       <groupId>org.codehaus.plexus</groupId>
+       <artifactId>plexus-compiler-manager</artifactId>
+       <version>1.5.3</version>
++      <scope>system</scope>
++      <systemPath>/usr/share/java/plexus-compiler-manager.jar</systemPath>
+     </dependency>
+     <dependency>
+       <groupId>org.codehaus.plexus</groupId>
+       <artifactId>plexus-compiler-javac</artifactId>
+       <version>1.5.3</version>
+-      <scope>runtime</scope>
++      <scope>system</scope>
++      <systemPath>/usr/share/java/plexus-compiler-javac.jar</systemPath>
+     </dependency>
++    <!--
+     <dependency>
+       <groupId>org.apache.maven</groupId>
+       <artifactId>maven-artifact</artifactId>
+@@ -55,11 +68,24 @@
+       <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>
++
+   <scm>
+     <connection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-compiler-plugin-2.0.2</connection>
+     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-compiler-plugin-2.0.2</developerConnection>
+     <url>https://svn.apache.org/repos/asf/maven/plugins/tags/maven-compiler-plugin-2.0.2</url>
+   </scm>
+-</project>
+\ No newline at end of file
++</project>

Added: trunk/maven-compiler-plugin/debian/patches/series
===================================================================
--- trunk/maven-compiler-plugin/debian/patches/series	                        (rev 0)
+++ trunk/maven-compiler-plugin/debian/patches/series	2008-12-07 19:45:14 UTC (rev 7582)
@@ -0,0 +1 @@
+pom.diff