[shiro] 01/04: Fixed the build failure with Spring Framework 4.3.x (Closes: #834471)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository shiro.

commit ac8f1293931ad107315e35dd2de1b59251cc1521
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Aug 19 19:25:41 2016 +0200

    Fixed the build failure with Spring Framework 4.3.x (Closes: #834471)
---
 debian/changelog                             |  7 +++++++
 debian/patches/03-spring-compatibility.patch | 17 +++++++++++++++++
 debian/patches/series                        |  1 +
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 11f7cc1..88c8969 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+shiro (1.2.5-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure with Spring Framework 4.3.x (Closes: #834471)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 19 Aug 2016 14:11:12 +0200
+
 shiro (1.2.5-1) unstable; urgency=high
 
   * Team upload.
diff --git a/debian/patches/03-spring-compatibility.patch b/debian/patches/03-spring-compatibility.patch
new file mode 100644
index 0000000..5c33f9c
--- /dev/null
+++ b/debian/patches/03-spring-compatibility.patch
@@ -0,0 +1,17 @@
+Description: Fixes the compatibility with the version of Spring Framework in Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/support/spring/src/main/java/org/apache/shiro/spring/LifecycleBeanPostProcessor.java
++++ b/support/spring/src/main/java/org/apache/shiro/spring/LifecycleBeanPostProcessor.java
+@@ -125,6 +125,11 @@
+         }
+     }
+ 
++    @Override
++    public boolean requiresDestruction(Object object) {
++        return true;
++    }
++
+     /**
+      * Order value of this BeanPostProcessor.
+      *
diff --git a/debian/patches/series b/debian/patches/series
index 00ab73e..3e75a53 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-bundles-to-jars.patch
 02-reproducible-build.patch
+03-spring-compatibility.patch

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