[SCM] Plexus Compiler branch, master, updated. debian/1.6-2-21-g7633148

Ludovic Claude ludovic.claude at laposte.net
Thu Jan 5 23:13:19 UTC 2012


The following commit has been merged in the master branch:
commit a9a5b7f8164248a57f48d111d7a1e285756baad4
Author: Ludovic Claude <ludovic.claude at laposte.net>
Date:   Tue Jan 3 17:21:40 2012 +0100

    Update Maven rules

diff --git a/debian/maven.rules b/debian/maven.rules
index e9fb3ba..31f799d 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -17,18 +17,18 @@
 #   junit junit jar s/3\..*/3.x/
 
 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-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/ * *
+org.codehaus.plexus plexus-compiler-api jar s/1\..*/1.x/ * *
+org.codehaus.plexus plexus-compiler-aspectj jar s/1\..*/1.x/ * *
+org.codehaus.plexus plexus-compiler-csharp jar s/1\..*/1.x/ * *
+org.codehaus.plexus plexus-compiler-eclipse jar s/1\..*/1.x/ * *
+org.codehaus.plexus plexus-compiler-javac jar s/1\..*/1.x/ * *
+org.codehaus.plexus plexus-compiler-jikes jar s/1\..*/1.x/ * *
+org.codehaus.plexus plexus-compiler-manager jar s/1\..*/1.x/ * *
+org.codehaus.plexus plexus-compiler-test jar s/1\..*/1.x/ * *
+org.codehaus.plexus plexus-compiler pom s/1\..*/1.x/ * *
+org.codehaus.plexus plexus-compilers pom s/1\..*/1.x/ * *
+org.codehaus.plexus plexus-components pom s/1\..*/1.x/ * *
+org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * *
+s/org.eclipse.jdt/org.eclipse.jdt.core.compiler/ s/core/ecj/ jar s/.*/debian/ * *
 s/aspectj/org.aspectj/ aspectjrt jar s/.*/debian/ * *
 s/aspectj/org.aspectj/ aspectjtools jar s/.*/debian/ * *
diff --git a/debian/rules b/debian/rules
index 0fe9534..562f1f3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/maven.mk
 
 JAVA_HOME := /usr/lib/jvm/default-java
-#DEB_MAVEN_DOC_TARGET := javadoc:jar javadoc:aggregate
+DEB_MAVEN_DOC_TARGET := javadoc:jar javadoc:aggregate
 
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename

-- 
Plexus Compiler



More information about the pkg-java-commits mailing list