[SCM] Plexus Compiler branch, master, updated. debian/1.6-1-2-gd348741
Damien Raude-Morvan
drazzib at debian.org
Wed Dec 7 23:37:03 UTC 2011
The following commit has been merged in the master branch:
commit 2f4c6c751e74a55bcc70812485020409633cd3b5
Author: Damien Raude-Morvan <drazzib at debian.org>
Date: Wed Dec 7 20:55:32 2011 +0100
Team upload.
diff --git a/debian/changelog b/debian/changelog
index 52ea40d..ae9f2f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+plexus-compiler (1.6-2) unstable; urgency=low
+
+ * Team upload.
+ * d/maven.rules: Force usage of default plexus-utils 1.x.
+ * d/patches/0002-add-version-3.8.2-to-dependency-junit.patch: Rework patch
+ to use dependencyManagment to set junit version.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Thu, 08 Dec 2011 00:23:42 +0100
+
plexus-compiler (1.6-1) unstable; urgency=low
* Merge 3 plexus-compiler-* source package into 1 source package
diff --git a/debian/libplexus-compiler-java.poms b/debian/libplexus-compiler-java.poms
index 02ea277..9387c1a 100644
--- a/debian/libplexus-compiler-java.poms
+++ b/debian/libplexus-compiler-java.poms
@@ -2,7 +2,9 @@
# Format of this file is:
# <path to pom file> [option]*
# where option can be:
-# --ignore: ignore this POM or
+# --ignore: ignore this POM and its artifact if any
+# --ignore-pom: don't install the POM. To use on POM files that are created
+# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
# --no-parent: remove the <parent> tag from the POM
# --package=<package>: an alternative package to use when installing this POM
# and its artifact
@@ -11,17 +13,17 @@
# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
# during a clean operation with mh_cleanpom or mh_installpom
# --artifact=<path>: path to the build artifact associated with this POM,
-# it will be installed when using the command mh_install
+# it will be installed when using the command mh_install. [mh_install]
# --java-lib: install the jar into /usr/share/java to comply with Debian
# packaging guidelines
# --usj-name=<name>: name to use when installing the library in /usr/share/java
# --usj-version=<version>: version to use when installing the library in /usr/share/java
# --no-usj-versionless: don't install the versionless link in /usr/share/java
-# --dest-jar=<path>: the destination for the real jar
-# it will be installed with mh_install.
+# --dest-jar=<path>: the destination for the real jar.
+# It will be installed with mh_install. [mh_install]
# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
-# --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created
-# temporarily for certain artifacts such as Javadoc jars.
+# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+# Empty by default. [mh_install]
#
pom.xml --no-parent --has-package-version
plexus-compiler-api/pom.xml --has-package-version
diff --git a/debian/maven.rules b/debian/maven.rules
index a0e8038..1428025 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -20,11 +20,15 @@ junit junit jar s/3\..*/3.x/ * *
org.codehaus.plexus plexus-compiler-api jar s/.*/debian/ * *
org.codehaus.plexus plexus-compiler-aspectj jar s/.*/debian/ * *
org.codehaus.plexus plexus-compiler-csharp jar s/.*/debian/ * *
+org.codehaus.plexus plexus-compiler-eclipse jar s/.*/debian/ * *
org.codehaus.plexus plexus-compiler-javac jar s/.*/debian/ * *
+org.codehaus.plexus plexus-compiler-jikes jar s/.*/debian/ * *
org.codehaus.plexus plexus-compiler-manager jar s/.*/debian/ * *
org.codehaus.plexus plexus-compiler-test jar s/.*/debian/ * *
org.codehaus.plexus plexus-compiler pom s/.*/debian/ * *
org.codehaus.plexus plexus-compilers pom s/.*/debian/ * *
-org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * *
+org.codehaus.plexus plexus-component-metadata * s/.*/1.0-beta-3.0.7/ * *
+org.codehaus.plexus plexus-container-default * s/.*/1.0-alpha/ * *
+org.codehaus.plexus plexus-utils * s/.*/debian/ * *
s/aspectj/org.aspectj/ aspectjrt jar s/.*/debian/ * *
s/aspectj/org.aspectj/ aspectjtools jar s/.*/debian/ * *
diff --git a/debian/patches/0002-add-version-3.8.2-to-dependency-junit.patch b/debian/patches/0002-add-version-3.8.2-to-dependency-junit.patch
index 58e28b3..cedcc0d 100644
--- a/debian/patches/0002-add-version-3.8.2-to-dependency-junit.patch
+++ b/debian/patches/0002-add-version-3.8.2-to-dependency-junit.patch
@@ -1,69 +1,133 @@
-From: Torsten Werner <twerner at debian.org>
-Date: Thu, 25 Aug 2011 23:43:19 +0200
-Subject: [PATCH] add version 3.8.2 to dependency junit
-
-Otherwise Maven cannot find junit.
----
- plexus-compiler-api/pom.xml | 1 +
- plexus-compiler-test/pom.xml | 1 +
- plexus-compilers/plexus-compiler-csharp/pom.xml | 6 ++++++
- plexus-compilers/plexus-compiler-javac/pom.xml | 6 ++++++
- 4 files changed, 14 insertions(+), 0 deletions(-)
-
-diff --git a/plexus-compiler-api/pom.xml b/plexus-compiler-api/pom.xml
-index e832dad..9231b44 100644
+Index: b/plexus-compiler-api/pom.xml
+===================================================================
--- a/plexus-compiler-api/pom.xml
+++ b/plexus-compiler-api/pom.xml
-@@ -20,6 +20,7 @@
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
-+ <version>3.8.2</version>
- </dependency>
- </dependencies>
- </project>
-diff --git a/plexus-compiler-test/pom.xml b/plexus-compiler-test/pom.xml
-index b0c5f8e..3ab34ba 100644
+@@ -6,6 +6,7 @@
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-compiler</artifactId>
+ <version>1.6</version>
++ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>plexus-compiler-api</artifactId>
+Index: b/plexus-compiler-manager/pom.xml
+===================================================================
+--- a/plexus-compiler-manager/pom.xml
++++ b/plexus-compiler-manager/pom.xml
+@@ -6,6 +6,7 @@
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-compiler</artifactId>
+ <version>1.6</version>
++ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>plexus-compiler-manager</artifactId>
+Index: b/plexus-compiler-test/pom.xml
+===================================================================
--- a/plexus-compiler-test/pom.xml
+++ b/plexus-compiler-test/pom.xml
-@@ -21,6 +21,7 @@
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>compile</scope>
-+ <version>3.8.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
-diff --git a/plexus-compilers/plexus-compiler-csharp/pom.xml b/plexus-compilers/plexus-compiler-csharp/pom.xml
-index 668182c..9d6069b 100644
+@@ -6,6 +6,7 @@
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-compiler</artifactId>
+ <version>1.6</version>
++ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>plexus-compiler-test</artifactId>
+Index: b/plexus-compilers/plexus-compiler-aspectj/pom.xml
+===================================================================
+--- a/plexus-compilers/plexus-compiler-aspectj/pom.xml
++++ b/plexus-compilers/plexus-compiler-aspectj/pom.xml
+@@ -6,6 +6,7 @@
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-compilers</artifactId>
+ <version>1.6</version>
++ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>plexus-compiler-aspectj</artifactId>
+Index: b/plexus-compilers/plexus-compiler-csharp/pom.xml
+===================================================================
--- a/plexus-compilers/plexus-compiler-csharp/pom.xml
+++ b/plexus-compilers/plexus-compiler-csharp/pom.xml
-@@ -17,5 +17,11 @@
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </dependency>
-+ <dependency>
-+ <groupId>junit</groupId>
-+ <artifactId>junit</artifactId>
-+ <version>3.8.2</version>
-+ <scope>test</scope>
-+ </dependency>
- </dependencies>
- </project>
-diff --git a/plexus-compilers/plexus-compiler-javac/pom.xml b/plexus-compilers/plexus-compiler-javac/pom.xml
-index 13bbdbf..d6df702 100644
+@@ -6,6 +6,7 @@
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-compilers</artifactId>
+ <version>1.6</version>
++ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>plexus-compiler-csharp</artifactId>
+Index: b/plexus-compilers/plexus-compiler-eclipse/pom.xml
+===================================================================
+--- a/plexus-compilers/plexus-compiler-eclipse/pom.xml
++++ b/plexus-compilers/plexus-compiler-eclipse/pom.xml
+@@ -6,6 +6,7 @@
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-compilers</artifactId>
+ <version>1.6</version>
++ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>plexus-compiler-eclipse</artifactId>
+Index: b/plexus-compilers/plexus-compiler-javac/pom.xml
+===================================================================
--- a/plexus-compilers/plexus-compiler-javac/pom.xml
+++ b/plexus-compilers/plexus-compiler-javac/pom.xml
-@@ -17,5 +17,11 @@
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
+@@ -6,6 +6,7 @@
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-compilers</artifactId>
+ <version>1.6</version>
++ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>plexus-compiler-javac</artifactId>
+Index: b/plexus-compilers/plexus-compiler-jikes/pom.xml
+===================================================================
+--- a/plexus-compilers/plexus-compiler-jikes/pom.xml
++++ b/plexus-compilers/plexus-compiler-jikes/pom.xml
+@@ -6,6 +6,7 @@
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-compilers</artifactId>
+ <version>1.6</version>
++ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>plexus-compiler-jikes</artifactId>
+Index: b/plexus-compilers/pom.xml
+===================================================================
+--- a/plexus-compilers/pom.xml
++++ b/plexus-compilers/pom.xml
+@@ -6,6 +6,7 @@
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-compiler</artifactId>
+ <version>1.6</version>
++ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.codehaus.plexus</groupId>
+Index: b/pom.xml
+===================================================================
+--- a/pom.xml
++++ b/pom.xml
+@@ -45,6 +45,12 @@
+ <artifactId>plexus-utils</artifactId>
+ <version>1.5.5</version>
+ </dependency>
++ <dependency>
++ <groupId>junit</groupId>
++ <artifactId>junit</artifactId>
++ <version>3.8.2</version>
++ <scope>test</scope>
++ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <dependencies>
+@@ -57,7 +63,6 @@
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+- <version>3.8.2</version>
+ <scope>test</scope>
</dependency>
-+ <dependency>
-+ <groupId>junit</groupId>
-+ <artifactId>junit</artifactId>
-+ <version>3.8.2</version>
-+ <scope>test</scope>
-+ </dependency>
</dependencies>
- </project>
---
diff --git a/debian/patches/0003-remove-unbuildable-modules-from-pom.xml.patch b/debian/patches/0003-remove-unbuildable-modules-from-pom.xml.patch
index c573182..29b65bc 100644
--- a/debian/patches/0003-remove-unbuildable-modules-from-pom.xml.patch
+++ b/debian/patches/0003-remove-unbuildable-modules-from-pom.xml.patch
@@ -6,11 +6,11 @@ Subject: [PATCH] remove unbuildable modules from pom.xml
plexus-compilers/pom.xml | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
-diff --git a/plexus-compilers/pom.xml b/plexus-compilers/pom.xml
-index 89d65db..b54c04b 100644
+Index: b/plexus-compilers/pom.xml
+===================================================================
--- a/plexus-compilers/pom.xml
+++ b/plexus-compilers/pom.xml
-@@ -15,10 +15,7 @@
+@@ -16,10 +16,7 @@
<name>Plexus Compilers</name>
<modules>
@@ -21,4 +21,3 @@ index 89d65db..b54c04b 100644
<module>plexus-compiler-javac</module>
</modules>
---
--
Plexus Compiler
More information about the pkg-java-commits
mailing list