[FAB-8654] Upgrade Gradle to version 4.4.1

Upgrade Java environment Docker image and dev environment to Gradle 4.4.1 to match [FAB-7626] Change-Id: Iba911cdda6e79d8e475e6c2fb3c925cc1f55fe8a Signed-off-by: Sheehan Anderson <[email protected]>
hyperledger · Mar 5, 2018 · d414824 · d414824
1 parent 7a5a16e
commit d414824
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/devenv/setup.sh b/devenv/setup.sh
@@ -93,9 +93,9 @@ runuser -l ubuntu -c '/hyperledger/fabric/devenv/install_nvm.sh'
 # ----------------------------------------------------------------
 apt-get install -y openjdk-8-jdk maven
 
-wget https://services.gradle.org/distributions/gradle-2.12-bin.zip -P /tmp --quiet
-unzip -q /tmp/gradle-2.12-bin.zip -d /opt && rm /tmp/gradle-2.12-bin.zip
-ln -s /opt/gradle-2.12/bin/gradle /usr/bin
+wget https://services.gradle.org/distributions/gradle-4.4.1-bin.zip -P /tmp --quiet
+unzip -q /tmp/gradle-4.4.1-bin.zip -d /opt && rm /tmp/gradle-4.4.1-bin.zip
+ln -s /opt/gradle-4.4.1/bin/gradle /usr/bin
 
 # ----------------------------------------------------------------
 # Misc tasks

diff --git a/images/javaenv/Dockerfile.in b/images/javaenv/Dockerfile.in
@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 FROM _BASE_NS_/fabric-baseimage:_BASE_TAG_
-RUN curl -sSL https://services.gradle.org/distributions/gradle-2.12-bin.zip > /tmp/gradle-2.12-bin.zip
-RUN unzip -qo /tmp/gradle-2.12-bin.zip -d /opt && rm /tmp/gradle-2.12-bin.zip
-RUN ln -s /opt/gradle-2.12/bin/gradle /usr/bin
+RUN curl -sSL https://services.gradle.org/distributions/gradle-4.4.1-bin.zip > /tmp/gradle-4.4.1-bin.zip
+RUN unzip -qo /tmp/gradle-4.4.1-bin.zip -d /opt && rm /tmp/gradle-4.4.1-bin.zip
+RUN ln -s /opt/gradle-4.4.1/bin/gradle /usr/bin
 ENV MAVEN_VERSION=3.3.9
 ENV USER_HOME_DIR="/root"
 RUN mkdir -p /usr/share/maven /usr/share/maven/ref \