This is an automated email from the ASF dual-hosted git repository.
prhomberg pushed a commit to branch release/1.7.0
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/release/1.7.0 by this push:
new f9abdeb Revert two GEODE-5600 commits
f9abdeb is described below
commit f9abdeb489c9278f96afd37f72a7a9d14cb0f154
Author: Patrick Rhomberg <[email protected]>
AuthorDate: Thu Sep 13 11:07:12 2018 -0700
Revert two GEODE-5600 commits
Revert "GEODE-5600: Update pull-request template to expected env variables."
This reverts commit 24b65ac
Revert "GEODE-5600: Add build property skipVersionFileRegeneration"
This reverts commit a77905d33d6c338c2358698602496a913b93176e.
---
ci/pipelines/pull-request/jinja.template.yml | 2 --
geode-core/build.gradle | 33 ++++++++++------------------
2 files changed, 11 insertions(+), 24 deletions(-)
diff --git a/ci/pipelines/pull-request/jinja.template.yml
b/ci/pipelines/pull-request/jinja.template.yml
index e997c7d..07a4649 100644
--- a/ci/pipelines/pull-request/jinja.template.yml
+++ b/ci/pipelines/pull-request/jinja.template.yml
@@ -102,7 +102,6 @@ jobs:
platform: linux
params:
MAINTENANCE_VERSION: {{repository.branch}}
- SOURCE_REPOSITORY: {{repository.branch}}
PUBLIC_BUCKET: ((!public-bucket))
SERVICE_ACCOUNT: ((!concourse-gcp-account))
run:
@@ -192,7 +191,6 @@ jobs:
GRADLE_TASK: {{test.GRADLE_TASK}}
GRADLE_TASK_OPTIONS: ""
MAINTENANCE_VERSION: {{repository.branch}}
- SOURCE_REPOSITORY: {{repository.branch}}
PARALLEL_DUNIT: {{test.PARALLEL_DUNIT}}
PARALLEL_GRADLE: {{test.PARALLEL_GRADLE}}
PUBLIC_BUCKET: ((!public-bucket))
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index d4a08df..f5b1064 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -217,33 +217,22 @@ dependencies {
// Creates the version properties file and writes it to the classes dir
task createVersionPropertiesFile {
-
def propertiesFile = file(generatedResources +
"/org/apache/geode/internal/GemFireVersion.properties");
- // Allow this step to be skipped.
- onlyIf {
- // Project properties are parsed as strings.
- // Use boolean comparison, not the value itself, to determine truth.
- !propertiesFile.exists() || sourceRevision != "unknown"
- }
- // onlyIf takes precedence, but we should generate the file whenever the
revision is specified.
- outputs.upToDateWhen { false }
- outputs.files {
- propertiesFile
- }
+ outputs.file propertiesFile
+ inputs.dir "../.git/index"
doLast {
def props = [
- "Product-Name" : productName,
- "Product-Version" : version,
- "Build-Id" : "${System.env.USER} ${buildId}".toString(),
- "Build-Date" : new Date().format('yyyy-MM-dd HH:mm:ss Z'),
- "Build-Platform" : "${System.properties['os.name']}
${System.properties['os.version']} ${System.properties['os.arch']}".toString(),
- "Build-Java-Version": System.properties['java.version'],
- 'Source-Repository' : sourceRepository,
- 'Source-Revision' : sourceRevision,
- 'Source-Date' : new Date().format('yyyy-MM-dd HH:mm:ss Z')
+ "Product-Name" : productName,
+ "Product-Version" : version,
+ "Build-Id" : "${System.env.USER} ${buildId}".toString(),
+ "Build-Date" : new Date().format('yyyy-MM-dd HH:mm:ss Z'),
+ "Build-Platform" : "${System.properties['os.name']}
${System.properties['os.version']} ${System.properties['os.arch']}".toString(),
+ "Build-Java-Version": System.properties['java.version']
] as Properties
- propertiesFile.getParentFile().mkdirs()
+ props.putAll(readScmInfo())
+
+ propertiesFile.getParentFile().mkdirs();
new FileOutputStream(propertiesFile).withStream { fos ->
props.store(fos, '')
}
