[maven-dependency-plugin] 05/09: Depend on libmaven3-core-java instead of libmaven2-core-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 maven-dependency-plugin.

commit e553d027876a48bf3e23bb749251f8b302765721
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Aug 31 18:55:28 2017 +0200

    Depend on libmaven3-core-java instead of libmaven2-core-java
---
 debian/changelog                            |  1 +
 debian/control                              |  3 +-
 debian/maven.ignoreRules                    |  1 +
 debian/maven.rules                          |  3 ++
 debian/patches/04-maven-compatibility.patch | 46 +++++++++++++++++++++++++++++
 debian/patches/series                       |  1 +
 6 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c6a9ef2..047a2bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ maven-dependency-plugin (2.8-2) UNRELEASED; urgency=medium
   * Depend on libplexus-classworlds2-java instead of libclassworlds-java
   * Depend on libplexus-container-default1.5-java instead of
     libplexus-container-default-java
+  * Depend on libmaven3-core-java instead of libmaven2-core-java
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 31 Aug 2017 14:43:58 +0200
 
diff --git a/debian/control b/debian/control
index 8ad5002..b0749b1 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,9 @@ Build-Depends-Indep: junit4,
                      libmaven-file-management-java,
                      libmaven-plugin-testing-java,
                      libmaven-plugin-tools-java,
+                     libmaven-reporting-api-java,
                      libmaven-reporting-impl-java,
-                     libmaven2-core-java,
+                     libmaven3-core-java,
                      libplexus-archiver-java,
                      libplexus-container-default1.5-java,
                      libplexus-io-java,
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 0088a40..a4cc111 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -14,3 +14,4 @@
 # from the POM
 #   junit junit jar s/3\\..*/3.x/
 
+org.apache.maven maven-artifact-manager
diff --git a/debian/maven.rules b/debian/maven.rules
index 22e078b..c5522a5 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -17,6 +17,8 @@
 #   junit junit jar s/3\\..*/3.x/
 
 junit junit jar s/.*/4.x/ * *
+org.apache.maven s/maven-project/maven-compat/ * s/.*/3.x/ * *
+org.apache.maven maven-* * s/.*/3.x/ * *
 org.codehaus.plexus plexus-container-default jar s/.*/1.5.5/ * *
 org.codehaus.plexus plexus-utils * s/.*/2.x/ * *
 s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-harness * s/.*/debian/ * *
@@ -24,4 +26,5 @@ s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-
 s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing * s/.*/debian/ * *
 s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-test-tools * s/.*/debian/ * *
 commons-collections commons-collections * s/.*/3.x/ * *
+org.apache.maven.reporting maven-reporting-api * s/.*/3.x/ * *
 s/classworlds/org.codehaus.plexus/ s/classworlds/plexus-classworlds/ * s/.*/2.x/ * *
diff --git a/debian/patches/04-maven-compatibility.patch b/debian/patches/04-maven-compatibility.patch
new file mode 100644
index 0000000..8f1bb4b
--- /dev/null
+++ b/debian/patches/04-maven-compatibility.patch
@@ -0,0 +1,46 @@
+--- a/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java
++++ b/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java
+@@ -140,10 +140,6 @@
+         {
+             throw new MojoExecutionException( "Nested:", e );
+         }
+-        catch ( final InvalidDependencyVersionException e )
+-        {
+-            throw new MojoExecutionException( "Nested:", e );
+-        }
+         catch ( final ArtifactFilterException e )
+         {
+             throw new MojoExecutionException( "Nested:", e );
+--- a/src/test/java/org/apache/maven/plugin/dependency/TestGetMojo.java
++++ b/src/test/java/org/apache/maven/plugin/dependency/TestGetMojo.java
+@@ -25,7 +25,6 @@
+ import org.apache.maven.artifact.repository.ArtifactRepository;
+ import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
+ import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
+-import org.apache.maven.artifact.repository.layout.LegacyRepositoryLayout;
+ import org.apache.maven.plugin.MojoFailureException;
+ import org.apache.maven.plugin.testing.stubs.StubArtifactRepository;
+ import org.codehaus.plexus.util.FileUtils;
+@@ -154,11 +153,6 @@
+         assertEquals( DefaultRepositoryLayout.class, repo.getLayout().getClass() );
+         assertEquals( "http://repo1.maven.apache.org/maven2", repo.getUrl() );
+ 
+-        repo = mojo.parseRepository( "central::legacy::http://repo1.maven.apache.org/maven2", policy );
+-        assertEquals( "central", repo.getId() );
+-        assertEquals( LegacyRepositoryLayout.class, repo.getLayout().getClass() );
+-        assertEquals( "http://repo1.maven.apache.org/maven2", repo.getUrl() );
+-
+         repo = mojo.parseRepository( "central::::http://repo1.maven.apache.org/maven2", policy );
+         assertEquals( "central", repo.getId() );
+         assertEquals( DefaultRepositoryLayout.class, repo.getLayout().getClass() );
+--- a/src/test/java/org/apache/maven/plugin/dependency/fromDependencies/TestCopyDependenciesMojo2.java
++++ b/src/test/java/org/apache/maven/plugin/dependency/fromDependencies/TestCopyDependenciesMojo2.java
+@@ -33,7 +33,7 @@
+ import org.apache.maven.artifact.repository.metadata.Snapshot;
+ import org.apache.maven.artifact.repository.metadata.SnapshotArtifactRepositoryMetadata;
+ import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
+-import org.apache.maven.artifact.transform.SnapshotTransformation;
++import org.apache.maven.repository.legacy.resolver.transform.SnapshotTransformation;
+ import org.apache.maven.plugin.MojoExecutionException;
+ import org.apache.maven.plugin.dependency.AbstractDependencyMojoTestCase;
+ import org.apache.maven.plugin.dependency.fromDependencies.CopyDependenciesMojo;
diff --git a/debian/patches/series b/debian/patches/series
index 87087cd..54db84a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01-fix-plugin-annotations.patch
 02-plexus-utils-compatibility.patch
 03-classworlds-compatibility.patch
+04-maven-compatibility.patch

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