diff --git a/.travis.yml b/.travis.yml index b29de287e3b3928c6c1b8563a8c586faaaa852c9..6fdd35dd475b92723d56dd98669a64b211b7ba12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ sudo: false language: java jdk: -- openjdk8 +- openjdk11 script: - test/run.sh notifications: diff --git a/README.adoc b/README.adoc index 7658e797c2c3b317f544c9d8185ce585136f3508..0caa4da28535894ec0bab37489540336681e0252 100644 --- a/README.adoc +++ b/README.adoc @@ -1,4 +1,4 @@ -:spring_boot_version: 2.3.3.RELEASE +:spring_boot_version: 2.4.2 :spring-boot: https://github.com/spring-projects/spring-boot :toc: :icons: font @@ -59,6 +59,7 @@ Initializr]. The Initializr offers a fast way to pull in all the dependencies yo an application and does a lot of the setup for you. This example needs only the Spring Web dependency. +You can get a Maven build file with the necessary dependencies directly from the https://start.spring.io/#!type=maven-project&language=java&platformVersion=2.4.2.RELEASE&packaging=jar&jvmVersion=11&groupId=com.example&artifactId=spring-boot&name=spring-boot&description=Demo%20project%20for%20Spring%20Boot&packageName=com.example.spring-boot&dependencies=web[Spring Initializr]. The following listing shows the `pom.xml` file that is created when you choose Maven: ==== @@ -68,6 +69,7 @@ include::initial/pom.xml[] ---- ==== +You can get a Gradle build file with the necessary dependencies directly from the https://start.spring.io/#!type=gradle-project&language=java&platformVersion=2.4.2.RELEASE&packaging=jar&jvmVersion=11&groupId=com.example&artifactId=spring-boot&name=spring-boot&description=Demo%20project%20for%20Spring%20Boot&packageName=com.example.spring-boot&dependencies=web[Spring Initializr]. The following listing shows the `build.gradle` file that is created when you choose Gradle: ==== diff --git a/complete/build.gradle b/complete/build.gradle index edb7f525a0dd4aedcf2e372477cb6d2ed8bbfe57..a0cbc2726d83d56d77bfa5e2372cb8d6919281fe 100644 --- a/complete/build.gradle +++ b/complete/build.gradle @@ -1,12 +1,12 @@ plugins { - id 'org.springframework.boot' version '2.3.3.RELEASE' - id 'io.spring.dependency-management' version '1.0.8.RELEASE' + id 'org.springframework.boot' version '2.4.2' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' id 'java' } group = 'com.example' version = '0.0.1-SNAPSHOT' -sourceCompatibility = '1.8' +sourceCompatibility = '11' repositories { mavenCentral() @@ -18,9 +18,7 @@ dependencies { // end::actuator[] implementation 'org.springframework.boot:spring-boot-starter-web' // tag::tests[] - testImplementation('org.springframework.boot:spring-boot-starter-test') { - exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' - } + testImplementation('org.springframework.boot:spring-boot-starter-test') // end::tests[] } diff --git a/complete/pom.xml b/complete/pom.xml index 121df6029a668ca54b0ec8fdfaaac4ced7dd7cd8..7eebe092258777132576a46d23b7fe24fe16e570 100644 --- a/complete/pom.xml +++ b/complete/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.3.RELEASE + 2.4.2 com.example @@ -15,7 +15,7 @@ Demo project for Spring Boot - 1.8 + 11 @@ -36,12 +36,6 @@ org.springframework.boot spring-boot-starter-test test - - - org.junit.vintage - junit-vintage-engine - - diff --git a/initial/build.gradle b/initial/build.gradle index 7c1f5bb605907835f740e1e9c8da1bcf9fb1f722..e2e473f97d9feb3df0d2dfd60d3df44036b770d4 100644 --- a/initial/build.gradle +++ b/initial/build.gradle @@ -1,12 +1,12 @@ plugins { - id 'org.springframework.boot' version '2.3.3.RELEASE' - id 'io.spring.dependency-management' version '1.0.8.RELEASE' + id 'org.springframework.boot' version '2.4.2' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' id 'java' } group = 'com.example' version = '0.0.1-SNAPSHOT' -sourceCompatibility = '1.8' +sourceCompatibility = '11' repositories { mavenCentral() @@ -14,9 +14,7 @@ repositories { dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' - testImplementation('org.springframework.boot:spring-boot-starter-test') { - exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' - } + testImplementation 'org.springframework.boot:spring-boot-starter-test' } test { diff --git a/initial/pom.xml b/initial/pom.xml index 9e612493766047a2a4812cef8b0854202fe3e0f6..d685f771e498460efeeb05604b2e2e1c770846eb 100644 --- a/initial/pom.xml +++ b/initial/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.3.RELEASE + 2.4.2 com.example @@ -13,11 +13,9 @@ 0.0.1-SNAPSHOT spring-boot Demo project for Spring Boot - - 1.8 + 11 - org.springframework.boot @@ -28,12 +26,6 @@ org.springframework.boot spring-boot-starter-test test - - - org.junit.vintage - junit-vintage-engine - -