[plexus-containers1.5] 02/07: Removed 01-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 plexus-containers1.5.

commit bdc6698fb8a78372c7a0fb2baff9bda102c0a5f6
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Nov 19 12:35:30 2015 +0100

    Removed 01-classworlds-compatibility.patch (fixed upstream)
---
 debian/changelog                                  |  4 ++-
 debian/patches/01-classworlds-compatibility.patch | 43 -----------------------
 debian/patches/series                             |  1 -
 3 files changed, 3 insertions(+), 45 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cba5eda..c2424e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-plexus-containers1.5 (1.5.5-7) UNRELEASED; urgency=medium
+plexus-containers1.5 (1.6-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Removed 01-classworlds-compatibility.patch (fixed upstream)
   * debian/watch: Track the release tags on GitHub
   * Updated Standards-Version to 3.9.6 (no changes)
 
diff --git a/debian/patches/01-classworlds-compatibility.patch b/debian/patches/01-classworlds-compatibility.patch
deleted file mode 100644
index 2ba3c75..0000000
--- a/debian/patches/01-classworlds-compatibility.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Description: Maintains the source compatibility with the latest version of plexus-classworlds
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/plexus-component-metadata/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java
-+++ b/plexus-component-metadata/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java
-@@ -189,7 +189,7 @@
-         {
-             try
-             {
--                roleClass = realm.loadClass( role );
-+                roleClass = (Class<T>) realm.loadClass( role );
-                 Thread.currentThread();
-             }
-             catch ( Throwable ignored )
-@@ -299,7 +299,7 @@
-         {
-             try
-             {
--                implementationClass = realm.loadClass( implementation );
-+                implementationClass = (Class<T>) realm.loadClass( implementation );
-                 Thread.currentThread();
-             }
-             catch ( Throwable ignored )
---- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java
-+++ b/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java
-@@ -189,7 +189,7 @@
-         {
-             try
-             {
--                roleClass = getRealm().loadClass( getRole() );
-+                roleClass = (Class<T>) getRealm().loadClass( getRole() );
-                 Thread.currentThread();
-             }
-             catch ( Throwable ignored )
-@@ -299,7 +299,7 @@
-         {
-             try
-             {
--                implementationClass = getRealm().loadClass( getImplementation() );
-+                implementationClass = (Class<T>) getRealm().loadClass( getImplementation() );
-                 Thread.currentThread();
-             }
-             catch ( Throwable ignored )
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ea4e502..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01-classworlds-compatibility.patch

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