THRIFT-5562: remove gradle wrapper and use installed gradle 6.9
Client: java
Patch: Jiayu Liu
This closes #2576
diff --git a/build/cmake/DefineOptions.cmake b/build/cmake/DefineOptions.cmake
index 3cca31e..b59292c 100644
--- a/build/cmake/DefineOptions.cmake
+++ b/build/cmake/DefineOptions.cmake
@@ -99,10 +99,10 @@
CMAKE_DEPENDENT_OPTION(BUILD_JAVA "Build Java library" ON
"BUILD_LIBRARIES;WITH_JAVA;GRADLE_FOUND" OFF)
else()
- find_package(Gradlew QUIET)
+ find_package(Gradle QUIET)
find_package(Java QUIET)
CMAKE_DEPENDENT_OPTION(BUILD_JAVA "Build Java library" ON
- "BUILD_LIBRARIES;WITH_JAVA;JAVA_FOUND;GRADLEW_FOUND" OFF)
+ "BUILD_LIBRARIES;WITH_JAVA;JAVA_FOUND;GRADLE_FOUND" OFF)
endif()
# Javascript
@@ -197,7 +197,7 @@
MESSAGE_DEP(GRADLE_FOUND "Gradle missing")
else()
MESSAGE_DEP(JAVA_FOUND "Java Runtime missing")
- MESSAGE_DEP(GRADLEW_FOUND "Gradle Wrapper missing")
+ MESSAGE_DEP(GRADLE_FOUND "Gradle missing")
endif()
message(STATUS " Build Javascript library: ${BUILD_JAVASCRIPT}")
MESSAGE_DEP(WITH_JAVASCRIPT "Disabled by WITH_JAVASCRIPT=OFF")
diff --git a/build/cmake/FindGradlew.cmake b/build/cmake/FindGradlew.cmake
deleted file mode 100644
index 17bb998..0000000
--- a/build/cmake/FindGradlew.cmake
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-
-# GRADLEW_FOUND - system has Gradlew
-# GRADLEW_EXECUTABLE - the Gradlew executable
-#
-# It will search the location CMAKE_SOURCE_DIR/lib/java
-
-include(FindPackageHandleStandardArgs)
-
-find_program(GRADLEW_EXECUTABLE gradlew PATHS ${CMAKE_SOURCE_DIR}/lib/java NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
-find_package_handle_standard_args(Gradlew DEFAULT_MSG GRADLEW_EXECUTABLE)
-mark_as_advanced(GRADLEW_EXECUTABLE)
-
-# Buggy find_program cannot find gradlew.bat when gradlew is at the same path
-# and even buggier ctest will not execute gradlew.bat when gradlew is given.
-if(CMAKE_HOST_WIN32)
- string(REGEX REPLACE "(.+gradlew)$" "\\1.bat" GRADLEW_EXECUTABLE ${GRADLEW_EXECUTABLE})
-endif(CMAKE_HOST_WIN32)
diff --git a/build/docker/ubuntu-bionic/Dockerfile b/build/docker/ubuntu-bionic/Dockerfile
index 0e11d2a..e69df5a 100644
--- a/build/docker/ubuntu-bionic/Dockerfile
+++ b/build/docker/ubuntu-bionic/Dockerfile
@@ -149,12 +149,19 @@
haxelib setup --always /usr/share/haxe/lib && \
haxelib install --always hxcpp 2>&1 > /dev/null
+ENV GRADLE_VERSION="6.9.2"
RUN apt-get install -y --no-install-recommends \
`# Java dependencies` \
ant \
ant-optional \
maven \
- openjdk-11-jdk-headless
+ openjdk-11-jdk-headless && \
+`# Gradle` \
+ wget https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip -q -O /tmp/gradle-$GRADLE_VERSION-bin.zip && \
+ (echo "8b356fd8702d5ffa2e066ed0be45a023a779bba4dd1a68fd11bc2a6bdc981e8f /tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -) && \
+ unzip -d /tmp /tmp/gradle-$GRADLE_VERSION-bin.zip && \
+ mv /tmp/gradle-$GRADLE_VERSION /usr/local/gradle && \
+ ln -s /usr/local/gradle/bin/gradle /usr/local/bin
RUN apt-get install -y --no-install-recommends \
`# Lua dependencies` \
diff --git a/build/docker/ubuntu-disco/Dockerfile b/build/docker/ubuntu-disco/Dockerfile
index 45bef96..4f1de2d 100644
--- a/build/docker/ubuntu-disco/Dockerfile
+++ b/build/docker/ubuntu-disco/Dockerfile
@@ -148,12 +148,19 @@
haxelib setup --always /usr/share/haxe/lib && \
haxelib install --always hxcpp 2>&1 > /dev/null
+ENV GRADLE_VERSION="6.9.2"
RUN apt-get install -y --no-install-recommends \
`# Java dependencies` \
ant \
ant-optional \
maven \
- openjdk-11-jdk-headless
+ openjdk-11-jdk-headless && \
+`# Gradle` \
+ wget https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip -q -O /tmp/gradle-$GRADLE_VERSION-bin.zip && \
+ (echo "8b356fd8702d5ffa2e066ed0be45a023a779bba4dd1a68fd11bc2a6bdc981e8f /tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -) && \
+ unzip -d /tmp /tmp/gradle-$GRADLE_VERSION-bin.zip && \
+ mv /tmp/gradle-$GRADLE_VERSION /usr/local/gradle && \
+ ln -s /usr/local/gradle/bin/gradle /usr/local/bin
RUN apt-get install -y --no-install-recommends \
`# Lua dependencies` \
diff --git a/build/docker/ubuntu-xenial/Dockerfile b/build/docker/ubuntu-xenial/Dockerfile
index 1428fac..7f856ff 100644
--- a/build/docker/ubuntu-xenial/Dockerfile
+++ b/build/docker/ubuntu-xenial/Dockerfile
@@ -155,12 +155,20 @@
haxelib install --always hxcpp 3.4.64 2>&1 > /dev/null
# note: hxcpp 3.4.185 (latest) no longer ships static libraries, and caused a build failure
+ENV GRADLE_VERSION="6.9.2"
RUN apt-get install -y --no-install-recommends \
`# Java dependencies` \
ant \
ant-optional \
openjdk-8-jdk \
- maven
+ maven \
+ unzip && \
+`# Gradle` \
+ wget https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip -q -O /tmp/gradle-$GRADLE_VERSION-bin.zip && \
+ (echo "8b356fd8702d5ffa2e066ed0be45a023a779bba4dd1a68fd11bc2a6bdc981e8f /tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -) && \
+ unzip -d /tmp /tmp/gradle-$GRADLE_VERSION-bin.zip && \
+ mv /tmp/gradle-$GRADLE_VERSION /usr/local/gradle && \
+ ln -s /usr/local/gradle/bin/gradle /usr/local/bin
# disabled: same as ubuntu-bionic jobs
# RUN apt-get install -y --no-install-recommends \