Merge branch 'main' into fix/rebind-restore-field-initializers

Author: ryanjbaxter

.github/workflows/ci.yaml

@@ -0,0 +1,33 @@
+name: Spring Cloud Commons CI Job
+
+on:
+  push:
+    branches:
+      - main
+      - 4.3.x
+
+  # Scheduled builds run daily at midnight UTC
+  schedule:
+    - cron: '0 0 * * *'
+
+  # Manual trigger with optional branch override
+  workflow_dispatch:
+    inputs:
+      branches:
+        description: "Which branch should be built (can be a comma-separated list of branches)"
+        required: true
+        default: 'main'
+        type: string
+
+jobs:
+  deploy:
+    uses: spring-cloud/spring-cloud-github-actions/.github/workflows/deploy.yml@main
+    with:
+      branches: ${{ inputs.branches }}
+    secrets:
+      ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
+      ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
+      COMMERCIAL_ARTIFACTORY_USERNAME: ${{ secrets.COMMERCIAL_ARTIFACTORY_USERNAME }}
+      COMMERCIAL_ARTIFACTORY_PASSWORD: ${{ secrets.COMMERCIAL_ARTIFACTORY_PASSWORD }}
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/maven.yml

@@ -4,8 +4,6 @@
 name: Build
 
 on:
-  push:
-    branches: [ main, 4.3.x, 4.2.x, 4.1.x ]
   pull_request:
     branches: [ main, 4.3.x, 4.2.x, 4.1.x ]
 

docs/package.json

@@ -4,7 +4,7 @@
     "@antora/atlas-extension": "1.0.0-alpha.5",
     "@antora/collector-extension": "1.0.3",
     "@asciidoctor/tabs": "1.0.0-beta.6",
-    "@springio/antora-extensions": "1.14.7",
-    "@springio/asciidoctor-extensions": "1.0.0-alpha.17"
+    "@springio/antora-extensions": "1.14.10",
+    "@springio/asciidoctor-extensions": "1.0.0-alpha.18"
   }
 }

docs/pom.xml

@@ -21,7 +21,7 @@
 		<maven-deploy-plugin-default.phase>none</maven-deploy-plugin-default.phase>
 
 		<!-- Observability -->
-		<micrometer-docs-generator.version>1.0.2</micrometer-docs-generator.version>
+		<micrometer-docs-generator.version>1.0.4</micrometer-docs-generator.version>
 		<micrometer-docs-generator.inputPath>${maven.multiModuleProjectDirectory}/spring-cloud-commons/</micrometer-docs-generator.inputPath>
 		<micrometer-docs-generator.inclusionPattern>.*</micrometer-docs-generator.inclusionPattern>
 		<micrometer-docs-generator.outputPath>${maven.multiModuleProjectDirectory}/docs/modules/ROOT/partials/</micrometer-docs-generator.outputPath>

spring-cloud-context/src/test/java/org/springframework/cloud/context/test/TestConfigDataLocationResolver.java

@@ -63,11 +63,28 @@ public List<TestConfigDataResource> resolve(ConfigDataLocationResolverContext co
 			.bind("createfailsafedelegate", Bindable.of(Boolean.class))
 			.orElse(Boolean.FALSE);
 		if (createFailsafeDelegate) {
+			KeyProperties keyProperties = context.getBinder()
+				.bindOrCreate(KeyProperties.PREFIX, Bindable.of(KeyProperties.class));
+			// Due to
+			// https://github.com/spring-projects/spring-boot/commit/646db448ae938161279783a2d5d0bcaf297e7389
+			// in Spring Boo 4.0.3 and beyond the initial call to resolve may not have
+			// application-failsafe.properties
+			// loaded so EncryptionIntegrationTests.failsafeShouldHaveDelegate will fail
+			// when we assert TextEncryptorUtils.keysConfigured(keyProperties)
+			// is true. application-failsafe.properties will only be available on
+			// subsequent calls to resolve so we return
+			// if TextEncryptorUtils.keysConfigured(keyProperties) is false. We need to
+			// get TextEncryptor from the context
+			// before we return so FailSafeTextEncryptor is created and used in subsequent
+			// calls to resolve.
+			if (!TextEncryptorUtils.keysConfigured(keyProperties)) {
+				assertThat(context.getBootstrapContext().isRegistered(TextEncryptor.class)).isTrue();
+				context.getBootstrapContext().get(TextEncryptor.class);
+				return Collections.emptyList();
+			}
 			assertThat(context.getBootstrapContext().isRegistered(TextEncryptor.class)).isTrue();
 			TextEncryptor textEncryptor = context.getBootstrapContext().get(TextEncryptor.class);
 			assertThat(textEncryptor).isInstanceOf(TextEncryptorUtils.FailsafeTextEncryptor.class);
-			KeyProperties keyProperties = context.getBinder()
-				.bindOrCreate(KeyProperties.PREFIX, Bindable.of(KeyProperties.class));
 			assertThat(TextEncryptorUtils.keysConfigured(keyProperties)).isTrue();
 			RsaProperties rsaProperties = context.getBinder()
 				.bindOrCreate(RsaProperties.PREFIX, Bindable.of(RsaProperties.class));

spring-cloud-test-support/pom.xml

@@ -16,7 +16,7 @@
 	<description>Spring Cloud Test Support</description>
 	<properties>
 		<maven-resolver.version>1.9.24</maven-resolver.version>
-		<maven.version>3.9.13</maven.version>
+		<maven.version>3.9.14</maven.version>
 	</properties>
 	<dependencies>
 		<dependency>