[sisu-plexus] 02/09: Removed 03-classworlds-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 sisu-plexus.

commit b45587b179ae96141c8c48fbd7a80d5b4e288217
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jul 6 14:02:36 2015 +0200

    Removed 03-classworlds-compatibility.patch (fixed upstream)
---
 debian/changelog                                  |  7 +++++++
 debian/patches/03-classworlds-compatibility.patch | 14 --------------
 debian/patches/series                             |  1 -
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ec05206..7981b22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sisu-plexus (0.3.1-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+    - Removed 03-classworlds-compatibility.patch (fixed upstream)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 06 Jul 2015 11:52:22 +0200
+
 sisu-plexus (0.0.0.M5-1) unstable; urgency=medium
 
   * Initial release (Closes: #763752)
diff --git a/debian/patches/03-classworlds-compatibility.patch b/debian/patches/03-classworlds-compatibility.patch
deleted file mode 100644
index 88ecb5d..0000000
--- a/debian/patches/03-classworlds-compatibility.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Support compilation against classworlds 2.5.1
-Origin: backport, https://github.com/eclipse/sisu.plexus/commit/b753242
-Bug: https://bugs.eclipse.org/423596
---- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/ComponentDescriptor.java
-+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/ComponentDescriptor.java
-@@ -195,7 +195,7 @@
-     {
-         try
-         {
--            return classRealm.loadClass( getRole() );
-+            return (Class<T>) classRealm.loadClass( getRole() );
-         }
-         catch ( final Exception e )
-         {
diff --git a/debian/patches/series b/debian/patches/series
index 63e96b0..c1c33b6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01-drop-maven3-prereq.patch
 02-change-packaging-type.patch
-03-classworlds-compatibility.patch

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