Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-151 aab056851 -> d8ed5d76e
GEODE-151: Updates from review Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/d8ed5d76 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/d8ed5d76 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/d8ed5d76 Branch: refs/heads/feature/GEODE-151 Commit: d8ed5d76e4adc060eab91a1ca36d9877f0d68103 Parents: d6c58e8 Author: Mark Bretl <[email protected]> Authored: Mon Nov 16 12:05:07 2015 -0800 Committer: Mark Bretl <[email protected]> Committed: Mon Nov 16 12:12:59 2015 -0800 ---------------------------------------------------------------------- gemfire-core/build.gradle | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d8ed5d76/gemfire-core/build.gradle ---------------------------------------------------------------------- diff --git a/gemfire-core/build.gradle b/gemfire-core/build.gradle index ad1fa22..f03066f 100755 --- a/gemfire-core/build.gradle +++ b/gemfire-core/build.gradle @@ -100,31 +100,18 @@ task createVersionPropertiesFile { doLast { - ext.isGitWorkspace = true try { - def grgit = org.ajoberstar.grgit.Grgit.open() - //def grgit = org.ajoberstar.grgit.Grgit.open(dir: 'asdf') - } catch (Exception e) { - logger.warn( '***** Unable to find Git workspace *****' ) - logger.warn( '***** Using default version information *****' ) - isGitWorkspace = false - } - - if ( ext.isGitWorkspace ) { + def grgit = org.ajoberstar.grgit.Grgit.open() ext.branch = grgit.branch.getCurrent().name ext.commitId = grgit.head().id ext.sourceDate = grgit.head().getDate().format('yyyy-MM-dd HH:mm:ss Z') - logger.info( '***** Current Branch: ' + ext.branch + ' ******' ) - logger.info( '***** Current ID: ' + ext.commitId + ' ******' ) - logger.info( '***** Current Date: ' + ext.sourceDate + ' ******' ) - } - else { - // Not in SCM workspace, use default values + grgit.close() + } catch (Exception e) { + logger.warn( '***** Unable to find Git workspace. Using default version information *****' ) ext.branch = 'UNKNOWN' ext.commitId = 'UNKNOWN' ext.sourceDate = new Date().format('yyyy-MM-dd HH:mm:ss Z') } - grgit.close() ext.osArch = System.getProperty('os.arch') ext.osName = System.getProperty('os.name')
