Repository: incubator-hawq Updated Branches: refs/heads/master 5620300d1 -> 629ecd7a9
HAWQ-423. Fixed tomcat version, upgraded gradle version to fix download issue Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/629ecd7a Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/629ecd7a Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/629ecd7a Branch: refs/heads/master Commit: 629ecd7a9751d703a2d8a5eaa2b9497d8df993df Parents: 5620300 Author: Shivram Mani <shivram.m...@gmail.com> Authored: Thu Feb 18 14:25:44 2016 -0800 Committer: Shivram Mani <shivram.m...@gmail.com> Committed: Thu Feb 18 14:25:44 2016 -0800 ---------------------------------------------------------------------- pxf/build.gradle | 6 +++--- pxf/gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/629ecd7a/pxf/build.gradle ---------------------------------------------------------------------- diff --git a/pxf/build.gradle b/pxf/build.gradle index 5f6ff1d..db5deea 100644 --- a/pxf/build.gradle +++ b/pxf/build.gradle @@ -36,7 +36,7 @@ buildscript { dependencies { classpath "com.netflix.nebula:gradle-ospackage-plugin:2.2.6" - classpath "de.undercouch:gradle-download-task:1.2" + classpath "de.undercouch:gradle-download-task:2.1.0" } } @@ -352,7 +352,7 @@ def buildNumber() { } task wrapper(type: Wrapper) { - gradleVersion = '2.10' + gradleVersion = '2.11' } def distSubprojects = subprojects - project(':pxf-api') @@ -391,6 +391,7 @@ task rpm(type: Copy, dependsOn: [subprojects.build, distSubprojects.buildRpm]) { // tomcat def tomcatName = "apache-tomcat-${tomcatVersion}" def tomcatTargetDir = "tomcat/build/" + task tomcatGet << { @@ -434,7 +435,6 @@ task tomcatRpm(type: Rpm) { packageName 'apache-tomcat' summary = 'Apache Tomcat RPM' vendor = project.vendor - release = buildNumber() version = tomcatVersion os = LINUX license = project.license http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/629ecd7a/pxf/gradle/wrapper/gradle-wrapper.properties ---------------------------------------------------------------------- diff --git a/pxf/gradle/wrapper/gradle-wrapper.properties b/pxf/gradle/wrapper/gradle-wrapper.properties index 8d125df..9e56abb 100644 --- a/pxf/gradle/wrapper/gradle-wrapper.properties +++ b/pxf/gradle/wrapper/gradle-wrapper.properties @@ -20,4 +20,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-2.10-all.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-2.11-all.zip
