[pkg-java] r7534 - in trunk/maven-plugin-tools/debian: . patches

twerner at alioth.debian.org twerner at alioth.debian.org
Fri Dec 5 21:09:06 UTC 2008


Author: twerner
Date: 2008-12-05 21:09:06 +0000 (Fri, 05 Dec 2008)
New Revision: 7534

Modified:
   trunk/maven-plugin-tools/debian/maven-settings.xml
   trunk/maven-plugin-tools/debian/patches/pom.diff
   trunk/maven-plugin-tools/debian/rules
Log:
package builds locally


Modified: trunk/maven-plugin-tools/debian/maven-settings.xml
===================================================================
--- trunk/maven-plugin-tools/debian/maven-settings.xml	2008-12-05 20:34:03 UTC (rev 7533)
+++ trunk/maven-plugin-tools/debian/maven-settings.xml	2008-12-05 21:09:06 UTC (rev 7534)
@@ -1,5 +1,5 @@
 <settings>
   <!-- FIXME -->
-  <localRepository>/home/twerner/maven-repo</localRepository>
+  <localRepository>/usr/share/maven-repo</localRepository>
   <offline>true</offline>
 </settings>

Modified: trunk/maven-plugin-tools/debian/patches/pom.diff
===================================================================
--- trunk/maven-plugin-tools/debian/patches/pom.diff	2008-12-05 20:34:03 UTC (rev 7533)
+++ trunk/maven-plugin-tools/debian/patches/pom.diff	2008-12-05 21:09:06 UTC (rev 7534)
@@ -1,7 +1,7 @@
 Index: maven-plugin-tools-2.4.3/maven-plugin-plugin/pom.xml
 ===================================================================
---- maven-plugin-tools-2.4.3.orig/maven-plugin-plugin/pom.xml	2008-12-05 21:27:27.000000000 +0100
-+++ maven-plugin-tools-2.4.3/maven-plugin-plugin/pom.xml	2008-12-05 19:16:27.000000000 +0100
+--- maven-plugin-tools-2.4.3.orig/maven-plugin-plugin/pom.xml	2008-08-14 13:35:08.000000000 +0200
++++ maven-plugin-tools-2.4.3/maven-plugin-plugin/pom.xml	2008-12-05 22:05:17.000000000 +0100
 @@ -20,11 +20,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">
    <modelVersion>4.0.0</modelVersion>
@@ -143,3 +143,148 @@
      </plugins>
    </build>
  
