From 968b28a676c592a71c08d72d2644d1ab2aeb59f9 Mon Sep 17 00:00:00 2001 From: nbauma109 Date: Sun, 1 Feb 2026 15:46:31 +0100 Subject: [PATCH 1/2] Update test ConstantPoolModuleAccessTest for Java 26-ea --- .../bcel/classfile/ConstantPoolModuleAccessTest.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleAccessTest.java b/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleAccessTest.java index 2c9b1cce51..2efcdefd5e 100644 --- a/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleAccessTest.java +++ b/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleAccessTest.java @@ -261,8 +261,12 @@ public void visitModule(final Module obj) { assertEquals(expected, Arrays.asList(usedClassNames)); } else if (urlPath.contains("/jdk.jpackage/module-info.class")) { final List expected = new ArrayList<>(); - expected.add("jdk.jpackage.internal.Bundler"); - expected.add("jdk.jpackage.internal.Bundlers"); + if (javaClass.getMajor() <= Const.MAJOR_25) { + expected.add("jdk.jpackage.internal.Bundler"); + expected.add("jdk.jpackage.internal.Bundlers"); + } else { + expected.add("jdk.jpackage.internal.cli.CliBundlingEnvironment"); + } assertEquals(expected, Arrays.asList(usedClassNames)); } else if (urlPath.contains("/jdk.naming.ldap/module-info.class")) { final List expected = new ArrayList<>(); From 377ffcc6b7843e4b65bfdd65c930e543988cae01 Mon Sep 17 00:00:00 2001 From: nbauma109 Date: Sun, 1 Feb 2026 15:53:02 +0100 Subject: [PATCH 2/2] fix sun.util.resources.LocaleData$LocaleDataResourceBundleProvider --- .../bcel/classfile/ConstantPoolModuleAccessTest.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleAccessTest.java b/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleAccessTest.java index 2efcdefd5e..f4a17aadda 100644 --- a/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleAccessTest.java +++ b/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleAccessTest.java @@ -179,8 +179,12 @@ public void visitModule(final Module obj) { expected.add("jdk.internal.logger.DefaultLoggerFinder"); expected.add("sun.text.spi.JavaTimeDateTimePatternProvider"); expected.add("sun.util.locale.provider.LocaleDataMetaInfo"); - expected.add("sun.util.resources.LocaleData$CommonResourceBundleProvider"); - expected.add("sun.util.resources.LocaleData$SupplementaryResourceBundleProvider"); + if (javaClass.getMajor() <= Const.MAJOR_25) { + expected.add("sun.util.resources.LocaleData$CommonResourceBundleProvider"); + expected.add("sun.util.resources.LocaleData$SupplementaryResourceBundleProvider"); + } else { + expected.add("sun.util.resources.LocaleData$LocaleDataResourceBundleProvider"); + } expected.add("sun.util.spi.CalendarProvider"); assertEquals(expected, Arrays.asList(usedClassNames)); } else if (urlPath.contains("/jdk.management.agent/module-info.class") && javaClass.getMajor() < Const.MAJOR_21) {