Jochen Sprickerhof pushed to branch master at Debian Java Maintainers / classmate
Commits: f9153d1c by Paul Gevers at 2023-02-26T14:00:01+01:00 Import Debian changes 1.3.4-1.1 classmate (1.3.4-1.1) unstable; urgency=medium .. * Non-maintainer upload. * Source only upload to enable migration of libhibernate-validator-java (to fix #953338) - - - - - 6fb0416b by Jochen Sprickerhof at 2023-02-26T14:02:19+01:00 Add patch to fix FTBFS with OpenJDK Closes: #1012068 - - - - - ee070d3e by Jochen Sprickerhof at 2023-02-26T14:02:24+01:00 Update changelog for 1.3.4-2 release - - - - - 3 changed files: - debian/changelog - + debian/patches/0002-Fix-FTBFS-wit-JDK-17.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,18 @@ +classmate (1.3.4-2) unstable; urgency=medium + + * Team upload. + * Add patch to fix FTBFS with OpenJDK (Closes: #1012068) + + -- Jochen Sprickerhof <jspri...@debian.org> Sun, 26 Feb 2023 14:02:21 +0100 + +classmate (1.3.4-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Source only upload to enable migration of libhibernate-validator-java + (to fix #953338) + + -- Paul Gevers <elb...@debian.org> Sun, 01 Nov 2020 10:38:40 +0100 + classmate (1.3.4-1) unstable; urgency=medium * Initial release (Closes: #934202) ===================================== debian/patches/0002-Fix-FTBFS-wit-JDK-17.patch ===================================== @@ -0,0 +1,55 @@ +From: Jochen Sprickerhof <jspri...@debian.org> +Date: Sun, 26 Feb 2023 13:52:10 +0100 +Subject: Fix FTBFS wit JDK 17 + +--- + src/test/java/com/fasterxml/classmate/TestMemberResolver.java | 4 ++-- + src/test/java/com/fasterxml/classmate/TestTypeDescriptions.java | 2 +- + .../java/com/fasterxml/classmate/types/ResolvedObjectTypeTest.java | 6 ++++++ + 3 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/src/test/java/com/fasterxml/classmate/TestMemberResolver.java b/src/test/java/com/fasterxml/classmate/TestMemberResolver.java +index 38965b1..ca7ff72 100644 +--- a/src/test/java/com/fasterxml/classmate/TestMemberResolver.java ++++ b/src/test/java/com/fasterxml/classmate/TestMemberResolver.java +@@ -289,8 +289,8 @@ public class TestMemberResolver extends BaseTest + List<HierarchicType> typesWithOverrides = new ArrayList<HierarchicType>(); + Set<ClassKey> seenTypes = new HashSet<ClassKey>(); + addOverridesMethod.invoke(memberResolver, typesWithOverrides, seenTypes, String.class); +- assertEquals(4, seenTypes.size()); +- assertEquals(4, typesWithOverrides.size()); ++ assertEquals(6, seenTypes.size()); ++ assertEquals(6, typesWithOverrides.size()); + + memberResolver = new MemberResolver(typeResolver); + memberResolver.setMethodFilter(new Filter<RawMethod>() { +diff --git a/src/test/java/com/fasterxml/classmate/TestTypeDescriptions.java b/src/test/java/com/fasterxml/classmate/TestTypeDescriptions.java +index 567e107..825dae0 100644 +--- a/src/test/java/com/fasterxml/classmate/TestTypeDescriptions.java ++++ b/src/test/java/com/fasterxml/classmate/TestTypeDescriptions.java +@@ -36,7 +36,7 @@ public class TestTypeDescriptions extends BaseTest + * it has recursive type self-reference (via Comparable<T>) + */ + assertEquals("java.lang.String extends java.lang.Object" +- +" implements java.io.Serializable,java.lang.Comparable<java.lang.String>,java.lang.CharSequence", ++ +" implements java.io.Serializable,java.lang.Comparable<java.lang.String>,java.lang.CharSequence,java.lang.constant.Constable,java.lang.constant.ConstantDesc", + stringType.getFullDescription()); + assertEquals("Ljava/lang/String;", stringType.getErasedSignature()); + assertEquals("Ljava/lang/String;", stringType.getSignature()); +diff --git a/src/test/java/com/fasterxml/classmate/types/ResolvedObjectTypeTest.java b/src/test/java/com/fasterxml/classmate/types/ResolvedObjectTypeTest.java +index ec42f87..2e6b9fa 100644 +--- a/src/test/java/com/fasterxml/classmate/types/ResolvedObjectTypeTest.java ++++ b/src/test/java/com/fasterxml/classmate/types/ResolvedObjectTypeTest.java +@@ -77,6 +77,12 @@ public class ResolvedObjectTypeTest extends BaseTest + "COMPACT_STRINGS", "LATIN1", "UTF16" + }); + break; ++ case 7: // Java 9 ++ matchRawMembers(staticFields, new String[] { ++ "serialVersionUID", "serialPersistentFields", "CASE_INSENSITIVE_ORDER", ++ "COMPACT_STRINGS", "LATIN1", "UTF16", "REPL" ++ }); ++ break; + default: + fail("Expected 3 (JDK 1.6), 4 (1.7/1.8) or 6 (1.9) static fields, got "+count+"; fields: "+staticFields); + } ===================================== debian/patches/series ===================================== @@ -1 +1,2 @@ 01-bundle-plugin-configuration.patch +0002-Fix-FTBFS-wit-JDK-17.patch View it on GitLab: https://salsa.debian.org/java-team/classmate/-/compare/618a81f25b6086970a811f26a4d91f07c05b4078...ee070d3e41dd0c16e067878168807aee9e60d78d -- View it on GitLab: https://salsa.debian.org/java-team/classmate/-/compare/618a81f25b6086970a811f26a4d91f07c05b4078...ee070d3e41dd0c16e067878168807aee9e60d78d 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