Merge branch '3.4.x' into 3.5.x

Closes gh-46636

Author: wilkinsona

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/OAuth2ResourceServerProperties.java

@@ -35,6 +35,7 @@
  * @author Artsiom Yudovin
  * @author Mushtaq Ahmed
  * @author Yan Kardziyaka
+ * @author Yanming Zhou
  * @since 2.1.0
  */
 @ConfigurationProperties("spring.security.oauth2.resourceserver")
@@ -173,7 +174,7 @@ public void setPrincipalClaimName(String principalClaimName) {
 		}
 
 		public String readPublicKey() throws IOException {
-			String key = "spring.security.oauth2.resourceserver.public-key-location";
+			String key = "spring.security.oauth2.resourceserver.jwt.public-key-location";
 			if (this.publicKeyLocation == null) {
 				throw new InvalidConfigurationPropertyValueException(key, this.publicKeyLocation,
 						"No public key location specified");