Commit 9021b68

committed

Merge branch '3.4.x' into 3.5.x

2 parents 09ed59f + 4baa005 commit 9021b68Copy full SHA for 9021b68

File tree

-1

lines changed

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

-1

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@`
`35`	`35`	`* @author Artsiom Yudovin`
`36`	`36`	`* @author Mushtaq Ahmed`
`37`	`37`	`* @author Yan Kardziyaka`
	`38`	`+ * @author Yanming Zhou`
`38`	`39`	`* @since 2.1.0`
`39`	`40`	`*/`
`40`	`41`	`@ConfigurationProperties("spring.security.oauth2.resourceserver")`
`@@ -173,7 +174,7 @@ public void setPrincipalClaimName(String principalClaimName) {`
`173`	`174`	`}`
`174`	`175`
`175`	`176`	`public String readPublicKey() throws IOException {`
`176`		`- String key = "spring.security.oauth2.resourceserver.public-key-location";`
	`177`	`+ String key = "spring.security.oauth2.resourceserver.jwt.public-key-location";`
`177`	`178`	`if (this.publicKeyLocation == null) {`
`178`	`179`	`throw new InvalidConfigurationPropertyValueException(key, this.publicKeyLocation,`
`179`	`180`	`"No public key location specified");`

Comments

(0)