[Git][java-team/istack-commons][master] 5 commits: Standards-Version updated to 4.5.1

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / istack-commons


Commits:
68e44b66 by Emmanuel Bourg at 2021-02-09T19:34:01+01:00
Standards-Version updated to 4.5.1

- - - - -
1d82a41b by Emmanuel Bourg at 2021-02-09T19:34:09+01:00
Switch to debhelper level 13

- - - - -
c38a3b04 by Emmanuel Bourg at 2021-02-09T19:42:13+01:00
Removed the unused dependency on sisu-inject-plexus

- - - - -
88a19fcd by Emmanuel Bourg at 2021-02-09T21:23:37+01:00
Fixed the build failure with OpenJDK 17 (Closes: #982403)

- - - - -
c50545a7 by Emmanuel Bourg at 2021-02-09T22:15:00+01:00
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- − debian/compat
- debian/control
- debian/maven.ignoreRules
- debian/patches/03-java-version-parsing.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+istack-commons (3.0.6-5) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure with OpenJDK 17 (Closes: #982403)
+  * Removed the unused dependency on sisu-inject-plexus
+  * Standards-Version updated to 4.5.1
+  * Switch to debhelper level 13
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 09 Feb 2021 22:14:55 +0100
+
 istack-commons (3.0.6-4) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11


=====================================
debian/control
=====================================
@@ -6,7 +6,7 @@ Uploaders: Timo Aaltonen <tjaalton at ubuntu.com>
 Build-Depends:
  ant,
  ant-optional,
- debhelper (>= 11),
+ debhelper-compat (= 13),
  default-jdk,
  junit (>= 3.8.2),
  junit4,
@@ -26,7 +26,7 @@ Build-Depends:
  libwagon-http-java,
  maven-debian-helper (>= 2.2),
  testng (>= 6)
-Standards-Version: 4.4.0
+Standards-Version: 4.5.1
 Vcs-Git: https://salsa.debian.org/java-team/istack-commons.git
 Vcs-Browser: https://salsa.debian.org/java-team/istack-commons
 Homepage: https://javaee.github.io/jaxb-istack-commons/


=====================================
debian/maven.ignoreRules
=====================================
@@ -4,4 +4,5 @@ org.apache.maven.plugins maven-gpg-plugin * * * *
 org.codehaus.mojo buildnumber-maven-plugin * * * *
 org.codehaus.mojo cobertura-maven-plugin * * * *
 org.codehaus.mojo findbugs-maven-plugin * * * *
+org.sonatype.sisu sisu-inject-plexus * * * *
 org.tmatesoft.svnkit svnkit * * * *


=====================================
debian/patches/03-java-version-parsing.patch
=====================================
@@ -6,11 +6,13 @@ Forwarded: no
 
 --- a/istack-commons/tools/src/test/java/com/sun/istack/tools/ParallelWorldClassLoaderTest.java
 +++ b/istack-commons/tools/src/test/java/com/sun/istack/tools/ParallelWorldClassLoaderTest.java
-@@ -143,9 +143,9 @@
+@@ -142,10 +142,10 @@
+     }
  
      private static boolean isJDK9() {
-         String ver = System.getProperty("java.version");
+-        String ver = System.getProperty("java.version");
 -        int idx = ver.indexOf('-');
++        String ver = System.getProperty("java.specification.version");
 +        //int idx = ver.indexOf('-');
          int idx2 = ver.indexOf('.', 1);
 -        float v = Float.parseFloat(idx > 0 ? ver.substring(0, idx) : idx2 > 0 ? ver.substring(0, idx2) : ver);



View it on GitLab: https://salsa.debian.org/java-team/istack-commons/-/compare/983b719ecbad396842d3f8765ce74729e2e269c6...c50545a7060f6c7db7bb61344f364ea2a90a4749

-- 
View it on GitLab: https://salsa.debian.org/java-team/istack-commons/-/compare/983b719ecbad396842d3f8765ce74729e2e269c6...c50545a7060f6c7db7bb61344f364ea2a90a4749
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/20210209/6ae770a4/attachment.html>