Repository: aurora-packaging Updated Branches: refs/heads/master 0614c78cd -> 502d07ef0
Upgrade to gradle 2.14. This complements the corresponding change in the aurora repo: https://reviews.apache.org/r/49899/ Reviewed at https://reviews.apache.org/r/49900/ Project: http://git-wip-us.apache.org/repos/asf/aurora-packaging/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora-packaging/commit/502d07ef Tree: http://git-wip-us.apache.org/repos/asf/aurora-packaging/tree/502d07ef Diff: http://git-wip-us.apache.org/repos/asf/aurora-packaging/diff/502d07ef Branch: refs/heads/master Commit: 502d07ef0487d6ff4fbbceda03b10c94f80ec94e Parents: 0614c78 Author: John Sirois <[email protected]> Authored: Mon Jul 11 19:13:00 2016 -0600 Committer: John Sirois <[email protected]> Committed: Mon Jul 11 19:13:00 2016 -0600 ---------------------------------------------------------------------- builder/deb/debian-jessie/Dockerfile | 4 ++-- builder/deb/ubuntu-trusty/Dockerfile | 4 ++-- specs/debian/control | 2 +- specs/rpm/aurora.spec | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/502d07ef/builder/deb/debian-jessie/Dockerfile ---------------------------------------------------------------------- diff --git a/builder/deb/debian-jessie/Dockerfile b/builder/deb/debian-jessie/Dockerfile index 0b9e37b..2279332 100644 --- a/builder/deb/debian-jessie/Dockerfile +++ b/builder/deb/debian-jessie/Dockerfile @@ -40,9 +40,9 @@ RUN apt-get -y -t jessie-backports install openjdk-8-jdk \ RUN git clone --depth 1 https://github.com/benley/gradle-packaging \ && cd gradle-packaging \ && apt-get -y install ruby ruby-dev unzip wget \ - && gem install fpm && ./gradle-mkdeb.sh 2.12 \ + && gem install fpm && ./gradle-mkdeb.sh 2.14 \ && apt-get -y install gdebi-core \ - && gdebi --non-interactive gradle-2.12_2.12-2_all.deb \ + && gdebi --non-interactive gradle-2.14_2.14-2_all.deb \ && cd .. && rm -rf gradle-packaging ADD build.sh /build.sh http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/502d07ef/builder/deb/ubuntu-trusty/Dockerfile ---------------------------------------------------------------------- diff --git a/builder/deb/ubuntu-trusty/Dockerfile b/builder/deb/ubuntu-trusty/Dockerfile index ff50b8f..56f81e3 100644 --- a/builder/deb/ubuntu-trusty/Dockerfile +++ b/builder/deb/ubuntu-trusty/Dockerfile @@ -44,9 +44,9 @@ RUN curl -sSL http://apache.org/dist/thrift/KEYS | gpg --import - && \ RUN git clone --depth 1 https://github.com/benley/gradle-packaging \ && cd gradle-packaging \ && apt-get -y install ruby ruby-dev unzip wget \ - && gem install fpm && ./gradle-mkdeb.sh 2.12 \ + && gem install fpm && ./gradle-mkdeb.sh 2.14 \ && apt-get -y install gdebi-core \ - && gdebi --non-interactive gradle-2.12_2.12-2_all.deb \ + && gdebi --non-interactive gradle-2.14_2.14-2_all.deb \ && cd .. && rm -rf gradle-packaging ADD build.sh /build.sh http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/502d07ef/specs/debian/control ---------------------------------------------------------------------- diff --git a/specs/debian/control b/specs/debian/control index e4d23ba..7185dbb 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.12) | gradle-2.12, + gradle (>= 2.14) | gradle-2.14, python-all-dev, libkrb5-dev, curl, http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/502d07ef/specs/rpm/aurora.spec ---------------------------------------------------------------------- diff --git a/specs/rpm/aurora.spec b/specs/rpm/aurora.spec index 7a368fd..df5881c 100644 --- a/specs/rpm/aurora.spec +++ b/specs/rpm/aurora.spec @@ -34,7 +34,7 @@ %endif %if %{?!GRADLE_VERSION:1}0 -%global GRADLE_VERSION 2.12 +%global GRADLE_VERSION 2.14 %endif %if %{?!JAVA_VERSION:!}0
