diff --git a/buildSrc/src/main/groovy/org/springframework/restdocs/build/SampleBuildConfigurer.groovy b/buildSrc/src/main/groovy/org/springframework/restdocs/build/SampleBuildConfigurer.groovy index 0a021abe..96db0208 100644 --- a/buildSrc/src/main/groovy/org/springframework/restdocs/build/SampleBuildConfigurer.groovy +++ b/buildSrc/src/main/groovy/org/springframework/restdocs/build/SampleBuildConfigurer.groovy @@ -20,6 +20,7 @@ import org.gradle.api.GradleException import org.gradle.api.Project import org.gradle.api.Task import org.gradle.api.tasks.Exec +import org.gradle.api.tasks.Copy import org.gradle.api.tasks.GradleBuild public class SampleBuildConfigurer { @@ -65,6 +66,13 @@ public class SampleBuildConfigurer { "${System.env.MAVEN_HOME}/bin/mvn${suffix}" : "mvn${suffix}", 'clean', 'package'] mavenBuild.dependsOn dependencies + + mavenBuild.doFirst { + replaceVersion(new File(this.workingDir, 'pom.xml'), + '.*', + "${project.version}") + } + return mavenBuild } @@ -75,9 +83,25 @@ public class SampleBuildConfigurer { gradleBuild.dir = this.workingDir gradleBuild.tasks = ['clean', 'build'] gradleBuild.dependsOn dependencies + + gradleBuild.doFirst { + replaceVersion(new File(this.workingDir, 'build.gradle'), + "springRestdocsVersion = '.*'", + "springRestdocsVersion = '${project.version}'") + } + return gradleBuild } + private void replaceVersion(File target, String pattern, String replacement) { + def lines = target.readLines() + target.withWriter { writer -> + lines.each { line -> + writer.println(line.replaceAll(pattern, replacement)) + } + } + } + private Task createVerifyIncludes(Project project, File buildDir) { Task verifyIncludes = project.tasks.create("${name}VerifyIncludes") verifyIncludes.description = "Verifies the includes in the ${name} sample" diff --git a/samples/rest-notes-spring-data-rest/pom.xml b/samples/rest-notes-spring-data-rest/pom.xml index 7e668af4..d478c005 100644 --- a/samples/rest-notes-spring-data-rest/pom.xml +++ b/samples/rest-notes-spring-data-rest/pom.xml @@ -18,6 +18,7 @@ UTF-8 1.7 + 1.0.0.BUILD-SNAPSHOT @@ -49,7 +50,7 @@ org.springframework.restdocs spring-restdocs-mockmvc - 1.0.0.BUILD-SNAPSHOT + ${spring-restdocs.version} test @@ -124,4 +125,4 @@ - \ No newline at end of file + diff --git a/samples/rest-notes-spring-hateoas/build.gradle b/samples/rest-notes-spring-hateoas/build.gradle index a8041b90..7ab7a404 100644 --- a/samples/rest-notes-spring-hateoas/build.gradle +++ b/samples/rest-notes-spring-hateoas/build.gradle @@ -26,6 +26,11 @@ group = 'com.example' sourceCompatibility = 1.7 targetCompatibility = 1.7 +ext { + snippetsDir = file('build/generated-snippets') + springRestdocsVersion = '1.0.0.BUILD-SNAPSHOT' +} + dependencies { compile 'org.springframework.boot:spring-boot-starter-data-jpa' compile 'org.springframework.boot:spring-boot-starter-hateoas' @@ -35,11 +40,7 @@ dependencies { testCompile 'com.jayway.jsonpath:json-path' testCompile 'org.springframework.boot:spring-boot-starter-test' - testCompile 'org.springframework.restdocs:spring-restdocs-mockmvc:1.0.0.BUILD-SNAPSHOT' -} - -ext { - snippetsDir = file('build/generated-snippets') + testCompile "org.springframework.restdocs:spring-restdocs-mockmvc:$springRestdocsVersion" } test { @@ -61,4 +62,4 @@ jar { } eclipseJdt.onlyIf { false } -cleanEclipseJdt.onlyIf { false } \ No newline at end of file +cleanEclipseJdt.onlyIf { false }