+Index: maven-plugin-tools-2.4.3/maven-plugin-tools-api/pom.xml
+===================================================================
+--- maven-plugin-tools-2.4.3.orig/maven-plugin-tools-api/pom.xml	2008-08-14 13:35:08.000000000 +0200
++++ maven-plugin-tools-2.4.3/maven-plugin-tools-api/pom.xml	2008-12-05 22:05:17.000000000 +0100
+@@ -22,13 +22,17 @@
+ <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>
+     <groupId>org.apache.maven.plugin-tools</groupId>
+     <artifactId>maven-plugin-tools</artifactId>
+     <version>2.4.3</version>
+   </parent>
++  -->
+ 
++  <groupId>org.apache.maven.plugin-tools</groupId>
+   <artifactId>maven-plugin-tools-api</artifactId>
++  <version>2.4.3</version>
+ 
+   <name>Maven Plugin Tools APIs</name>
+   <description>The Maven Plugin Tools API provides an API to extract information from and generate documentation for Maven Plugins.</description>
+@@ -41,6 +45,7 @@
+ 
+   <dependencies>
+     <!-- maven -->
++    <!--
+     <dependency>
+       <groupId>org.apache.maven</groupId>
+       <artifactId>maven-project</artifactId>
+@@ -70,8 +75,10 @@
+       <groupId>org.apache.maven</groupId>
+       <artifactId>maven-plugin-descriptor</artifactId>
+     </dependency>
++    -->
+ 
+     <!-- plexus -->
++    <!--
+     <dependency>
+       <groupId>org.codehaus.plexus</groupId>
+       <artifactId>plexus-utils</artifactId>
+@@ -80,22 +87,28 @@
+       <groupId>org.codehaus.plexus</groupId>
+       <artifactId>plexus-container-default</artifactId>
+     </dependency>
++    -->
+ 
+     <!-- misc -->
++    <!--
+     <dependency>
+       <groupId>jtidy</groupId>
+       <artifactId>jtidy</artifactId>
+       <version>4aug2000r7-dev</version>
+     </dependency>
++    -->
+ 
+     <!-- test -->
++    <!--
+     <dependency>
+       <groupId>org.apache.maven.reporting</groupId>
+       <artifactId>maven-reporting-impl</artifactId>
+       <version>2.0.4.1</version>
+       <scope>test</scope>
+       <exclusions>
+-        <!-- Using org.codehaus.plexus:plexus-utils instead of -->
++	-->
++	<!-- Using org.codehaus.plexus:plexus-utils instead of -->
++	<!--
+         <exclusion>
+           <groupId>plexus</groupId>
+           <artifactId>plexus-utils</artifactId>
+@@ -107,8 +120,10 @@
+       <artifactId>maven-plugin-testing-harness</artifactId>
+       <scope>test</scope>
+     </dependency>
++    -->
+   </dependencies>
+ 
++  <!--
+   <profiles>
+     <profile>
+       <id>reporting</id>
+@@ -129,4 +144,5 @@
+       </reporting>
+     </profile>
+   </profiles>
++  -->
+ </project>
+Index: maven-plugin-tools-2.4.3/maven-plugin-tools-java/pom.xml
+===================================================================
+--- maven-plugin-tools-2.4.3.orig/maven-plugin-tools-java/pom.xml	2008-12-05 22:06:01.000000000 +0100
++++ maven-plugin-tools-2.4.3/maven-plugin-tools-java/pom.xml	2008-12-05 22:04:56.000000000 +0100
+@@ -22,13 +22,17 @@
+ <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>
+     <groupId>org.apache.maven.plugin-tools</groupId>
+     <artifactId>maven-plugin-tools</artifactId>
+     <version>2.4.3</version>
+   </parent>
++  -->
+ 
+   <artifactId>maven-plugin-tools-java</artifactId>
++  <groupId>org.apache.maven.plugin-tools</groupId>
++  <version>2.4.3</version>
+ 
+   <name>Maven Plugin Tool for Java</name>
+   <description>Descriptor extractor for plugins written in Java.</description>
+@@ -41,6 +45,7 @@
+ 
+   <dependencies>
+     <!-- maven -->
++    <!--
+     <dependency>
+       <groupId>org.apache.maven</groupId>
+       <artifactId>maven-project</artifactId>
+@@ -59,8 +64,10 @@
+       <groupId>org.apache.maven.plugin-tools</groupId>
+       <artifactId>maven-plugin-tools-api</artifactId>
+     </dependency>
++    -->
+ 
+     <!-- plexus -->
++    <!--
+     <dependency>
+       <groupId>org.codehaus.plexus</groupId>
+       <artifactId>plexus-utils</artifactId>
+@@ -69,12 +76,15 @@
+       <groupId>org.codehaus.plexus</groupId>
+       <artifactId>plexus-container-default</artifactId>
+     </dependency>
++    -->
+ 
+     <!-- misc -->
+     <dependency>
+       <groupId>com.thoughtworks.qdox</groupId>
+       <artifactId>qdox</artifactId>
+       <version>1.6.3</version>
++      <scope>system</scope>
++      <systemPath>/usr/share/java/qdox.jar</systemPath>
+     </dependency>
+   </dependencies>
+ </project>

Modified: trunk/maven-plugin-tools/debian/rules
===================================================================
--- trunk/maven-plugin-tools/debian/rules	2008-12-05 20:34:03 UTC (rev 7533)
+++ trunk/maven-plugin-tools/debian/rules	2008-12-05 21:09:06 UTC (rev 7534)
@@ -19,6 +19,13 @@
 get-orig-source:
 	uscan --force-download
 
+REPO := /usr/share/maven-repo
+MPT  := $(REPO)/org/apache/maven
+
 binary-post-install/lib$(PACKAGE)-java::
-	dh_install -plib$(PACKAGE)-java maven-plugin-tools-api/build/maven-plugin-tools-api-$(VERSION).jar /usr/share/java
-	dh_link -plib$(PACKAGE)-java /usr/share/java/maven-plugin-tools-api-$(VERSION).jar /usr/share/java/maven-plugin-tools-api.jar
+	dh_install maven-plugin-tools-api/target/*.jar $(MPT)/plugin-tools/maven-plugin-tools-api/$(VERSION)/
+	install -m644 maven-plugin-tools-api/pom.xml $(DEB_DESTDIR)$(MPT)/plugin-tools/maven-plugin-tools-api/$(VERSION)/maven-plugin-tools-api-$(VERSION).pom
+	dh_install maven-plugin-tools-java/target/*.jar $(MPT)/plugin-tools/maven-plugin-tools-java/$(VERSION)/
+	install -m644 maven-plugin-tools-java/pom.xml $(DEB_DESTDIR)$(MPT)/plugin-tools/maven-plugin-tools-java/$(VERSION)/maven-plugin-tools-java-$(VERSION).pom
+	dh_install maven-plugin-plugin/target/*.jar $(MPT)/plugins/maven-plugin-plugin/$(VERSION)/
+	install -m644 maven-plugin-tools-java/pom.xml $(DEB_DESTDIR)$(MPT)/plugins/maven-plugin-plugin/$(VERSION)/maven-plugin-plugin-$(VERSION).pom




More information about the pkg-java-commits mailing list