From c928bd58412d00318de44b4b6066af008c475049 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= <stephane.nicoll@broadcom.com>
Date: Wed, 7 May 2025 11:34:09 -0700
Subject: [PATCH] Upgrade to Jakarta Validation 3.1.0

Closes gh-45480
---
 spring-boot-project/spring-boot-dependencies/build.gradle   | 6 +-----
 .../analyzer/ValidationExceptionFailureAnalyzer.java        | 6 ++++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
index bb139fadff..8af69e9a86 100644
--- a/spring-boot-project/spring-boot-dependencies/build.gradle
+++ b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -839,11 +839,7 @@ bom {
 				.formatted(version.major(), version.minor()), "jakarta.transaction")
 		}
 	}
-	library("Jakarta Validation", "3.0.2") {
-		prohibit {
-			versionRange "[3.1.0-M1,)"
-			because "it exceeds our Jakarta EE 10 baseline"
-		}
+	library("Jakarta Validation", "3.1.0") {
 		group("jakarta.validation") {
 			modules = [
 				"jakarta.validation-api"
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/ValidationExceptionFailureAnalyzer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/ValidationExceptionFailureAnalyzer.java
index 47b849308b..fc5cf323c7 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/ValidationExceptionFailureAnalyzer.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/ValidationExceptionFailureAnalyzer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2025 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.
@@ -16,6 +16,7 @@
 
 package org.springframework.boot.diagnostics.analyzer;
 
+import jakarta.validation.NoProviderFoundException;
 import jakarta.validation.ValidationException;
 
 import org.springframework.boot.diagnostics.AbstractFailureAnalyzer;
@@ -38,7 +39,8 @@ class ValidationExceptionFailureAnalyzer extends AbstractFailureAnalyzer<Validat
 
 	@Override
 	protected FailureAnalysis analyze(Throwable rootFailure, ValidationException cause) {
-		if (cause.getMessage().startsWith(JAVAX_MISSING_IMPLEMENTATION_MESSAGE)
+		if (cause instanceof NoProviderFoundException
+				|| cause.getMessage().startsWith(JAVAX_MISSING_IMPLEMENTATION_MESSAGE)
 				|| cause.getMessage().startsWith(JAKARTA_MISSING_IMPLEMENTATION_MESSAGE)) {
 			return new FailureAnalysis(
 					"The Bean Validation API is on the classpath but no implementation could be found",