Repository: aurora-packaging Updated Branches: refs/heads/master efd0edb08 -> a36f2f74d
Use gradle 2.7 in builds. Reviewed at https://reviews.apache.org/r/39113/ Project: http://git-wip-us.apache.org/repos/asf/aurora-packaging/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora-packaging/commit/a36f2f74 Tree: http://git-wip-us.apache.org/repos/asf/aurora-packaging/tree/a36f2f74 Diff: http://git-wip-us.apache.org/repos/asf/aurora-packaging/diff/a36f2f74 Branch: refs/heads/master Commit: a36f2f74dc0d81a6a8dfd22aff73df6f55c98b56 Parents: efd0edb Author: Bill Farner <[email protected]> Authored: Wed Oct 7 21:08:47 2015 -0700 Committer: Bill Farner <[email protected]> Committed: Wed Oct 7 21:08:47 2015 -0700 ---------------------------------------------------------------------- builder/deb/ubuntu-trusty/Dockerfile | 4 ++-- specs/debian/control | 2 +- specs/rpm/aurora.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/a36f2f74/builder/deb/ubuntu-trusty/Dockerfile ---------------------------------------------------------------------- diff --git a/builder/deb/ubuntu-trusty/Dockerfile b/builder/deb/ubuntu-trusty/Dockerfile index a827c7a..9f0257d 100644 --- a/builder/deb/ubuntu-trusty/Dockerfile +++ b/builder/deb/ubuntu-trusty/Dockerfile @@ -44,8 +44,8 @@ RUN curl -O http://people.apache.org/~jfarrell/thrift/0.9.1/contrib/deb/ubuntu/1 RUN git clone --depth 1 https://github.com/benley/gradle-packaging \ && cd gradle-packaging \ && apt-get install -y ruby ruby-dev unzip wget \ - && gem install fpm && ./gradle-mkdeb.sh 2.6 \ - && dpkg -i gradle-2.6_2.6-2_all.deb \ + && gem install fpm && ./gradle-mkdeb.sh 2.7 \ + && dpkg -i gradle-2.7_2.7-2_all.deb \ && cd .. && rm -rf gradle-packaging ADD build.sh /build.sh http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/a36f2f74/specs/debian/control ---------------------------------------------------------------------- diff --git a/specs/debian/control b/specs/debian/control index b286517..4aa6bf3 100644 --- a/specs/debian/control +++ b/specs/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: The Apache Aurora authors <[email protected]> Build-Depends: debhelper (>= 9), java8-sdk | openjdk-8-jdk, - gradle (>= 2.6) | gradle-2.6, + gradle (>= 2.7) | gradle-2.7, python-all-dev, libkrb5-dev, curl, http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/a36f2f74/specs/rpm/aurora.spec ---------------------------------------------------------------------- diff --git a/specs/rpm/aurora.spec b/specs/rpm/aurora.spec index cf9c271..944c1c0 100644 --- a/specs/rpm/aurora.spec +++ b/specs/rpm/aurora.spec @@ -30,7 +30,7 @@ %endif %if %{?!GRADLE_VERSION:1}0 -%global GRADLE_VERSION 2.6 +%global GRADLE_VERSION 2.7 %endif %if %{?!JAVA_VERSION:!}0
