commit 5d220eb3321aa571b316da942feb72c29c7386c1
author Jiayu Liu <jiayu.liu@airbnb.com> Tue Apr 19 04:18:58 2022 +0200
committer Jens Geyer <jensg@apache.org> Tue Apr 19 18:40:52 2022 +0200
tree f4abfee6e0c27518187c9e65de095d524429c07b
parent a8fded497635f2a319ece3882b234f510d84cacd

THRIFT-5562: remove gradle wrapper and use installed gradle 6.9
Client: java
Patch: Jiayu Liu

This closes #2576

lib/java/CMakeLists.txt

diff --git a/lib/java/CMakeLists.txt b/lib/java/CMakeLists.txt
index b9bfc81..1fb557e 100644
--- a/lib/java/CMakeLists.txt
+++ b/lib/java/CMakeLists.txt
@@ -51,8 +51,8 @@
     file(GLOB_RECURSE THRIFTJAVA_SOURCES LIST_DIRECTORIES false
         "${CMAKE_CURRENT_SOURCE_DIR}/src/*")
     add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/build/libs/libthrift.jar"
-        COMMENT "Building Java library using Gradle Wrapper"
-        COMMAND ${GRADLEW_EXECUTABLE} ${GRADLE_OPTS} assemble
+        COMMENT "Building Java library using Gradle"
+        COMMAND ${GRADLE_EXECUTABLE} ${GRADLE_OPTS} assemble
             --console=plain --no-daemon
             -Prelease=${PRELEASE}
             -Pthrift.version=${thrift_VERSION}
@@ -67,7 +67,7 @@
     add_custom_target(MavenPublish
         COMMENT "Publishing Java Library to Apache Maven staging"
         DEPENDS ThriftJava
-        COMMAND ${GRADLEW_EXECUTABLE} ${GRADLE_OPTS} clean uploadArchives
+        COMMAND ${GRADLE_EXECUTABLE} ${GRADLE_OPTS} clean uploadArchives
             --console=plain --no-daemon
             -Prelease=${PRELEASE}
             -Pthrift.version=${thrift_VERSION}
@@ -89,7 +89,7 @@
 
     if(BUILD_TESTING)
         add_test(NAME JavaTest
-            COMMAND ${GRADLEW_EXECUTABLE} ${GRADLE_OPTS} test
+            COMMAND ${GRADLE_EXECUTABLE} ${GRADLE_OPTS} test
                 --console=plain --no-daemon
                 -Prelease=${PRELEASE}
                 -Pthrift.version=${thrift_VERSION}