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
a6c83787
Commit
a6c83787
authored
Mar 03, 2016
by
Johnny Lim
Committed by
Stephane Nicoll
Mar 03, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
Closes gh-5318
parent
7029ba52
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
9 deletions
+8
-9
CONTRIBUTING.adoc
CONTRIBUTING.adoc
+1
-1
ResourcePropertiesTests.java
...ework/boot/autoconfigure/web/ResourcePropertiesTests.java
+0
-1
spring-boot-features.adoc
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+3
-3
ExitCodeEvent.java
...src/main/java/org/springframework/boot/ExitCodeEvent.java
+1
-1
ContextIdApplicationContextInitializer.java
.../boot/context/ContextIdApplicationContextInitializer.java
+1
-1
NoUniqueBeanDefinitionExceptionFailureAnalyzer.java
...lyzer/NoUniqueBeanDefinitionExceptionFailureAnalyzer.java
+2
-2
No files found.
CONTRIBUTING.adoc
View file @
a6c83787
...
...
@@ -7,7 +7,7 @@ something, or simply want to hack on the code this document should help you get
== Code of Conduct
This project adheres to the Contributor Covenant link:CODE_OF_CONDUCT.adoc[code of
conduct]. By participating, you
are expected to uphold this code. Please report
conduct]. By participating, you are expected to uphold this code. Please report
unacceptable behavior to spring-code-of-conduct@pivotal.io.
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ResourcePropertiesTests.java
View file @
a6c83787
...
...
@@ -31,7 +31,6 @@ public class ResourcePropertiesTests {
@Test
public
void
resourceChainNoCustomization
()
{
System
.
out
.
println
(
this
.
properties
.
getChain
().
getEnabled
());
assertThat
(
this
.
properties
.
getChain
().
getEnabled
()).
isNull
();
}
...
...
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View file @
a6c83787
...
...
@@ -772,7 +772,7 @@ definitions by simply listing the properties classes directly in the
[NOTE]
====
When `@ConfigurationProperties` bean
are
registered that way, the bean will have a
When `@ConfigurationProperties` bean
is
registered that way, the bean will have a
conventional name: `<prefix>-<fqn>`, where `<prefix>` is the environment key prefix
specified in the `@ConfigurationProperties` annotation and <fqn> the fully qualified
name of the bean. If the annotation does not provide any prefix, only the fully qualified
...
...
@@ -2002,7 +2002,7 @@ password, printed at INFO level when the application starts up)
Using default security password: 78fa095d-3f4c-48b1-ad50-e24c31d5cf35
----
NOTE: If you fine
tune your logging configuration, ensure that the
NOTE: If you fine
-
tune your logging configuration, ensure that the
`org.springframework.boot.autoconfigure.security` category is set to log `INFO` messages,
otherwise the default password will not be printed.
...
...
@@ -2372,7 +2372,7 @@ loadable.
See {sc-spring-boot-autoconfigure}/jdbc/DataSourceProperties.{sc-ext}[`DataSourceProperties`]
for more of the supported options. These are the standard options that work regardless of
the actual implementation. It is also possible to fine
tune implementation-specific
the actual implementation. It is also possible to fine
-
tune implementation-specific
settings using their respective prefix (`+spring.datasource.tomcat*+`,
`+spring.datasource.hikari+`, `+spring.datasource.dbcp*+` and
`+spring.datasource.dbcp2*+`), refer to the documentation of the connection pool
...
...
spring-boot/src/main/java/org/springframework/boot/ExitCodeEvent.java
View file @
a6c83787
...
...
@@ -41,7 +41,7 @@ public class ExitCodeEvent extends ApplicationEvent {
/**
* Return the exit code that will be used to exit the JVM.
* @return the
the
exit code
* @return the exit code
*/
public
int
getExitCode
()
{
return
this
.
exitCode
;
...
...
spring-boot/src/main/java/org/springframework/boot/context/ContextIdApplicationContextInitializer.java
View file @
a6c83787
...
...
@@ -71,7 +71,7 @@ public class ContextIdApplicationContextInitializer implements
* <li>{@code server.port}</li>
* <li>{@code PORT}</li>
* </ul>
* This order
allows
favors a platform defined index over any user defined value.
* This order favors a platform defined index over any user defined value.
*/
private
static
final
String
INDEX_PATTERN
=
"${vcap.application.instance_index:${spring.application.index:${server.port:${PORT:null}}}}"
;
...
...
spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/NoUniqueBeanDefinitionExceptionFailureAnalyzer.java
View file @
a6c83787
...
...
@@ -80,13 +80,13 @@ class NoUniqueBeanDefinitionExceptionFailureAnalyzer
}
catch
(
NoSuchBeanDefinitionException
ex
)
{
message
.
append
(
String
.
format
(
"\t- %s: a programtically registered singleton"
,
beanName
));
"\t- %s: a program
ma
tically registered singleton"
,
beanName
));
}
}
return
new
FailureAnalysis
(
message
.
toString
(),
"Consider marking one of the beans as @Primary, updating the consumer to"
+
" accept multiple beans, or using @Qualifer to identify the"
+
" accept multiple beans, or using @Qualif
i
er to identify the"
+
" bean that should be consumed"
,
cause
);
}
...
...
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