[pkg-java] r7542 - in trunk/maven-plugin-tools/debian: . patches
twerner at alioth.debian.org
twerner at alioth.debian.org
Sat Dec 6 21:22:05 UTC 2008
Author: twerner
Date: 2008-12-06 21:22:05 +0000 (Sat, 06 Dec 2008)
New Revision: 7542
Modified:
trunk/maven-plugin-tools/debian/changelog
trunk/maven-plugin-tools/debian/patches/jtidy.diff
trunk/maven-plugin-tools/debian/patches/pom.diff
trunk/maven-plugin-tools/debian/rules
Log:
install the parent pom; release
Modified: trunk/maven-plugin-tools/debian/changelog
===================================================================
--- trunk/maven-plugin-tools/debian/changelog 2008-12-06 20:28:53 UTC (rev 7541)
+++ trunk/maven-plugin-tools/debian/changelog 2008-12-06 21:22:05 UTC (rev 7542)
@@ -1,6 +1,5 @@
maven-plugin-tools (2.4.3-1) unstable; urgency=low
- UNRELEASED
* Initial release. (Closes: #507922)
-- Torsten Werner <twerner at debian.org> Thu, 04 Dec 2008 19:29:26 +0100
Modified: trunk/maven-plugin-tools/debian/patches/jtidy.diff
===================================================================
--- trunk/maven-plugin-tools/debian/patches/jtidy.diff 2008-12-06 20:28:53 UTC (rev 7541)
+++ trunk/maven-plugin-tools/debian/patches/jtidy.diff 2008-12-06 21:22:05 UTC (rev 7542)
@@ -1,3 +1,5 @@
+make maven-plugin-tools compatible with newer cvs versions of jtidy
+
Index: maven-plugin-tools-2.4.3/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java
===================================================================
--- maven-plugin-tools-2.4.3.orig/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java 2008-12-05 21:30:17.000000000 +0100
Modified: trunk/maven-plugin-tools/debian/patches/pom.diff
===================================================================
--- trunk/maven-plugin-tools/debian/patches/pom.diff 2008-12-06 20:28:53 UTC (rev 7541)
+++ trunk/maven-plugin-tools/debian/patches/pom.diff 2008-12-06 21:22:05 UTC (rev 7542)
@@ -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-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
++++ maven-plugin-tools-2.4.3/maven-plugin-plugin/pom.xml 2008-12-06 22:15:30.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>
@@ -146,34 +146,16 @@
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>
++++ maven-plugin-tools-2.4.3/maven-plugin-tools-api/pom.xml 2008-12-06 22:14:20.000000000 +0100
+@@ -41,6 +43,7 @@
-+ <!--
- <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 @@
+@@ -70,8 +73,10 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-descriptor</artifactId>
</dependency>
@@ -184,7 +166,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
-@@ -80,22 +87,28 @@
+@@ -80,22 +85,28 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</dependency>
@@ -214,7 +196,7 @@
<exclusion>
<groupId>plexus</groupId>
<artifactId>plexus-utils</artifactId>
-@@ -107,8 +120,10 @@
+@@ -107,8 +118,10 @@
<artifactId>maven-plugin-testing-harness</artifactId>
<scope>test</scope>
</dependency>
@@ -225,7 +207,7 @@
<profiles>
<profile>
<id>reporting</id>
-@@ -129,4 +144,5 @@
+@@ -129,4 +142,5 @@
</reporting>
</profile>
</profiles>
@@ -233,35 +215,17 @@
</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>
+--- maven-plugin-tools-2.4.3.orig/maven-plugin-tools-java/pom.xml 2008-08-14 13:35:08.000000000 +0200
++++ maven-plugin-tools-2.4.3/maven-plugin-tools-java/pom.xml 2008-12-06 22:14:20.000000000 +0100
+@@ -41,6 +43,7 @@
-+ <!--
- <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 @@
+@@ -59,8 +62,10 @@
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-api</artifactId>
</dependency>
@@ -272,7 +236,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
-@@ -69,12 +76,15 @@
+@@ -69,12 +74,15 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</dependency>
@@ -288,3 +252,22 @@
</dependency>
</dependencies>
</project>
+Index: maven-plugin-tools-2.4.3/pom.xml
+===================================================================
+--- maven-plugin-tools-2.4.3.orig/pom.xml 2008-08-14 13:35:08.000000000 +0200
++++ maven-plugin-tools-2.4.3/pom.xml 2008-12-06 22:14:20.000000000 +0100
+@@ -22,12 +22,14 @@
+ <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-parent</artifactId>
+ <groupId>org.apache.maven</groupId>
+ <version>8</version>
+ <relativePath>../pom/maven/pom.xml</relativePath>
+ </parent>
++ -->
+
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools</artifactId>
Modified: trunk/maven-plugin-tools/debian/rules
===================================================================
--- trunk/maven-plugin-tools/debian/rules 2008-12-06 20:28:53 UTC (rev 7541)
+++ trunk/maven-plugin-tools/debian/rules 2008-12-06 21:22:05 UTC (rev 7542)
@@ -23,11 +23,17 @@
MPT := $(REPO)/org/apache/maven
binary-post-install/lib$(PACKAGE)-java::
+ # parent POM
+ install -D -m644 pom.xml $(DEB_DESTDIR)$(MPT)/plugin-tools/maven-plugin-tools/$(VERSION)/maven-plugin-tools-$(VERSION).pom
+ # maven-plugin-tools-api
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
+ # maven-plugin-tools-java
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
+ # maven-plugin-tools-beanshell
dh_install maven-plugin-tools-beanshell/target/*.jar $(MPT)/plugin-tools/maven-plugin-tools-beanshell/$(VERSION)/
- install -m644 maven-plugin-tools-java/pom.xml $(DEB_DESTDIR)$(MPT)/plugin-tools/maven-plugin-tools-beanshell/$(VERSION)/maven-plugin-tools-beanshell-$(VERSION).pom
+ install -m644 maven-plugin-tools-beanshell/pom.xml $(DEB_DESTDIR)$(MPT)/plugin-tools/maven-plugin-tools-beanshell/$(VERSION)/maven-plugin-tools-beanshell-$(VERSION).pom
+ # maven-plugin-plugin
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
+ install -m644 maven-plugin-plugin/pom.xml $(DEB_DESTDIR)$(MPT)/plugins/maven-plugin-plugin/$(VERSION)/maven-plugin-plugin-$(VERSION).pom
More information about the pkg-java-commits
mailing list