[lintian] 01/01: Apply patch from Bas Couwenberg to bump the maximum permissible bytecode version number now that openjdk-9 is now the default-jdk. (Closes: #894397)
This is an automated email from the git hooks/post-receive script.
lamby pushed a commit to branch master
in repository lintian.
commit ccac5ef40718abc82044fc6ec0a681f0697f6a5a
Author: Chris Lamb <lamby@debian.org>
Date: Thu Mar 29 20:42:09 2018 +0100
Apply patch from Bas Couwenberg to bump the maximum permissible bytecode version number now that openjdk-9 is now the default-jdk. (Closes: #894397)
---
checks/java.pm | 3 ++-
data/java/constants | 9 +++++----
debian/changelog | 4 ++++
t/tests/java-class-format/debian/debian/rules | 4 ++--
t/tests/java-class-format/tags | 2 +-
5 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/checks/java.pm b/checks/java.pm
index dafe531..31c0238 100644
--- a/checks/java.pm
+++ b/checks/java.pm
@@ -98,7 +98,7 @@ sub run {
or $mver
> $MAX_BYTECODE->value('max-bytecode-existing-version')) {
# First public major version was 45 (Java1), latest
- # version is 52 (Java8).
+ # version is 53 (Java9).
tag 'unknown-java-class-version', $jar_file,
"($class -> $mver)";
# Skip the rest of this Jar.
@@ -213,6 +213,7 @@ sub run {
# 50 -> Java6
# 51 -> Java7
# 52 -> Java8
+ # 53 -> Java9
my $bad = 0;
# If the lowest version used is greater than the requested
diff --git a/data/java/constants b/data/java/constants
index c114857..0c28b1e 100644
--- a/data/java/constants
+++ b/data/java/constants
@@ -4,11 +4,12 @@
# 45-49 -> Java1
# 50 -> Java6
# 51 -> Java7
-# 52 -> Java8 - Current max version in Debian unstable
-# 53 -> Java9
-max-bytecode-version = 52
+# 52 -> Java8
+# 53 -> Java9 - Current max version in Debian unstable
+# 54 -> Java10
+max-bytecode-version = 53
-max-bytecode-existing-version = 53
+max-bytecode-existing-version = 54
# The following should not change
min-bytecode-version = 45
diff --git a/debian/changelog b/debian/changelog
index 6bf47ac..de026db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ lintian (2.5.81) UNRELEASED; urgency=medium
+ [CL] Add a pedantic warning for upstream tarballs that contain empty
directories as these can cause problems with git-buildpackage.
Thanks to Balint Reczey for the idea! (Closes: #894368)
+ * checks/java.pm:
+ + [CL] Apply patch from Bas Couwenberg to bump the maximum permissible
+ bytecode version number now that openjdk-9 is now the default-jdk.
+ (Closes: #894397)
* checks/files.pm:
+ [CL] Add .ogg files to the list of non-license file extensions to
avoid a false-positive in extra-license-file. Thanks to Innocent De
diff --git a/t/tests/java-class-format/debian/debian/rules b/t/tests/java-class-format/debian/debian/rules
index f210d1c..9815a3a 100755
--- a/t/tests/java-class-format/debian/debian/rules
+++ b/t/tests/java-class-format/debian/debian/rules
@@ -7,8 +7,8 @@ override_jh_build:
unzip test.jar
# Unknown class version
perl -i -pe 's/^(\xCA\xFE\xBA\xBE...)./$$1\x2A/' org/debian/lintian/TestA.class
- # Java9 (unsupported)
- perl -i -pe 's/^(\xCA\xFE\xBA\xBE...)./$$1\x35/' org/debian/lintian/TestB.class
+ # Java10 (unsupported)
+ perl -i -pe 's/^(\xCA\xFE\xBA\xBE...)./$$1\x36/' org/debian/lintian/TestB.class
# Put them in separate Jars because Lintian stops when the first
# "unknown class format" is seen
zip -r testa.jar META-INF/ org/debian/lintian/TestA.class
diff --git a/t/tests/java-class-format/tags b/t/tests/java-class-format/tags
index daecaf0..d67a560 100644
--- a/t/tests/java-class-format/tags
+++ b/t/tests/java-class-format/tags
@@ -1,2 +1,2 @@
-W: libtest-java: incompatible-java-bytecode-format Java9 version (Class format: 53)
+W: libtest-java: incompatible-java-bytecode-format Java10 version (Class format: 54)
W: libtest-java: unknown-java-class-version usr/share/java/testa-1.0.jar (org/debian/lintian/TestA.class -> 42)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: