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 a148881738d450de0b19a591529578e802c6adaa Author: Emmanuel Bourg <[email protected]> Date: Tue Oct 29 11:06:13 2013 +0100 Fixed the source incompatibility with plexus-classworlds 2.5 (Closes: #728171) --- debian/changelog | 8 ++++ debian/patches/01-classworlds-compatibility.patch | 43 +++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 52 insertions(+) diff --git a/debian/changelog b/debian/changelog index e0f749f..dee360e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +plexus-containers1.5 (1.5.5-6) UNRELEASED; urgency=low + + * Team upload. + * Added a patch to fix the source incompatibility with plexus-classworlds 2.5 + (Closes: #728171) + + -- Emmanuel Bourg <[email protected]> Tue, 29 Oct 2013 10:52:31 +0100 + plexus-containers1.5 (1.5.5-5) unstable; urgency=low * Team upload. diff --git a/debian/patches/01-classworlds-compatibility.patch b/debian/patches/01-classworlds-compatibility.patch new file mode 100644 index 0000000..2ba3c75 --- /dev/null +++ b/debian/patches/01-classworlds-compatibility.patch @@ -0,0 +1,43 @@ +Description: Maintains the source compatibility with the latest version of plexus-classworlds +Author: Emmanuel Bourg <[email protected]> +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 new file mode 100644 index 0000000..ea4e502 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +01-classworlds-compatibility.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-containers1.5.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
