diff options
author | Jiayu Liu <jiayu.liu@airbnb.com> | 2022-04-19 04:18:58 +0200 |
---|---|---|
committer | Jens Geyer <jensg@apache.org> | 2022-04-19 18:40:52 +0200 |
commit | 5d220eb3321aa571b316da942feb72c29c7386c1 (patch) | |
tree | f4abfee6e0c27518187c9e65de095d524429c07b /build | |
parent | a8fded497635f2a319ece3882b234f510d84cacd (diff) | |
download | thrift-5d220eb3321aa571b316da942feb72c29c7386c1.tar.gz |
THRIFT-5562: remove gradle wrapper and use installed gradle 6.9
Client: java
Patch: Jiayu Liu
This closes #2576
Diffstat (limited to 'build')
-rw-r--r-- | build/cmake/DefineOptions.cmake | 6 | ||||
-rw-r--r-- | build/cmake/FindGradlew.cmake | 36 | ||||
-rw-r--r-- | build/docker/ubuntu-bionic/Dockerfile | 9 | ||||
-rw-r--r-- | build/docker/ubuntu-disco/Dockerfile | 9 | ||||
-rw-r--r-- | build/docker/ubuntu-xenial/Dockerfile | 10 |
5 files changed, 28 insertions, 42 deletions
diff --git a/build/cmake/DefineOptions.cmake b/build/cmake/DefineOptions.cmake index 3cca31ec3..b59292cd3 100644 --- a/build/cmake/DefineOptions.cmake +++ b/build/cmake/DefineOptions.cmake @@ -99,10 +99,10 @@ if(ANDROID) 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 @@ if(ANDROID) 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 17bb99899..000000000 --- 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 0e11d2ac6..e69df5ab3 100644 --- a/build/docker/ubuntu-bionic/Dockerfile +++ b/build/docker/ubuntu-bionic/Dockerfile @@ -149,12 +149,19 @@ RUN apt-get install -y --no-install-recommends \ 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 45bef96d6..4f1de2d9d 100644 --- a/build/docker/ubuntu-disco/Dockerfile +++ b/build/docker/ubuntu-disco/Dockerfile @@ -148,12 +148,19 @@ RUN apt-get install -y --no-install-recommends \ 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 1428fac00..7f856ff4b 100644 --- a/build/docker/ubuntu-xenial/Dockerfile +++ b/build/docker/ubuntu-xenial/Dockerfile @@ -155,12 +155,20 @@ RUN apt-get install -y --no-install-recommends \ 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 \ |