Repository: aurora-packaging Updated Branches: refs/heads/master 46223a1b9 -> ec923e6c6
Build with gradle 4.2 Reviewed at https://reviews.apache.org/r/62524/ Project: http://git-wip-us.apache.org/repos/asf/aurora-packaging/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora-packaging/commit/ec923e6c Tree: http://git-wip-us.apache.org/repos/asf/aurora-packaging/tree/ec923e6c Diff: http://git-wip-us.apache.org/repos/asf/aurora-packaging/diff/ec923e6c Branch: refs/heads/master Commit: ec923e6c6190c7b2cc2a12c207071e2cfaeee7d8 Parents: 46223a1 Author: Bill Farner <[email protected]> Authored: Sun Sep 24 09:49:40 2017 -0700 Committer: Bill Farner <[email protected]> Committed: Sun Sep 24 09:49:40 2017 -0700 ---------------------------------------------------------------------- builder/deb/debian-jessie/Dockerfile | 4 ++-- builder/deb/ubuntu-trusty/Dockerfile | 4 ++-- builder/deb/ubuntu-xenial/Dockerfile | 4 ++-- specs/debian/control | 2 +- specs/rpm/aurora.spec | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/ec923e6c/builder/deb/debian-jessie/Dockerfile ---------------------------------------------------------------------- diff --git a/builder/deb/debian-jessie/Dockerfile b/builder/deb/debian-jessie/Dockerfile index 077d2b6..1983fb6 100644 --- a/builder/deb/debian-jessie/Dockerfile +++ b/builder/deb/debian-jessie/Dockerfile @@ -51,9 +51,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 3.1 \ + && gem install fpm && ./gradle-mkdeb.sh 4.2 \ && apt-get -y install gdebi-core \ - && gdebi --non-interactive gradle-3.1_3.1-2_all.deb \ + && gdebi --non-interactive gradle-4.2_4.2-2_all.deb \ && cd .. && rm -rf gradle-packaging ADD build.sh /build.sh http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/ec923e6c/builder/deb/ubuntu-trusty/Dockerfile ---------------------------------------------------------------------- diff --git a/builder/deb/ubuntu-trusty/Dockerfile b/builder/deb/ubuntu-trusty/Dockerfile index 595196a..99c5481 100644 --- a/builder/deb/ubuntu-trusty/Dockerfile +++ b/builder/deb/ubuntu-trusty/Dockerfile @@ -47,9 +47,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 3.1 \ + && gem install fpm && ./gradle-mkdeb.sh 4.2 \ && apt-get -y install gdebi-core \ - && gdebi --non-interactive gradle-3.1_3.1-2_all.deb \ + && gdebi --non-interactive gradle-4.2_4.2-2_all.deb \ && cd .. && rm -rf gradle-packaging ADD build.sh /build.sh http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/ec923e6c/builder/deb/ubuntu-xenial/Dockerfile ---------------------------------------------------------------------- diff --git a/builder/deb/ubuntu-xenial/Dockerfile b/builder/deb/ubuntu-xenial/Dockerfile index a32f4bc..dfdce15 100644 --- a/builder/deb/ubuntu-xenial/Dockerfile +++ b/builder/deb/ubuntu-xenial/Dockerfile @@ -47,9 +47,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 3.1 \ + && gem install fpm && ./gradle-mkdeb.sh 4.2 \ && apt-get -y install gdebi-core \ - && gdebi --non-interactive gradle-3.1_3.1-2_all.deb \ + && gdebi --non-interactive gradle-4.2_4.2-2_all.deb \ && cd .. && rm -rf gradle-packaging ADD build.sh /build.sh http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/ec923e6c/specs/debian/control ---------------------------------------------------------------------- diff --git a/specs/debian/control b/specs/debian/control index 9625ecf..df86306 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 (>= 3.1) | gradle-3.1, + gradle (>= 4.2) | gradle-4.2, python-all-dev, libkrb5-dev, curl, http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/ec923e6c/specs/rpm/aurora.spec ---------------------------------------------------------------------- diff --git a/specs/rpm/aurora.spec b/specs/rpm/aurora.spec index 2b3c9fe..e1eff9c 100644 --- a/specs/rpm/aurora.spec +++ b/specs/rpm/aurora.spec @@ -34,7 +34,7 @@ %endif %if %{?!GRADLE_VERSION:1}0 -%global GRADLE_VERSION 3.1 +%global GRADLE_VERSION 4.2 %endif %if %{?!JAVA_VERSION:!}0
