You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by up...@apache.org on 2016/01/26 19:12:55 UTC
incubator-geode git commit: GEODE-854: Put pulseversion.properties in
generated-resources
Repository: incubator-geode
Updated Branches:
refs/heads/develop ed17d4cd5 -> 2757f634f
GEODE-854: Put pulseversion.properties in generated-resources
Using the same pattern as gemfire-core, put the version properties file
in a generated resources directory, not in source.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/2757f634
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/2757f634
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/2757f634
Branch: refs/heads/develop
Commit: 2757f634f72e955e811d178afb045eb2096ec180
Parents: ed17d4c
Author: Dan Smith <up...@apache.org>
Authored: Mon Jan 25 12:22:43 2016 -0800
Committer: Dan Smith <up...@apache.org>
Committed: Tue Jan 26 10:12:32 2016 -0800
----------------------------------------------------------------------
gemfire-pulse/build.gradle | 16 +++++++++++-----
gradle/rat.gradle | 1 -
2 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2757f634/gemfire-pulse/build.gradle
----------------------------------------------------------------------
diff --git a/gemfire-pulse/build.gradle b/gemfire-pulse/build.gradle
index f2076b5..4c1135d 100755
--- a/gemfire-pulse/build.gradle
+++ b/gemfire-pulse/build.gradle
@@ -28,8 +28,6 @@ buildscript {
apply plugin: 'war'
-def resDir="$projectDir/src/main/resources"
-
sourceSets {
main {
resources {
@@ -76,12 +74,20 @@ dependencies {
testRuntime 'org.apache.commons:commons-exec:1.3'
}
+def generatedResources = "$buildDir/generated-resources/main"
+
+sourceSets {
+ main {
+ output.dir(generatedResources, builtBy: 'createPulsePropFile')
+ }
+}
+
// Creates the version properties file and writes it to the resources dir
task createPulsePropFile {
description 'Creates a new Pule properties file with build/ version information'
- def propertiesFile = file(resDir + "/pulseversion.properties");
+ def propertiesFile = file(generatedResources + "/pulseversion.properties");
outputs.file propertiesFile
- inputs.dir resDir
+ inputs.dir compileJava.destinationDir
doLast {
try {
@@ -114,6 +120,7 @@ task createPulsePropFile {
"Source-Repository" : ext.branch
] as Properties
+ propertiesFile.getParentFile().mkdirs();
new FileOutputStream(propertiesFile).withStream { fos ->
props.store(fos, '')
}
@@ -146,7 +153,6 @@ artifacts {
def pulseWarFile = "gemfire-pulse-"+version+".war"
war {
- dependsOn createPulsePropFile
classpath configurations.runtime
classpath project(':gemfire-core').webJar.archivePath
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2757f634/gradle/rat.gradle
----------------------------------------------------------------------
diff --git a/gradle/rat.gradle b/gradle/rat.gradle
index 07cb2f1..b81cffd 100644
--- a/gradle/rat.gradle
+++ b/gradle/rat.gradle
@@ -80,7 +80,6 @@ rat {
'gemfire-spark-connector/project/plugins.sbt',
'gemfire-spark-connector/project/build.properties',
'**/log4j2*.xml',
- 'gemfire-pulse/src/main/resources/pulseversion.properties',
// these are test files that don't expect the first element to be a comment
'gemfire-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/domain/CacheElementJUnitTest.xml',