Merge remote-tracking branch 'up/main' into java-enhancements

Author: asashour

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/SanitizableData.java

@@ -76,7 +76,7 @@ public Object getValue() {
 	}
 
 	/**
-	 * Return a new {@link SanitizableData} instance with sanatized value.
+	 * Return a new {@link SanitizableData} instance with sanitized value.
 	 * @return a new sanitizable data instance.
 	 * @since 3.1.0
 	 */

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/DiscoveredOperationMethod.java

@@ -44,11 +44,11 @@ public DiscoveredOperationMethod(Method method, OperationType operationType,
 		Assert.notNull(annotationAttributes, "AnnotationAttributes must not be null");
 		List<String> producesMediaTypes = new ArrayList<>();
 		producesMediaTypes.addAll(Arrays.asList(annotationAttributes.getStringArray("produces")));
-		producesMediaTypes.addAll(getProducesFromProducable(annotationAttributes));
+		producesMediaTypes.addAll(getProducesFromProducible(annotationAttributes));
 		this.producesMediaTypes = Collections.unmodifiableList(producesMediaTypes);
 	}
 
-	private <E extends Enum<E> & Producible<E>> List<String> getProducesFromProducable(
+	private <E extends Enum<E> & Producible<E>> List<String> getProducesFromProducible(
 			AnnotationAttributes annotationAttributes) {
 		Class<?> type = getProducesFrom(annotationAttributes);
 		if (type == Producible.class) {

spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/metrics.adoc

@@ -1,7 +1,7 @@
 [[actuator.metrics]]
 = Metrics
 
-Spring Boot Actuator provides dependency management and auto-configuration for https://micrometer.io[Micrometer], an application metrics facade that supports {url-micrometer-docs}[numerous monitoring systems], including:
+Spring Boot Actuator provides dependency management and auto-configuration for {url-micrometer-site}[Micrometer], an application metrics facade that supports {url-micrometer-docs}[numerous monitoring systems], including:
 
 - xref:actuator/metrics.adoc#actuator.metrics.export.appoptics[AppOptics]
 - xref:actuator/metrics.adoc#actuator.metrics.export.atlas[Atlas]
@@ -545,7 +545,7 @@ scrape_configs:
 https://prometheus.io/docs/prometheus/latest/feature_flags/#exemplars-storage[Prometheus Exemplars] are also supported.
 To enable this feature, a `SpanContext` bean should be present.
 If you're using the deprecated Prometheus simpleclient support and want to enable that feature, a `SpanContextSupplier` bean should be present.
-If you use https://micrometer.io/docs/tracing[Micrometer Tracing], this will be auto-configured for you, but you can always create your own if you want.
+If you use {url-micrometer-tracing-docs}[Micrometer Tracing], this will be auto-configured for you, but you can always create your own if you want.
 Please check the https://prometheus.io/docs/prometheus/latest/feature_flags/#exemplars-storage[Prometheus Docs], since this feature needs to be explicitly enabled on Prometheus' side, and it is only supported using the https://github.com/OpenObservability/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md#exemplars[OpenMetrics] format.
 
 For ephemeral or batch jobs that may not exist long enough to be scraped, you can use https://github.com/prometheus/pushgateway[Prometheus Pushgateway] support to expose the metrics to Prometheus.

spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/observability.adoc

@@ -4,7 +4,7 @@
 Observability is the ability to observe the internal state of a running system from the outside.
 It consists of the three pillars logging, metrics and traces.
 
-For metrics and traces, Spring Boot uses https://micrometer.io/docs/observation[Micrometer Observation].
+For metrics and traces, Spring Boot uses {url-micrometer-docs}/observation[Micrometer Observation].
 To create your own observations (which will lead to metrics and traces), you can inject an `ObservationRegistry`.
 
 include-code::MyCustomObservation[]
@@ -18,7 +18,7 @@ Observability support relies on the https://github.com/micrometer-metrics/contex
 By default, `ThreadLocal` values are not automatically reinstated in reactive operators.
 This behavior is controlled with the configprop:spring.reactor.context-propagation[] property, which can be set to `auto` to enable automatic propagation.
 
-For more details about observations please see the https://micrometer.io/docs/observation[Micrometer Observation documentation].
+For more details about observations please see the {url-micrometer-docs}/observation[Micrometer Observation documentation].
 
 TIP: Observability for JDBC can be configured using a separate project.
 The https://github.com/jdbc-observations/datasource-micrometer[Datasource Micrometer project] provides a Spring Boot starter which automatically creates observations when JDBC operations are invoked.

spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/tracing.adoc

@@ -1,9 +1,9 @@
 [[actuator.micrometer-tracing]]
 = Tracing
 
-Spring Boot Actuator provides dependency management and auto-configuration for https://micrometer.io/docs/tracing[Micrometer Tracing], a facade for popular tracer libraries.
+Spring Boot Actuator provides dependency management and auto-configuration for {url-micrometer-tracing-docs}[Micrometer Tracing], a facade for popular tracer libraries.
 
-TIP: To learn more about Micrometer Tracing capabilities, see its https://micrometer.io/docs/tracing[reference documentation].
+TIP: To learn more about Micrometer Tracing capabilities, see its {url-micrometer-tracing-docs}[reference documentation].
 
 
 
@@ -34,7 +34,7 @@ Now we have to add the following dependencies:
 
 * `org.springframework.boot:spring-boot-starter-actuator`
 * `io.micrometer:micrometer-tracing-bridge-otel` - bridges the Micrometer Observation API to OpenTelemetry.
-* `io.opentelemetry:opentelemetry-exporter-zipkin` - reports https://micrometer.io/docs/tracing#_glossary[traces] to Zipkin.
+* `io.opentelemetry:opentelemetry-exporter-zipkin` - reports {url-micrometer-tracing-docs}/glossary[traces] to Zipkin.
 
 Add the following application properties:
 
@@ -192,7 +192,7 @@ include-code::CustomObservation[]
 
 This will create an observation named "some-operation" with the tag "some-tag=some-value".
 
-TIP: If you want to create a span without creating a metric, you need to use the https://micrometer.io/docs/tracing#_using_micrometer_tracing_directly[lower-level `Tracer` API] from Micrometer.
+TIP: If you want to create a span without creating a metric, you need to use the {url-micrometer-tracing-docs}/api[lower-level `Tracer` API] from Micrometer.
 
 
 

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/managing-dependencies/configure-bom-with-plugins.gradle.kts

@@ -26,6 +26,6 @@ the<DependencyManagementExtension>().apply {
 
 repositories {
 	maven {
-		url = uri("file:repository")
+		url = uri("repository")
 	}
 }

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/managing-dependencies/configure-bom.gradle

@@ -24,5 +24,5 @@ dependencyManagement {
 }
 
 repositories {
-	maven { url 'file:repository' }
+	maven { url 'repository' }
 }

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/managing-dependencies/configure-bom.gradle.kts

@@ -27,6 +27,6 @@ the<DependencyManagementExtension>().apply {
 
 repositories {
 	maven {
-		url = uri("file:repository")
+		url = uri("repository")
 	}
 }

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/managing-dependencies/configure-platform.gradle

@@ -14,7 +14,7 @@ dependencies {
 }
 
 repositories {
-	maven { url 'file:repository' }
+	maven { url 'repository' }
 }
 
 configurations.all {

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/managing-dependencies/configure-platform.gradle.kts

@@ -15,7 +15,7 @@ dependencies {
 
 repositories {
 	maven {
-		url = uri("file:repository")
+		url = uri("repository")
 	}
 }
 

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/managing-dependencies/custom-version-with-platform.gradle

@@ -9,7 +9,7 @@ dependencies {
 }
 
 repositories {
-	maven { url 'file:repository' }
+	maven { url 'repository' }
 }
 
 configurations.all {

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/managing-dependencies/custom-version-with-platform.gradle.kts

@@ -10,7 +10,7 @@ dependencies {
 
 repositories {
 	maven {
-		url = uri("file:repository")
+		url = uri("repository")
 	}
 }
 

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/managing-dependencies/custom-version.gradle

@@ -19,7 +19,7 @@ ext['slf4j.version'] = '1.7.20'
 // end::custom-version[]
 
 repositories {
-	maven { url 'file:repository' }
+	maven { url 'repository' }
 }
 
 task slf4jVersion {

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/managing-dependencies/custom-version.gradle.kts

@@ -12,7 +12,7 @@ extra["slf4j.version"] = "1.7.20"
 
 repositories {
 	maven {
-		url = uri("file:repository")
+		url = uri("repository")
 	}
 }
 

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveIntegrationTests.java

@@ -609,7 +609,11 @@ void defaultDirAndFileModesAreUsed() throws IOException {
 
 	@TestTemplate
 	void dirModeAndFileModeAreApplied() throws IOException {
-		BuildResult result = this.gradleBuild.build(this.taskName);
+		BuildResult result = this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("8.8-rc-1")
+			.expectDeprecationMessages("The CopyProcessingSpec.setDirMode(Integer) method has been deprecated",
+					"The CopyProcessingSpec.setFileMode(Integer) method has been deprecated",
+					"upgrading_version_8.html#unix_file_permissions_deprecated")
+			.build(this.taskName);
 		assertThat(result.task(":" + this.taskName).getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
 		try (ZipFile jarFile = new ZipFile(new File(this.gradleBuild.getProjectDir(), "build/libs").listFiles()[0])) {
 			Enumeration<ZipArchiveEntry> entries = jarFile.getEntries();

spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java

@@ -35,9 +35,9 @@ private GradleVersions() {
 	@SuppressWarnings("UnstableApiUsage")
 	public static List<String> allCompatible() {
 		if (isJavaVersion(JavaVersion.VERSION_20)) {
-			return Arrays.asList("8.1.1", "8.7");
+			return Arrays.asList("8.1.1", "8.8");
 		}
-		return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2", "8.7");
+		return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2", "8.8");
 	}
 
 	public static String minimumCompatible() {