From 96be7ab777627ac3fe95245a86cefb1939a3152a Mon Sep 17 00:00:00 2001
From: spring-builds <builds@springframework.org>
Date: Thu, 12 Dec 2024 11:56:03 +0000
Subject: [PATCH 1/2] Bumping versions

---
 .../cloud/netflix/eureka/server/EurekaInstanceMonitorTests.java | 2 +-
 .../EurekaInstanceMonitorWithCustomTagsProviderTests.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorTests.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorTests.java
index 7d63a2e25..680e49eaf 100644
--- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorTests.java
+++ b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorTests.java
@@ -160,7 +160,7 @@ private static Tags tags(InstanceInfo instanceInfo) {
 
 	private void assertEurekaInstance(Map<Tags, Long> meterRegistryCounts) {
 		await().pollDelay(5, MILLISECONDS)
-				.atMost(10, SECONDS)
+			.atMost(10, SECONDS)
 			.pollInterval(fibonacci())
 			.untilAsserted(() -> meterRegistryCounts.forEach((tags,
 					count) -> assertThat((long) meterRegistry.get("eureka.server.instances").tags(tags).gauge().value())
diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorWithCustomTagsProviderTests.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorWithCustomTagsProviderTests.java
index fac5c604c..5e43bff43 100644
--- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorWithCustomTagsProviderTests.java
+++ b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorWithCustomTagsProviderTests.java
@@ -93,7 +93,7 @@ private static Tags tags(InstanceInfo instanceInfo) {
 
 	private void assertEurekaInstance(Map<Tags, Long> meterRegistryCounts) {
 		await().pollDelay(5, MILLISECONDS)
-				.atMost(5, SECONDS)
+			.atMost(5, SECONDS)
 			.pollInterval(fibonacci())
 			.untilAsserted(() -> meterRegistryCounts.forEach((tags, count) -> {
 				SoftAssertions softAssertions = new SoftAssertions();

From c9cff6faf0e4a96e29b71df2e6594b827905a58d Mon Sep 17 00:00:00 2001
From: Ryan Baxter <ryan.baxter@broadcom.com>
Date: Tue, 17 Dec 2024 10:33:08 -0500
Subject: [PATCH 2/2] Add the ability to disable configuration properties in
 docs pom

---
 docs/antora.yml |  2 +-
 docs/pom.xml    | 28 ++++++++++++++++++----------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/docs/antora.yml b/docs/antora.yml
index 2b2458e55..81612a0b4 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -6,7 +6,7 @@ nav:
 ext:
   collector:
     run:
-      command: ./mvnw --no-transfer-progress -B process-resources -Pdocs -pl docs -Dantora-maven-plugin.phase=none -Dgenerate-docs.phase=none -Dgenerate-readme.phase=none -Dgenerate-cloud-resources.phase=none -Dmaven-dependency-plugin-for-docs.phase=none -Dmaven-dependency-plugin-for-docs-classes.phase=none -DskipTests
+      command: ./mvnw --no-transfer-progress -B process-resources -Pdocs -pl docs -Dantora-maven-plugin.phase=none -Dgenerate-docs.phase=none -Dgenerate-readme.phase=none -Dgenerate-cloud-resources.phase=none -Dmaven-dependency-plugin-for-docs.phase=none -Dmaven-dependency-plugin-for-docs-classes.phase=none -DskipTests -DdisableConfigurationProperties
       local: true
     scan:
       dir: ./target/classes/antora-resources/
diff --git a/docs/pom.xml b/docs/pom.xml
index d77b49223..351ac316c 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -21,20 +21,28 @@
 		<!-- Don't upload docs jar to central / repo.spring.io -->
 		<maven-deploy-plugin-default.phase>none</maven-deploy-plugin-default.phase>
 	</properties>
-	<dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
-		</dependency>
-	</dependencies>
 	<build>
 		<sourceDirectory>src/main/asciidoc</sourceDirectory>
 	</build>
 	<profiles>
+		<profile>
+			<id>enable-configuration-properties</id>
+			<activation>
+				<property>
+					<name>!disableConfigurationProperties</name>
+				</property>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>${project.groupId}</groupId>
+					<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+				</dependency>
+				<dependency>
+					<groupId>${project.groupId}</groupId>
+					<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
+				</dependency>
+			</dependencies>
+		</profile>
 		<profile>
 			<id>docs</id>
 			<build>