From 5a1b8caf2872108a9f7657a39b7335e9d2cc93dc Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 2 Sep 2014 16:25:28 -0700 Subject: [PATCH] Fixed up the build.gradle script based on the merged asciidoc PR. Disabled the 'bundlor' Gradle plugin after attempting to get the 'bundle' task working, which led to several warnings due to an unspecified, non-customized 'Import' Bundle Manifest header. --- build.gradle | 5 +++-- gradle.properties | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 24bde401..233e547f 100644 --- a/build.gradle +++ b/build.gradle @@ -28,8 +28,10 @@ apply plugin: 'eclipse' apply plugin: 'idea' apply from: "$rootDir/maven.gradle" apply plugin: 'docbook-reference' -apply plugin: 'bundlor' apply plugin: 'org.asciidoctor.gradle.asciidoctor' +//apply plugin: 'bundlor' + +//project.bundlor.bundleSymbolicName = "${bundleSymbolicName}" if (project.hasProperty('platformVersion')) { apply plugin: 'spring-io' @@ -315,4 +317,3 @@ task extractSharedResources(type: Copy) { assemble.dependsOn = ['jar', 'sourcesJar'] defaultTasks 'build' - diff --git a/gradle.properties b/gradle.properties index 8068982a..0e9e706f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,6 @@ antlrVersion=2.7.7 aspectjVersion=1.7.4 +bundleSymbolicName=org.springframework.data.gemfire gemfire.range="[6.5, 9.0)" gemfireVersion=8.0.0 hamcrestVersion=1.3 @@ -10,6 +11,6 @@ mockitoVersion=1.9.5 slf4jVersion=1.7.6 spring.range="[4.0.0, 5.0.0)" springVersion=4.0.6.RELEASE -springDataCommonsVersion=1.9.0.BUILD-SNAPSHOT springDataBuildVersion=1.5.0.BUILD-SNAPSHOT +springDataCommonsVersion=1.9.0.BUILD-SNAPSHOT version=1.5.0.BUILD-SNAPSHOT