THRIFT-5699: java lib and build tool chain: gradle 8.0.2 (#2779)
diff --git a/lib/java/README.md b/lib/java/README.md
index 956d043..aa07495 100644
--- a/lib/java/README.md
+++ b/lib/java/README.md
@@ -42,7 +42,7 @@
the Gradle build system, which tends to be predominant amongst Java
developers.
-Currently we use gradle 7.6 to build the Thrift Java source. The usual way to setup gradle
+Currently we use gradle 8.0 to build the Thrift Java source. The usual way to setup gradle
project is to include the gradle-wrapper.jar in the project and then run the gradle wrapper to
bootstrap setting up gradle binaries. However to avoid putting binary files into the source tree we
have ignored the gradle wrapper files. You are expected to install it manually, as described in
@@ -50,13 +50,13 @@
following this step (which is also done in the travis CI docker images):
```bash
-export GRADLE_VERSION="7.6"
+export GRADLE_VERSION="8.0.2"
# install dependencies
apt-get install -y --no-install-recommends openjdk-17-jdk-headless wget unzip
# download gradle distribution
wget https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip -q -O /tmp/gradle-$GRADLE_VERSION-bin.zip
# check binary integrity
-echo "7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b /tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -
+echo "ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7 /tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -
# unzip and install
unzip -d /tmp /tmp/gradle-$GRADLE_VERSION-bin.zip
mv /tmp/gradle-$GRADLE_VERSION /usr/local/gradle
diff --git a/lib/java/build.gradle b/lib/java/build.gradle
index c8fc27c..7459e1f 100644
--- a/lib/java/build.gradle
+++ b/lib/java/build.gradle
@@ -40,7 +40,7 @@
id 'maven-publish'
id 'signing'
id 'pmd'
- id 'com.github.johnrengelman.shadow' version '6.1.0'
+ id 'com.github.johnrengelman.shadow' version '8.1.1'
id "com.github.spotbugs" version "4.7.1"
id "com.diffplug.spotless" version "6.5.2"
}
diff --git a/lib/java/gradle/sourceConfiguration.gradle b/lib/java/gradle/sourceConfiguration.gradle
index 7eccc73..e3e143a 100644
--- a/lib/java/gradle/sourceConfiguration.gradle
+++ b/lib/java/gradle/sourceConfiguration.gradle
@@ -21,7 +21,7 @@
// ----------------------------------------------------------------------------
// Compiler configuration details
-// We are using Java 17 toolchain to compile.
+// We are using Java 17 (latest LTS) toolchain to compile.
// This enables decoupling from the Java version that gradle runs, from
// the actual JDK version for the project. For more details, see
// https://docs.gradle.org/current/userguide/toolchains.html
diff --git a/lib/java/gradle/unitTests.gradle b/lib/java/gradle/unitTests.gradle
index 293bcca..1e7481b 100644
--- a/lib/java/gradle/unitTests.gradle
+++ b/lib/java/gradle/unitTests.gradle
@@ -24,7 +24,7 @@
description = 'Assembles a jar archive containing the test classes.'
project.test.dependsOn it
- classifier 'test'
+ archiveClassifier = 'test'
from sourceSets.test.output
}