You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by se...@apache.org on 2016/10/06 07:24:59 UTC
aurora-packaging git commit: Update to Gradle 3.1.
Repository: aurora-packaging
Updated Branches:
refs/heads/master 7beeb1480 -> 94aee46ee
Update to Gradle 3.1.
Reviewed at https://reviews.apache.org/r/52579/
Project: http://git-wip-us.apache.org/repos/asf/aurora-packaging/repo
Commit: http://git-wip-us.apache.org/repos/asf/aurora-packaging/commit/94aee46e
Tree: http://git-wip-us.apache.org/repos/asf/aurora-packaging/tree/94aee46e
Diff: http://git-wip-us.apache.org/repos/asf/aurora-packaging/diff/94aee46e
Branch: refs/heads/master
Commit: 94aee46ee2b4f0c3d35a8c01f9ef57d6f3d8a451
Parents: 7beeb14
Author: Stephan Erb <se...@apache.org>
Authored: Thu Oct 6 09:24:40 2016 +0200
Committer: Stephan Erb <se...@apache.org>
Committed: Thu Oct 6 09:24:40 2016 +0200
----------------------------------------------------------------------
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/94aee46e/builder/deb/debian-jessie/Dockerfile
----------------------------------------------------------------------
diff --git a/builder/deb/debian-jessie/Dockerfile b/builder/deb/debian-jessie/Dockerfile
index a1b3625..54cb2e0 100644
--- a/builder/deb/debian-jessie/Dockerfile
+++ b/builder/deb/debian-jessie/Dockerfile
@@ -50,9 +50,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.14 \
+ && gem install fpm && ./gradle-mkdeb.sh 3.1 \
&& apt-get -y install gdebi-core \
- && gdebi --non-interactive gradle-2.14_2.14-2_all.deb \
+ && gdebi --non-interactive gradle-3.1_3.1-2_all.deb \
&& cd .. && rm -rf gradle-packaging
ADD build.sh /build.sh
http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/94aee46e/builder/deb/ubuntu-trusty/Dockerfile
----------------------------------------------------------------------
diff --git a/builder/deb/ubuntu-trusty/Dockerfile b/builder/deb/ubuntu-trusty/Dockerfile
index 58b1cc4..802049b 100644
--- a/builder/deb/ubuntu-trusty/Dockerfile
+++ b/builder/deb/ubuntu-trusty/Dockerfile
@@ -45,9 +45,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.14 \
+ && gem install fpm && ./gradle-mkdeb.sh 3.1 \
&& apt-get -y install gdebi-core \
- && gdebi --non-interactive gradle-2.14_2.14-2_all.deb \
+ && gdebi --non-interactive gradle-3.1_3.1-2_all.deb \
&& cd .. && rm -rf gradle-packaging
ADD build.sh /build.sh
http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/94aee46e/specs/debian/control
----------------------------------------------------------------------
diff --git a/specs/debian/control b/specs/debian/control
index d6b0cfc..3924715 100644
--- a/specs/debian/control
+++ b/specs/debian/control
@@ -3,7 +3,7 @@ Priority: optional
Maintainer: The Apache Aurora authors <de...@aurora.apache.org>
Build-Depends: debhelper (>= 9),
java8-sdk | openjdk-8-jdk,
- gradle (>= 2.14) | gradle-2.14,
+ gradle (>= 3.1) | gradle-3.1,
python-all-dev,
libkrb5-dev,
curl,
http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/94aee46e/specs/rpm/aurora.spec
----------------------------------------------------------------------
diff --git a/specs/rpm/aurora.spec b/specs/rpm/aurora.spec
index 430adf3..84eeea6 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.14
+%global GRADLE_VERSION 3.1
%endif
%if %{?!JAVA_VERSION:!}0