From 6f1c83c4ea4e712c465f7a2ddacc61fe7b3c0b1a Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Tue, 9 Nov 2010 15:43:39 -0800 Subject: [PATCH] Pick up buildSrc changes for Version and preconditions --- build.gradle | 8 ++++++-- buildSrc | 2 +- docs/build.gradle | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index eb42386217..0bb73b7181 100644 --- a/build.gradle +++ b/build.gradle @@ -14,6 +14,8 @@ * limitations under the License. */ +import org.springframework.build.Version + // ----------------------------------------------------------------------------- // Main gradle build file for Spring Integration // @@ -27,7 +29,6 @@ // ----------------------------------------------------------------------------- // Configuration for the root project // ----------------------------------------------------------------------------- -apply from: "$rootDir/buildSrc/version.gradle" apply plugin: 'idea' // used for artifact names, building doc upload urls, etc. @@ -48,7 +49,7 @@ allprojects { // milestone or release. // @see org.springframework.build.Version under buildSrc/ for more info // @see gradle.properties for the declaration of this property. - version = createVersion(springIntegrationVersion) + version = new Version(springIntegrationVersion) // default set of maven repositories to be used when resolving dependencies repositories { @@ -407,6 +408,9 @@ project('spring-integration-xmpp') { } } +project('docs') { +} + // add basic tasks like 'clean' and 'assemble' to the root project. e.g.: allows // running `gradle clean` from the root project and deleting the build directory apply plugin: 'base' diff --git a/buildSrc b/buildSrc index e02b8b97cf..70cb55ebdb 160000 --- a/buildSrc +++ b/buildSrc @@ -1 +1 @@ -Subproject commit e02b8b97cf6bd1e9ab6dbe2e1d7ed4848ded5d3d +Subproject commit 70cb55ebdbecd57b0618aa2b9a733ce86b98e25e diff --git a/docs/build.gradle b/docs/build.gradle index 6b761b33a2..8d542f61ce 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -16,6 +16,7 @@ apply plugin: 'base' apply from: "$rootDir/buildSrc/docbook.gradle" +apply from: "$rootDir/buildSrc/preconditions.gradle" description = "Spring Integration Documentation"