From 43a1145e7501eb4efd4ab387aff6de5b28f78d13 Mon Sep 17 00:00:00 2001
From: Dmytro Nosan <dimanosan@gmail.com>
Date: Mon, 14 Oct 2024 15:07:15 +0300
Subject: [PATCH 1/2] Fix links to CNCF resources in Javadoc

See gh-42645
---
 .../boot/docker/compose/core/Regex.java            | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/Regex.java b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/Regex.java
index b6ae27942d4..bb7921805a3 100644
--- a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/Regex.java
+++ b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/Regex.java
@@ -19,17 +19,15 @@ package org.springframework.boot.docker.compose.core;
 import java.util.regex.Pattern;
 
 /**
- * Regular Expressions for image names and references based on those found in the Docker
- * codebase.
+ * Regular Expressions for image names and references based on those found in the CNCF
+ * Distribution Project codebase.
  *
  * @author Scott Frederick
  * @author Phillip Webb
- * @see <a href=
- * "https://github.com/docker/distribution/blob/master/reference/reference.go">Docker
- * grammar reference</a>
- * @see <a href=
- * "https://github.com/docker/distribution/blob/master/reference/regexp.go">Docker grammar
- * implementation</a>
+ * @see <a href= "https://github.com/distribution/reference/blob/main/reference.go">OCI
+ * Image grammar reference</a>
+ * @see <a href= "https://github.com/distribution/reference/blob/main/regexp.go">OCI Image
+ * grammar implementation</a>
  * @see <a href=
  * "https://stackoverflow.com/questions/37861791/how-are-docker-image-names-parsed">How
  * are Docker image names parsed?</a>

From d98ed306d2e3076a5f7100e602ffa18a43ef1fe3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= <stephane.nicoll@broadcom.com>
Date: Tue, 15 Oct 2024 09:28:02 +0200
Subject: [PATCH 2/2] Polish "Fix links to CNCF resources in Javadoc"

See gh-42645
---
 .../org/springframework/boot/docker/compose/core/Regex.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/Regex.java b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/Regex.java
index bb7921805a3..36bb93dde4c 100644
--- a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/Regex.java
+++ b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/Regex.java
@@ -24,9 +24,9 @@ import java.util.regex.Pattern;
  *
  * @author Scott Frederick
  * @author Phillip Webb
- * @see <a href= "https://github.com/distribution/reference/blob/main/reference.go">OCI
+ * @see <a href="https://github.com/distribution/reference/blob/main/reference.go">OCI
  * Image grammar reference</a>
- * @see <a href= "https://github.com/distribution/reference/blob/main/regexp.go">OCI Image
+ * @see <a href="https://github.com/distribution/reference/blob/main/regexp.go">OCI Image
  * grammar implementation</a>
  * @see <a href=
  * "https://stackoverflow.com/questions/37861791/how-are-docker-image-names-parsed">How