Pierre Gruet pushed to branch master at Debian Java Maintainers / libreflections-java
Commits: c575e5c5 by Vladimir Petko at 2023-11-25T19:55:31+00:00 Fix Java 21 FTBFS - - - - - 13556037 by Pierre Gruet at 2023-11-25T19:55:31+00:00 Merge branch 'master' into 'master' Fix Java 21 FTBFS See merge request java-team/libreflections-java!1 - - - - - 3 changed files: - debian/changelog - + debian/patches/add_annotations.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +libreflections-java (0.10.2+dfsg-2) UNRELEASED; urgency=medium + + * d/p/add_annotations.patch: add annotations for Java 21 (Closes: #1053055). + + -- Vladimir Petko <vladimir.pe...@canonical.com> Thu, 23 Nov 2023 09:54:16 +1300 + libreflections-java (0.10.2+dfsg-1) unstable; urgency=medium * New upstream version 0.10.2+dfsg ===================================== debian/patches/add_annotations.patch ===================================== @@ -0,0 +1,32 @@ +Description: Add Java 21-specific annotations + Note: the test file was removed upstream in + https://github.com/ronmamo/reflections/commit/a566ac6d69008b16296d623c490d5a8b6179f96f#diff-38481b6618c9be4d7e566974e65bc21bc501d6dcd171ea4a58100d2c485bb376 +Author: Vladimir Petko <vladimir.pe...@canonical.com> +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1053055 +Forwarded: not-needed +Last-Update: 2023-11-23 + +--- a/src/test/java/org/reflections/JdkTests.java ++++ b/src/test/java/org/reflections/JdkTests.java +@@ -103,7 +105,9 @@ + "sun.reflect.CallerSensitive", + "java.lang.invoke.LambdaForm$Hidden", + "jdk.internal.reflect.CallerSensitive", // jdk 11, 13, 15 +- "jdk.internal.PreviewFeature") // jdk 15 ++ "jdk.internal.PreviewFeature", // jdk 15 ++ "jdk.internal.javac.PreviewFeature", // jdk 21 ++ "jdk.internal.reflect.CallerSensitiveAdapter") // jdk 21 + .forEach(diff::remove); + assertEquals(diff, Collections.emptyMap()); + } +@@ -128,7 +132,9 @@ + Arrays.asList("com.sun.istack.internal.NotNull", // jdk 8 + "com.sun.istack.internal.Nullable", + "jdk.internal.PreviewFeature", // jdk 15 +- "jdk.internal.vm.annotation.Stable") // jdk 17 ++ "jdk.internal.vm.annotation.Stable", // jdk 17 ++ "jdk.internal.javac.PreviewFeature", // jdk 21 ++ "jdk.internal.javac.PreviewFeature$JEP") // jdk 21 + .forEach(diff::remove); + assertEquals(diff, Collections.emptyMap()); + } ===================================== debian/patches/series ===================================== @@ -1,3 +1,4 @@ omit_manifest.patch omit_flaky_test.patch omitting_tests_needing_sourceless_resources.patch +add_annotations.patch View it on GitLab: https://salsa.debian.org/java-team/libreflections-java/-/compare/b5d84b5824903c73ed5881ec7958176fa37bf3e5...135560374212f0978c3943e96725fb3ecb794a41 -- View it on GitLab: https://salsa.debian.org/java-team/libreflections-java/-/compare/b5d84b5824903c73ed5881ec7958176fa37bf3e5...135560374212f0978c3943e96725fb3ecb794a41 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
