diff --git a/build.gradle b/build.gradle index 0a9b111fa..fe4bdb29a 100644 --- a/build.gradle +++ b/build.gradle @@ -14,6 +14,7 @@ subprojects { // all core projects should be OSGi-compliant bundles // add the bundlor task to ensure proper manifests apply from: "$rootDir/gradle/bundlor.gradle" + project.checkForProps = { Map args -> requiredPropSets.add args } @@ -58,10 +59,6 @@ subprojects { testCompile "org.springframework:spring-test:$springVersion" testCompile "org.mockito:mockito-all:$mockitoVersion" } - - test { - testReport = false - } } configurations { diff --git a/gradle/bundlor.gradle b/gradle/bundlor.gradle index 08a37410d..fbaae095a 100644 --- a/gradle/bundlor.gradle +++ b/gradle/bundlor.gradle @@ -80,10 +80,9 @@ task bundlor(dependsOn: compileJava) { // execute the ant task, and write out the $manifest file ant.bundlor(inputPath: sourceSets.main.classesDir, outputPath: bundlorDir, manifestTemplatePath: template) { - property(name: 'version', value: project.version) - //property(name: 'spring.range', value: project.springRange) - //property(name: 'jedis.range', value: project.jedisRange) - //property(name: 'jackson.range', value: project.jacksonRange) + for (p in project.properties) { + property(name: p.key, value: p.value) + } } } } diff --git a/spring-data-redis/gradle.properties b/spring-data-redis/gradle.properties index 58cacf49d..17abd87e0 100644 --- a/spring-data-redis/gradle.properties +++ b/spring-data-redis/gradle.properties @@ -1,3 +1,3 @@ -springRange = "[3.0.0, 4.0.0)" -jedisRange = "[1.0.0,2.0.0)" -jacksonRange = "[1.6, 2.0.0)" +spring.range = "[3.0.0, 4.0.0)" +jedis.range = "[1.5.2, 2.0.0)" +jackson.range = "[1.6, 2.0.0)"