[maven-dependency-plugin] 09/18: Removed 04-maven-compatibility.patch (fixed upstream)

[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 a3bab8ecae858773a6b9f834a80edef2446594a9
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Sep 4 14:01:07 2017 +0200

    Removed 04-maven-compatibility.patch (fixed upstream)
---
 debian/changelog                            |  1 +
 debian/patches/04-maven-compatibility.patch | 46 -----------------------------
 debian/patches/series                       |  1 -
 3 files changed, 1 insertion(+), 47 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0793352..a305811 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ maven-dependency-plugin (3.0.0-1) UNRELEASED; urgency=medium
     - Removed 01-fix-plugin-annotations.patch (fixed upstream)
     - Removed 02-plexus-utils-compatibility.patch (fixed upstream)
     - Removed 03-classworlds-compatibility.patch (obsolete)
+    - Removed 04-maven-compatibility.patch (fixed upstream)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 04 Sep 2017 13:03:44 +0200
 
diff --git a/debian/patches/04-maven-compatibility.patch b/debian/patches/04-maven-compatibility.patch
deleted file mode 100644
index 8f1bb4b..0000000
--- a/debian/patches/04-maven-compatibility.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- 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 5c9ecf2..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-04-maven-compatibility.patch

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