[wagon2] 07/11: Simplified the Maven rules

[Emmanuel Bourg]

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

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

commit a4f83a04cec73179eca2142f78047726100756d3
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Aug 3 12:33:07 2017 +0200

    Simplified the Maven rules
---
 debian/changelog         |  1 +
 debian/maven.ignoreRules |  2 --
 debian/maven.rules       | 23 +----------------------
 3 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 63d842d..82b07d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ wagon2 (2.12-3) UNRELEASED; urgency=medium
   * Removed the unused dependencies on libbcprov-java and libnekohtml-java
   * Build depend on junit4 instead of junit (Closes: #869004)
   * Standards-Version updated to 4.0.0
+  * Simplified the Maven rules
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 03 Aug 2017 02:13:08 +0200
 
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index b8ee27f..49e690f 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -22,5 +22,3 @@ org.apache.maven.plugins maven-enforcer-plugin * * * *
 org.apache.rat apache-rat-plugin * * * *
 org.apache.sshd sshd-core * * * *
 org.codehaus.mojo animal-sniffer-maven-plugin * * * *
-org.codehaus.plexus plexus-ftpd * * * *
-org.codehaus.plexus plexus-maven-plugin * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
index 94b597a..c8830ca 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -16,32 +16,11 @@
 # and version starting with 3., replacing the version with 3.x
 #   junit junit jar s/3\\..*/3.x/
 
-commons-httpclient commons-httpclient jar s/.*/3.x/ * *
 junit junit jar s/.*/4.x/ * *
-org.apache.maven maven-parent pom s/.*/debian/ * *
-org.apache.maven.wagon wagon-file jar s/.*/2.x/ * *
-org.apache.maven.wagon wagon-ftp jar s/.*/2.x/ * *
-org.apache.maven.wagon wagon-http-lightweight jar s/.*/2.x/ * *
-org.apache.maven.wagon wagon-http-shared4 jar s/2\..*/2.x/ * *
-org.apache.maven.wagon wagon-http-shared jar s/.*/2.x/ * *
-org.apache.maven.wagon wagon-http jar s/.*/2.x/ * *
-org.apache.maven.wagon wagon-provider-api jar s/.*/2.x/ * *
-org.apache.maven.wagon wagon-provider-test jar s/.*/2.x/ * *
-org.apache.maven.wagon wagon-providers pom s/.*/2.x/ * *
-org.apache.maven.wagon wagon-scm jar s/.*/2.x/ * *
-org.apache.maven.wagon wagon-ssh-common-test jar s/.*/2.x/ * *
-org.apache.maven.wagon wagon-ssh-common jar s/.*/2.x/ * *
-org.apache.maven.wagon wagon-ssh-external jar s/.*/2.x/ * *
-org.apache.maven.wagon wagon-ssh jar s/.*/2.x/ * *
-org.apache.maven.wagon wagon-tck-http jar s/.*/2.x/ * *
-org.apache.maven.wagon wagon-tcks pom s/.*/2.x/ * *
-org.apache.maven.wagon wagon-webdav-jackrabbit jar s/2\..*/2.x/ * *
-org.apache.maven.wagon wagon pom s/.*/2.x/ * *
+org.apache.maven.wagon wagon* * s/.*/2.x/ * *
 org.codehaus.plexus plexus-classworlds * s/.*/2.x/ * *
 org.codehaus.plexus plexus-component-metadata jar s/.*/1.5.5/ * *
 org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * *
 org.codehaus.plexus plexus-utils * s/.*/2.x/ * *
-commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * *
-s/easymock/org.easymock/ easymock * s/.*/debian/ * *
 s/org.eclipse.jetty.aggregate/org.eclipse.jetty/ s/jetty-all/jetty-webapp/ * s/.*/9.x/ * *
 javax.servlet javax.servlet-api * s/.*/3.1/ * *

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