[maven-archiver] 08/10: Removed 01-maven-artifact-compatibility.patch

[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-archiver.

commit 72ae8df943eb64d112ae7d0b1036a486602c52ad
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue May 5 00:34:49 2015 +0200

    Removed 01-maven-artifact-compatibility.patch
---
 debian/changelog                                   |  1 +
 .../patches/01-maven-artifact-compatibility.patch  | 45 ----------------------
 debian/patches/series                              |  2 +-
 3 files changed, 2 insertions(+), 46 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4960ee4..3b401c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ maven-archiver (2.6-1) UNRELEASED; urgency=medium
     - Changed the source/target level to 1.5
     - Depend on junit4 instead of junit
     - Depend on libplexus-archiver-java >= 2.2
+    - Removed 01-maven-artifact-compatibility.patch
   * Enabled the unit tests
   * The date set in the DEB_BUILD_DATE environment variable is now used
     for the timestamp in the pom.properties file embedded in the jar files
diff --git a/debian/patches/01-maven-artifact-compatibility.patch b/debian/patches/01-maven-artifact-compatibility.patch
deleted file mode 100644
index b51faf4..0000000
--- a/debian/patches/01-maven-artifact-compatibility.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Description: Ensures the compatibility of the tests with the version of maven-artifact in Debian
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: no
---- a/src/test/java/org/apache/maven/archiver/MockArtifact.java
-+++ b/src/test/java/org/apache/maven/archiver/MockArtifact.java
-@@ -54,7 +54,7 @@
- 
-     private String baseVersion;
-     
--    private ArtifactHandler artifactHandler;
-+    private ArtifactHandler artifactHandler = new org.apache.maven.artifact.handler.DefaultArtifactHandler();
- 
-     private boolean snapshot;
- 
-@@ -117,7 +117,7 @@
- 
-     public String getBaseVersion()
-     {
--        return baseVersion;
-+        return baseVersion != null ? baseVersion : version;
-     }
- 
-     public void setBaseVersion( String string )
-@@ -142,6 +142,11 @@
-         // TODO
-     }
- 
-+    public ArtifactMetadata getMetadata( Class metadataClass )
-+    {
-+        return null;
-+    }
-+
-     public Collection getMetadataList()
-     {
-         // TODO
-@@ -197,8 +202,7 @@
- 
-     public List getDependencyTrail()
-     {
--        // TODO
--        return null;  //To change body of implemented methods use File | Settings | File Templates.
-+        return VersionRange.createFromVersion("1.0");
-     }
- 
-     public void setDependencyTrail( List list )
diff --git a/debian/patches/series b/debian/patches/series
index 6f87a0a..85fc734 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-01-maven-artifact-compatibility.patch
+#01-maven-artifact-compatibility.patch
 02-use-changelog-date-as-pom.properties-timestamp.patch

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