[maven-shade-plugin] 22/24: Removed descriptor.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-shade-plugin.

commit 7922fcbadb487f3598bd5427d6a46c0970f54497
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jan 18 11:28:43 2016 +0100

    Removed descriptor.patch
---
 debian/changelog                |  1 +
 debian/patches/descriptor.patch | 11 -----------
 debian/patches/series           |  1 -
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8e4c82e..a71a1cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ maven-shade-plugin (2.4.3-1) UNRELEASED; urgency=medium
     - Depend on libmaven3-core-java instead of libmaven2-core-java
     - Depend on libplexus-utils2-java instead of libplexus-utils-java
     - New build dependency on libmockito-java
+    - Removed descriptor.patch
   * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
   * Use XZ compression for the upstream tarball
diff --git a/debian/patches/descriptor.patch b/debian/patches/descriptor.patch
deleted file mode 100644
index 4c0f58d..0000000
--- a/debian/patches/descriptor.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
-+++ b/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
-@@ -112,7 +112,7 @@
-     /**
-      * The dependency tree builder to use.
-      *
--     * @component
-+     * @component role="org.apache.maven.shared.dependency.tree.DependencyTreeBuilder"
-      * @required
-      * @readonly
-      */
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 28fd584..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-descriptor.patch

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