Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
aac80e0b
Commit
aac80e0b
authored
Jun 22, 2017
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
Closes gh-9570
parent
beb72ca8
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
ResourceServerProperties.java
...re/security/oauth2/resource/ResourceServerProperties.java
+1
-1
SendGridProperties.java
...ework/boot/autoconfigure/sendgrid/SendGridProperties.java
+1
-1
SpringApplicationRunner.java
...amework/boot/cli/command/run/SpringApplicationRunner.java
+1
-1
appendix-application-properties.adoc
...cs/src/main/asciidoc/appendix-application-properties.adoc
+1
-1
No files found.
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerProperties.java
View file @
aac80e0b
...
@@ -234,7 +234,7 @@ public class ResourceServerProperties implements BeanFactoryAware {
...
@@ -234,7 +234,7 @@ public class ResourceServerProperties implements BeanFactoryAware {
"Missing tokenInfoUri and userInfoUri and there is no "
"Missing tokenInfoUri and userInfoUri and there is no "
+
"JWT verifier key"
);
+
"JWT verifier key"
);
}
}
if
(
StringUtils
.
hasText
(
this
.
tokenInfoUri
)
&&
this
.
isPreferTokenInfo
())
{
if
(
StringUtils
.
hasText
(
this
.
tokenInfoUri
)
&&
isPreferTokenInfo
())
{
if
(!
StringUtils
.
hasText
(
this
.
clientSecret
))
{
if
(!
StringUtils
.
hasText
(
this
.
clientSecret
))
{
errors
.
rejectValue
(
"clientSecret"
,
"missing.clientSecret"
,
errors
.
rejectValue
(
"clientSecret"
,
"missing.clientSecret"
,
"Missing client secret"
);
"Missing client secret"
);
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sendgrid/SendGridProperties.java
View file @
aac80e0b
...
@@ -29,7 +29,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
...
@@ -29,7 +29,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
public
class
SendGridProperties
{
public
class
SendGridProperties
{
/**
/**
* SendGrid
api key. Alternative to username/password
.
* SendGrid
API key
.
*/
*/
private
String
apiKey
;
private
String
apiKey
;
...
...
spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/SpringApplicationRunner.java
View file @
aac80e0b
...
@@ -160,7 +160,7 @@ public class SpringApplicationRunner {
...
@@ -160,7 +160,7 @@ public class SpringApplicationRunner {
super
(
"runner-"
+
(
runnerCounter
++));
super
(
"runner-"
+
(
runnerCounter
++));
this
.
compiledSources
=
compiledSources
;
this
.
compiledSources
=
compiledSources
;
if
(
compiledSources
.
length
!=
0
)
{
if
(
compiledSources
.
length
!=
0
)
{
setContextClassLoader
(
((
Class
<?>)
compiledSources
[
0
])
.
getClassLoader
());
setContextClassLoader
(
compiledSources
[
0
]
.
getClassLoader
());
}
}
setDaemon
(
true
);
setDaemon
(
true
);
}
}
...
...
spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
View file @
aac80e0b
...
@@ -139,7 +139,7 @@ content into your application; rather pick only the properties that you need.
...
@@ -139,7 +139,7 @@ content into your application; rather pick only the properties that you need.
spring.reactor.stacktrace-mode.enabled=false # Set whether Reactor should collect stacktrace information at runtime.
spring.reactor.stacktrace-mode.enabled=false # Set whether Reactor should collect stacktrace information at runtime.
# SENDGRID ({sc-spring-boot-autoconfigure}/sendgrid/SendGridAutoConfiguration.{sc-ext}[SendGridAutoConfiguration])
# SENDGRID ({sc-spring-boot-autoconfigure}/sendgrid/SendGridAutoConfiguration.{sc-ext}[SendGridAutoConfiguration])
spring.sendgrid.api-key= # SendGrid
api key (alternative to username/password)
spring.sendgrid.api-key= # SendGrid
API key.
spring.sendgrid.proxy.host= # SendGrid proxy host.
spring.sendgrid.proxy.host= # SendGrid proxy host.
spring.sendgrid.proxy.port= # SendGrid proxy port.
spring.sendgrid.proxy.port= # SendGrid proxy port.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment