Merge pull request #5553 from izeye/polish-20160401

* pr/5553:
  Polish
pull/5553/merge
Stephane Nicoll 9 years ago
commit 1d4f38e440

@ -556,20 +556,20 @@
<version>${cassandra-driver.version}</version> <version>${cassandra-driver.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<artifactId>slf4j-log4j12</artifactId>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<artifactId>log4j</artifactId>
<groupId>log4j</groupId> <groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<artifactId>guava</artifactId>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<artifactId>netty-handler</artifactId>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>

@ -1215,7 +1215,7 @@ root of the classpath, or in a location specified by the Spring `Environment` pr
You can force Spring Boot to use a particular logging system using the You can force Spring Boot to use a particular logging system using the
`org.springframework.boot.logging.LoggingSystem` system property. The value should be `org.springframework.boot.logging.LoggingSystem` system property. The value should be
the fully-qualified class name of a `LoggingSystem` implementation. You can also disable the fully-qualified class name of a `LoggingSystem` implementation. You can also disable
Spring Boot's logging configuration entirely by used a value of `none`. Spring Boot's logging configuration entirely by using a value of `none`.
NOTE: Since logging is initialized *before* the `ApplicationContext` is created, it isn't NOTE: Since logging is initialized *before* the `ApplicationContext` is created, it isn't
possible to control logging from `@PropertySources` in Spring `@Configuration` files. possible to control logging from `@PropertySources` in Spring `@Configuration` files.
@ -4359,7 +4359,7 @@ how your tests will run:
* `MOCK` -- Loads a `WebApplicationContext` and provides a mock servlet environment. * `MOCK` -- Loads a `WebApplicationContext` and provides a mock servlet environment.
Embedded servlet containers are not started when using this annotation. If servlet Embedded servlet containers are not started when using this annotation. If servlet
APIs are not on your classpath this mode will transparantly fallback to creating a APIs are not on your classpath this mode will transparently fallback to creating a
regular non-web `ApplicationContext`. regular non-web `ApplicationContext`.
* `RANDOM_PORT` -- Loads an `EmbeddedWebApplicationContext` and provides a real * `RANDOM_PORT` -- Loads an `EmbeddedWebApplicationContext` and provides a real
servlet environment. Embedded servlet containers are started and listening on a random servlet environment. Embedded servlet containers are started and listening on a random

@ -378,7 +378,7 @@ The following application starters are provided by Spring Boot under the
include::../../../target/generated-resources/application-starters.adoc[] include::../../../target/generated-resources/application-starters.adoc[]
In addition to the application starters, the following starters can be used to add In addition to the application starters, the following starters can be used to add
_<<production-ready-featyres.adoc#production-ready, production ready>>_ features: _<<production-ready-features.adoc#production-ready, production ready>>_ features:
.Spring Boot production starters .Spring Boot production starters
include::../../../target/generated-resources/production-starters.adoc[] include::../../../target/generated-resources/production-starters.adoc[]

@ -48,13 +48,6 @@ def addStarterCrossLinks(String input) {
input.replaceAll('(spring-boot-starter[A-Za-z-]*)', '<<$1,`$1`>>') input.replaceAll('(spring-boot-starter[A-Za-z-]*)', '<<$1,`$1`>>')
} }
def addBackTicksIfNecessary(String input) {
if (!input.contains('`')) {
return "`${input}`"
}
input
}
def getDependencies(def pom) { def getDependencies(def pom) {
dependencies = [] dependencies = []
pom.dependencies.dependency.each { dependency -> pom.dependencies.dependency.each { dependency ->

Loading…
Cancel
Save