[plexus-compiler] 01/02: Removed the dependency on libplexus-components-java

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository plexus-compiler.

commit 22a392d45a5aecdb250de003816acca025a61b1b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Nov 6 09:24:55 2013 +0100

    Removed the dependency on libplexus-components-java
---
 debian/changelog                    |    2 +-
 debian/control                      |    1 -
 debian/libplexus-compiler-java.poms |    2 +-
 debian/maven.rules                  |    2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ce7148b..e1e9173 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,7 @@ plexus-compiler (1.8.3-1) UNRELEASED; urgency=low
   * Add Build-Depends on maven-repo-helper, ant-optional, maven-ant-helper,
     default-jdk-doc, libmaven2-core-java-doc,
     libplexus-container-default-java-doc, libplexus-utils-java-doc
-  * Add dependency on libplexus-components-java, libecj-java,
+  * Add dependency on libecj-java,
   * Remove dependency on libaspectj-java, as plexus-aspectj-compiler
     cannot compile with AspectJ 1.6
   * Update description
diff --git a/debian/control b/debian/control
index 8d0443c..512ff20 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,6 @@ Build-Depends-Indep: default-jdk-doc,
                      libecj-java,
                      libmaven2-core-java,
                      libmaven2-core-java-doc,
-                     libplexus-components-java (>= 1.1.16),
                      libplexus-container-default-java,
                      libplexus-container-default-java-doc,
                      libplexus-utils-java (>= 1.5.15),
diff --git a/debian/libplexus-compiler-java.poms b/debian/libplexus-compiler-java.poms
index 5f909e7..15d5c51 100644
--- a/debian/libplexus-compiler-java.poms
+++ b/debian/libplexus-compiler-java.poms
@@ -25,7 +25,7 @@
 #   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
 #     Empty by default. [mh_install]
 #
-pom.xml --has-package-version
+pom.xml --no-parent --has-package-version
 plexus-compiler-api/pom.xml --has-package-version --artifact=plexus-compiler-api/target/plexus-compiler-api-*.jar --java-lib
 plexus-compiler-test/pom.xml --has-package-version --artifact=plexus-compiler-test/target/plexus-compiler-test-*.jar --java-lib
 plexus-compiler-manager/pom.xml --has-package-version --artifact=plexus-compiler-manager/target/plexus-compiler-manager-*.jar --java-lib
diff --git a/debian/maven.rules b/debian/maven.rules
index 2f89a2a..ca878f3 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -16,6 +16,6 @@
 # and version starting with 3., replacing the version with 3.x
 #   junit junit jar s/3\..*/3.x/
 
-junit junit jar s/3\..*/3.x/ * *
+junit junit jar s/.*/3.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/ * *

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-compiler.git