diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index 14d7e73ea09..68b5159cfc6 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -556,20 +556,20 @@ ${cassandra-driver.version} - slf4j-log4j12 org.slf4j + slf4j-log4j12 - log4j log4j + log4j - guava com.google.guava + guava - netty-handler io.netty + netty-handler diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index 9d7210be9f1..1f83e68241b 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -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 `org.springframework.boot.logging.LoggingSystem` system property. The value should be 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 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. 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`. * `RANDOM_PORT` -- Loads an `EmbeddedWebApplicationContext` and provides a real servlet environment. Embedded servlet containers are started and listening on a random diff --git a/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc b/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc index 7996d8e0581..01508c2cbc6 100644 --- a/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc +++ b/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc @@ -378,7 +378,7 @@ The following application starters are provided by Spring Boot under the include::../../../target/generated-resources/application-starters.adoc[] In addition to the application starters, the following starters can be used to add -_<>_ features: +_<>_ features: .Spring Boot production starters include::../../../target/generated-resources/production-starters.adoc[] diff --git a/spring-boot-docs/src/main/groovy/generateStarterTables.groovy b/spring-boot-docs/src/main/groovy/generateStarterTables.groovy index 194b77521d8..82c27a6d270 100644 --- a/spring-boot-docs/src/main/groovy/generateStarterTables.groovy +++ b/spring-boot-docs/src/main/groovy/generateStarterTables.groovy @@ -48,13 +48,6 @@ def addStarterCrossLinks(String input) { input.replaceAll('(spring-boot-starter[A-Za-z-]*)', '<<$1,`$1`>>') } -def addBackTicksIfNecessary(String input) { - if (!input.contains('`')) { - return "`${input}`" - } - input -} - def getDependencies(def pom) { dependencies = [] pom.dependencies.dependency.each { dependency ->