You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by js...@apache.org on 2016/07/11 16:24:19 UTC
aurora git commit: Upgrade to gradle 2.14.
Repository: aurora
Updated Branches:
refs/heads/master c41420fd7 -> 21fe181e1
Upgrade to gradle 2.14.
This brings Gradle to 2.14, release notes here:
https://docs.gradle.org/2.13/release-notes
https://docs.gradle.org/2.14/release-notes
Since the Gradle daemon is no longer incubating it is enabled by
default for the project and the Vagrant provisioning is simplified
as a result.
Reviewed at https://reviews.apache.org/r/49899/
Project: http://git-wip-us.apache.org/repos/asf/aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/21fe181e
Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/21fe181e
Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/21fe181e
Branch: refs/heads/master
Commit: 21fe181e174c653c8b964ddd66a2257879bbacf5
Parents: c41420f
Author: John Sirois <js...@apache.org>
Authored: Mon Jul 11 10:24:04 2016 -0600
Committer: John Sirois <jo...@gmail.com>
Committed: Mon Jul 11 10:24:04 2016 -0600
----------------------------------------------------------------------
buildSrc/gradle.properties | 2 +-
examples/vagrant/provision-dev-cluster.sh | 9 ---------
gradle.properties | 2 ++
gradle/wrapper/gradle-wrapper.properties | 2 +-
4 files changed, 4 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aurora/blob/21fe181e/buildSrc/gradle.properties
----------------------------------------------------------------------
diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties
index 075726f..8cfb328 100644
--- a/buildSrc/gradle.properties
+++ b/buildSrc/gradle.properties
@@ -1,3 +1,3 @@
# When upgrading gradle versions, be sure to update the relevant files in the aurora-packaging
# repo as well. See https://reviews.apache.org/r/39113/ for an example.
-GRADLE_VERSION = 2.12
+GRADLE_VERSION = 2.14
http://git-wip-us.apache.org/repos/asf/aurora/blob/21fe181e/examples/vagrant/provision-dev-cluster.sh
----------------------------------------------------------------------
diff --git a/examples/vagrant/provision-dev-cluster.sh b/examples/vagrant/provision-dev-cluster.sh
index 2c78677..7a35971 100755
--- a/examples/vagrant/provision-dev-cluster.sh
+++ b/examples/vagrant/provision-dev-cluster.sh
@@ -42,14 +42,6 @@ Host *
EOF
}
-function enable_gradle_daemon {
- install -o vagrant -g vagrant -d -m 0755 /home/vagrant/.gradle
- cat > /home/vagrant/.gradle/gradle.properties <<EOF
-org.gradle.daemon=true
-EOF
- chown vagrant:vagrant /home/vagrant/.gradle/gradle.properties
-}
-
function configure_netrc {
cat > /home/vagrant/.netrc <<EOF
machine $(hostname -f)
@@ -100,7 +92,6 @@ prepare_extras
install_cluster_config
install_ssh_config
start_services
-enable_gradle_daemon
configure_netrc
sudoless_docker_setup
su vagrant -c "aurorabuild all"
http://git-wip-us.apache.org/repos/asf/aurora/blob/21fe181e/gradle.properties
----------------------------------------------------------------------
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..6fadce8
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,2 @@
+# Settings can be found here: https://docs.gradle.org/current/userguide/build_environment.html
+org.gradle.daemon=true
http://git-wip-us.apache.org/repos/asf/aurora/blob/21fe181e/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8508237..afe80a3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip