diff --git a/README.adoc b/README.adoc index 58ddfc17d4cfc8d71189d152aacbb93df6882c4d..cc5489a47f5d2b06e610da0acab398bb7da80c79 100644 --- a/README.adoc +++ b/README.adoc @@ -2,7 +2,7 @@ tags: [spring-boot] projects: [spring-boot] --- -:spring_boot_version: 0.5.0.M6 +:spring_boot_version: 1.0.0.RC3 :spring-boot: https://github.com/spring-projects/spring-boot :toc: :icons: font @@ -154,30 +154,14 @@ Change your `build.gradle` to exclude Tomcat then add Jetty to the list of depen [source,groovy] ---- - compile("org.springframework.boot:spring-boot-starter-web:0.5.0.M6") { - exclude module: "spring-boot-starter-tomcat" - } - compile("org.springframework.boot:spring-boot-starter-jetty:0.5.0.M6") +include::complete/build.gradle[tag=jetty] ---- If you are using Maven, the changes look like this: [source,xml] ---- - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-tomcat - - - - - org.springframework.boot - spring-boot-starter-jetty - +include::complete/pom.xml[tag=jetty] ---- This change isn't about comparing Tomcat vs. Jetty. Instead, it demonstrates how Spring Boot reacts to what is on your classpath. @@ -264,17 +248,14 @@ Add this to your build file's list of dependencies: [source,groovy] ---- - compile("org.springframework.boot:spring-boot-starter-actuator:0.5.0.M6") +include::complete/build.gradle[tag=actuator] ---- If you are using Maven, add this to your list of dependencies: [source,xml] ---- - - org.springframework.boot - spring-boot-starter-actuator - +include::complete/pom.xml[tag=actuator] ---- Then restart the app: diff --git a/complete/build.gradle b/complete/build.gradle index ce7174f0bae35f32e89102e8548a9132011f064d..1a93d0d87919897569e88e9eb19392e0ec6fc5e5 100644 --- a/complete/build.gradle +++ b/complete/build.gradle @@ -24,11 +24,15 @@ repositories { } dependencies { + // tag::jetty[] compile("org.springframework.boot:spring-boot-starter-web:1.0.0.RC3") { exclude module: "spring-boot-starter-tomcat" } compile("org.springframework.boot:spring-boot-starter-jetty:1.0.0.RC3") + // end::jetty[] + // tag::actuator[] compile("org.springframework.boot:spring-boot-starter-actuator:1.0.0.RC3") + // end::actuator[] testCompile("junit:junit") } diff --git a/complete/pom.xml b/complete/pom.xml index fac4c00b47fba95b14423d499fc46e868965759a..ea1deea8f458e7a766b0ea34262b08f544bd0f1c 100644 --- a/complete/pom.xml +++ b/complete/pom.xml @@ -14,6 +14,7 @@ + org.springframework.boot spring-boot-starter-web @@ -28,10 +29,13 @@ org.springframework.boot spring-boot-starter-jetty + + org.springframework.boot spring-boot-starter-actuator +