[Git][java-team/shiro][master] 2 commits: Fixed the build failure with Java 11 (Closes: #912390)

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / shiro


Commits:
1da211ce by Emmanuel Bourg at 2018-11-29T13:58:23Z
Fixed the build failure with Java 11 (Closes: #912390)

- - - - -
510c252c by Emmanuel Bourg at 2018-11-29T13:58:28Z
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/04-java11-compatibility.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,10 +1,11 @@
-shiro (1.3.2-3) UNRELEASED; urgency=medium
+shiro (1.3.2-3) unstable; urgency=medium
 
+  * Fixed the build failure with Java 11 (Closes: #912390)
   * Standards-Version updated to 4.2.1
   * Switch to debhelper level 11
   * Use salsa.debian.org Vcs-* URLs
 
- -- Emmanuel Bourg <ebourg at apache.org>  Thu, 29 Nov 2018 14:26:40 +0100
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 29 Nov 2018 14:37:03 +0100
 
 shiro (1.3.2-2) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -12,6 +12,7 @@ Build-Depends:
  libcommons-beanutils-java,
  libcommons-cli-java,
  libehcache-java,
+ libgeronimo-annotation-1.3-spec-java,
  libguice-java (>= 3.0-6~),
  libhsqldb-java,
  liblog4j1.2-java,


=====================================
debian/patches/04-java11-compatibility.patch
=====================================
@@ -0,0 +1,18 @@
+Description: Fixes the compatibility with Java 11
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/support/guice/pom.xml
++++ b/support/guice/pom.xml
+@@ -64,6 +64,12 @@
+             <scope>provided</scope>
+         </dependency>
+         <dependency>
++            <groupId>org.apache.geronimo.specs</groupId>
++            <artifactId>geronimo-annotation_1.3_spec</artifactId>
++            <version>debian</version>
++            <scope>provided</scope>
++        </dependency>
++        <dependency>
+             <groupId>org.slf4j</groupId>
+             <artifactId>jcl-over-slf4j</artifactId>
+             <scope>test</scope>


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 01-bundles-to-jars.patch
 02-reproducible-build.patch
 03-spring-compatibility.patch
+04-java11-compatibility.patch



View it on GitLab: https://salsa.debian.org/java-team/shiro/compare/cf165704312bbc35bab2ea6ad62e95e8a14f41e0...510c252c02b9da9207fe8d7a0cdc2fb05895d3be

-- 
View it on GitLab: https://salsa.debian.org/java-team/shiro/compare/cf165704312bbc35bab2ea6ad62e95e8a14f41e0...510c252c02b9da9207fe8d7a0cdc2fb05895d3be
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20181129/28119a19/attachment.html>