From 9ae244879079b46111d5c9effba78813c83f532f Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 21 Feb 2019 10:10:09 +0000 Subject: [PATCH] Update Spring Boot-based samples to 2.1.3 Closes gh-586 --- samples/junit5/build.gradle | 9 ++++----- samples/rest-assured/build.gradle | 4 ++-- samples/rest-notes-slate/build.gradle | 2 +- samples/rest-notes-spring-data-rest/pom.xml | 2 +- samples/rest-notes-spring-hateoas/build.gradle | 7 ++----- samples/testng/build.gradle | 6 ++---- 6 files changed, 12 insertions(+), 18 deletions(-) diff --git a/samples/junit5/build.gradle b/samples/junit5/build.gradle index a9bac880..b94de89a 100644 --- a/samples/junit5/build.gradle +++ b/samples/junit5/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.0.0.RELEASE' + classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.1.3.RELEASE' classpath 'org.junit.platform:junit-platform-gradle-plugin:1.0.1' } } @@ -31,13 +31,12 @@ targetCompatibility = 1.8 ext { snippetsDir = file('build/generated-snippets') - junitJupiterVersion = '5.0.0' } ext['spring-restdocs.version'] = '2.0.4.BUILD-SNAPSHOT' dependencies { - asciidoctor "org.springframework.restdocs:spring-restdocs-asciidoctor:${project.ext['spring-restdocs.version']}" + asciidoctor 'org.springframework.restdocs:spring-restdocs-asciidoctor' compile 'org.springframework.boot:spring-boot-starter-web' @@ -45,8 +44,8 @@ dependencies { exclude group: 'junit', module: 'junit;' } testCompile 'org.springframework.restdocs:spring-restdocs-mockmvc' - testCompile "org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}" - testRuntime "org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}" + testCompile 'org.junit.jupiter:junit-jupiter-api' + testRuntime 'org.junit.jupiter:junit-jupiter-engine' } test { diff --git a/samples/rest-assured/build.gradle b/samples/rest-assured/build.gradle index d70b3c9c..20cfec7a 100644 --- a/samples/rest-assured/build.gradle +++ b/samples/rest-assured/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.0.0.RELEASE' + classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.1.3.RELEASE' } } @@ -34,11 +34,11 @@ ext { ext['spring-restdocs.version'] = '2.0.4.BUILD-SNAPSHOT' dependencies { + asciidoctor 'org.springframework.restdocs:spring-restdocs-asciidoctor' compile 'org.springframework.boot:spring-boot-starter-web' testCompile 'io.rest-assured:rest-assured:3.0.2' testCompile 'org.springframework.boot:spring-boot-starter-test' testCompile 'org.springframework.restdocs:spring-restdocs-restassured' - asciidoctor "org.springframework.restdocs:spring-restdocs-asciidoctor:${project.ext['spring-restdocs.version']}" } test { diff --git a/samples/rest-notes-slate/build.gradle b/samples/rest-notes-slate/build.gradle index e4a2bd3e..f23a622e 100644 --- a/samples/rest-notes-slate/build.gradle +++ b/samples/rest-notes-slate/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.0.0.RELEASE' + classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.1.3.RELEASE' } } diff --git a/samples/rest-notes-spring-data-rest/pom.xml b/samples/rest-notes-spring-data-rest/pom.xml index cf8faace..0016c457 100644 --- a/samples/rest-notes-spring-data-rest/pom.xml +++ b/samples/rest-notes-spring-data-rest/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.0.RELEASE + 2.1.3.RELEASE diff --git a/samples/rest-notes-spring-hateoas/build.gradle b/samples/rest-notes-spring-hateoas/build.gradle index 131a6c29..d563c6f2 100644 --- a/samples/rest-notes-spring-hateoas/build.gradle +++ b/samples/rest-notes-spring-hateoas/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.0.0.RELEASE' + classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.1.3.RELEASE' } } @@ -34,14 +34,11 @@ ext { ext['spring-restdocs.version'] = '2.0.4.BUILD-SNAPSHOT' dependencies { - asciidoctor "org.springframework.restdocs:spring-restdocs-asciidoctor:${project.ext['spring-restdocs.version']}" - + asciidoctor 'org.springframework.restdocs:spring-restdocs-asciidoctor' compile 'org.springframework.boot:spring-boot-starter-data-jpa' compile 'org.springframework.boot:spring-boot-starter-hateoas' - runtime 'com.h2database:h2' runtime 'org.atteo:evo-inflector:1.2.1' - testCompile 'com.jayway.jsonpath:json-path' testCompile 'org.assertj:assertj-core' testCompile 'org.springframework.boot:spring-boot-starter-test' diff --git a/samples/testng/build.gradle b/samples/testng/build.gradle index e8cec0a5..2550b7c3 100644 --- a/samples/testng/build.gradle +++ b/samples/testng/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.0.0.RELEASE' + classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.1.3.RELEASE' } } @@ -34,10 +34,8 @@ ext { ext['spring-restdocs.version'] = '2.0.4.BUILD-SNAPSHOT' dependencies { - asciidoctor "org.springframework.restdocs:spring-restdocs-asciidoctor:${project.ext['spring-restdocs.version']}" - + asciidoctor 'org.springframework.restdocs:spring-restdocs-asciidoctor' compile 'org.springframework.boot:spring-boot-starter-web' - testCompile('org.springframework.boot:spring-boot-starter-test') { exclude group: 'junit', module: 'junit;' }