From 06ae7fb2b5a3404d23e763e5e8f0ce1e33d6c2b0 Mon Sep 17 00:00:00 2001
From: Brian Clozel <brian.clozel@broadcom.com>
Date: Fri, 7 Nov 2025 14:05:40 +0100
Subject: [PATCH] Add jar validation and fix multi-release jar

See gh-35768

Signed-off-by: Clayton Walker <clayton.m.walker@gmail.com>
---
 .../multirelease/MultiReleaseJarPlugin.java   |  7 ++++
 .../MultiReleaseJarValidateTask.java          | 37 +++++++++++++++++++
 .../ClassFileMetadataReaderFactory.java       |  2 +-
 3 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 buildSrc/src/main/java/org/springframework/build/multirelease/MultiReleaseJarValidateTask.java

diff --git a/buildSrc/src/main/java/org/springframework/build/multirelease/MultiReleaseJarPlugin.java b/buildSrc/src/main/java/org/springframework/build/multirelease/MultiReleaseJarPlugin.java
index 9e9c871d05c..bc4045c6e97 100644
--- a/buildSrc/src/main/java/org/springframework/build/multirelease/MultiReleaseJarPlugin.java
+++ b/buildSrc/src/main/java/org/springframework/build/multirelease/MultiReleaseJarPlugin.java
@@ -27,6 +27,9 @@ import org.gradle.api.plugins.ExtensionContainer;
 import org.gradle.api.plugins.JavaPlugin;
 import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.tasks.TaskContainer;
+import org.gradle.api.tasks.TaskProvider;
+import org.gradle.api.tasks.bundling.AbstractArchiveTask;
+import org.gradle.jvm.tasks.Jar;
 import org.gradle.jvm.toolchain.JavaToolchainService;
 
 /**
@@ -57,5 +60,9 @@ public class MultiReleaseJarPlugin implements Plugin<Project> {
 				tasks,
 				dependencies,
 				objects);
+		TaskProvider<MultiReleaseJarValidateTask> validateJarTask = tasks.register("validateJar", MultiReleaseJarValidateTask.class, (task) -> {
+			task.getJar().set(tasks.named("jar", Jar.class).flatMap(AbstractArchiveTask::getArchiveFile));
+		});
+		tasks.named("check", task -> task.dependsOn(validateJarTask));
 	}
 }
diff --git a/buildSrc/src/main/java/org/springframework/build/multirelease/MultiReleaseJarValidateTask.java b/buildSrc/src/main/java/org/springframework/build/multirelease/MultiReleaseJarValidateTask.java
new file mode 100644
index 00000000000..75d237919e9
--- /dev/null
+++ b/buildSrc/src/main/java/org/springframework/build/multirelease/MultiReleaseJarValidateTask.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.build.multirelease;
+
+import org.gradle.api.file.RegularFileProperty;
+import org.gradle.api.tasks.CacheableTask;
+import org.gradle.api.tasks.InputFile;
+import org.gradle.api.tasks.JavaExec;
+import org.gradle.api.tasks.PathSensitive;
+import org.gradle.api.tasks.PathSensitivity;
+
+import java.util.List;
+
+@CacheableTask
+public abstract class MultiReleaseJarValidateTask extends JavaExec {
+	@InputFile
+	@PathSensitive(PathSensitivity.RELATIVE)
+	public abstract RegularFileProperty getJar();
+	public MultiReleaseJarValidateTask() {
+		getMainModule().set("jdk.jartool");
+		getArgumentProviders().add(() -> List.of("--validate", "--file", getJar().get().getAsFile().getAbsolutePath()));
+	}
+}
diff --git a/spring-core/src/main/java24/org/springframework/core/type/classreading/ClassFileMetadataReaderFactory.java b/spring-core/src/main/java24/org/springframework/core/type/classreading/ClassFileMetadataReaderFactory.java
index 553f1acd904..0aab392609c 100644
--- a/spring-core/src/main/java24/org/springframework/core/type/classreading/ClassFileMetadataReaderFactory.java
+++ b/spring-core/src/main/java24/org/springframework/core/type/classreading/ClassFileMetadataReaderFactory.java
@@ -30,7 +30,7 @@ import org.springframework.core.io.ResourceLoader;
  * @author Brian Clozel
  * @since 7.0
  */
-public class ClassFileMetadataReaderFactory extends AbstractMetadataReaderFactory {
+class ClassFileMetadataReaderFactory extends AbstractMetadataReaderFactory {
 
 	/**
 	 * Create a new ClassFileMetadataReaderFactory for the default class loader.