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

configure.ac

diff --git a/configure.ac b/configure.ac
index 5181f60..4656fbb 100755
--- a/configure.ac
+++ b/configure.ac
@@ -195,11 +195,12 @@
 if test "$with_java" = "yes";  then
   AX_JAVAC_AND_JAVA
   AC_PATH_PROG([ANT], [ant])
+  AC_PATH_PROG([GRADLE], [gradle])
   AX_CHECK_ANT_VERSION($ANT, 1.7)
   AC_SUBST(CLASSPATH)
   AC_SUBST(ANT_FLAGS)
   AC_SUBST(GRADLE_OPTS)
-  if test "x$JAVA" != "x" && test "x$JAVAC" != "x" && test "x$ANT" != "x" ; then
+  if test "x$JAVA" != "x" && test "x$JAVAC" != "x" && test "x$ANT" != "x" && test "x$GRADLE" != "x" ; then
     have_java="yes"
   fi
 fi
@@ -921,10 +922,10 @@
 if test "$have_java" = "yes" ; then
   echo
   echo "Java Library:"
-  echo "   Using gradlew ............. : lib/java/gradlew"
+  echo "   Using gradle .............. : $GRADLE"
   echo "   Using java ................ : $JAVA"
   echo "   Using javac ............... : $JAVAC"
-  echo "   Using Gradle version ...... : $(lib/java/gradlew --version --quiet | grep Gradle 2>&1)"
+  echo "   Using Gradle version ...... : $($GRADLE --version --quiet | grep Gradle 2>&1)"
   echo "   Using java version ........ : $($JAVA -version 2>&1 | grep 'version ')"
 fi
 if test "$have_lua" = "yes" ; then