Repository: aurora-packaging Updated Branches: refs/heads/master 8aa070321 -> 915b7f9f7
Adapt to gradle upgrade in aurora repo. Bugs closed: AURORA-1566 Reviewed at https://reviews.apache.org/r/41756/ Project: http://git-wip-us.apache.org/repos/asf/aurora-packaging/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora-packaging/commit/915b7f9f Tree: http://git-wip-us.apache.org/repos/asf/aurora-packaging/tree/915b7f9f Diff: http://git-wip-us.apache.org/repos/asf/aurora-packaging/diff/915b7f9f Branch: refs/heads/master Commit: 915b7f9f71055345bf92e630f2aa82c696cb459d Parents: 8aa0703 Author: John Sirois <[email protected]> Authored: Mon Dec 28 16:54:04 2015 -0800 Committer: Bill Farner <[email protected]> Committed: Mon Dec 28 16:54:04 2015 -0800 ---------------------------------------------------------------------- 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/915b7f9f/builder/deb/ubuntu-trusty/Dockerfile ---------------------------------------------------------------------- diff --git a/builder/deb/ubuntu-trusty/Dockerfile b/builder/deb/ubuntu-trusty/Dockerfile index 9f0257d..f9a4004 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.7 \ - && dpkg -i gradle-2.7_2.7-2_all.deb \ + && gem install fpm && ./gradle-mkdeb.sh 2.10 \ + && dpkg -i gradle-2.10_2.10-2_all.deb \ && cd .. && rm -rf gradle-packaging ADD build.sh /build.sh http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/915b7f9f/specs/debian/control ---------------------------------------------------------------------- diff --git a/specs/debian/control b/specs/debian/control index 4aa6bf3..a30e987 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.7) | gradle-2.7, + gradle (>= 2.10) | gradle-2.10, python-all-dev, libkrb5-dev, curl, http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/915b7f9f/specs/rpm/aurora.spec ---------------------------------------------------------------------- diff --git a/specs/rpm/aurora.spec b/specs/rpm/aurora.spec index e2d6f81..291226d 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.7 +%global GRADLE_VERSION 2.10 %endif %if %{?!JAVA_VERSION:!}0
