This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch site
in repository https://gitbox.apache.org/repos/asf/calcite.git
The following commit(s) were added to refs/heads/site by this push:
new d95a5a7e65 [CALCITE-7020] Upgrade gradle from 8.7 to 8.14.4
d95a5a7e65 is described below
commit d95a5a7e65fccf61f1a9039f5f16f52e4c41ed85
Author: Sergey Nuyanzin <[email protected]>
AuthorDate: Sat Apr 11 21:41:46 2026 +0200
[CALCITE-7020] Upgrade gradle from 8.7 to 8.14.4
Other dependencies also bumped
com.github.vlsi.vlsi-release-plugins from 1.90 to 3.0.1
kotlin from 1.9.22 to 2.0.21
org.jetbrains.gradle.plugin.idea-ext from 0.5 to 1.4.1
jandex from 2.2.3.Final to 3.5.3
asm from 9.6 to 9.9.1
byte-buddy from 1.14.15 to 1.18.8
junit5 from 5.9.1 to 5.10.5
---
.ratignore | 4 ++++
build.gradle.kts | 14 +++++++++----
buildSrc/build.gradle.kts | 8 ++++++--
.../apache/calcite/test/CassandraExtension.java | 2 +-
gradle.properties | 14 ++++++-------
gradle/wrapper/gradle-wrapper.jar | Bin 43462 -> 43504 bytes
gradle/wrapper/gradle-wrapper.properties | 4 ++--
gradlew | 7 +++++--
gradlew.bat | 22 +++++++++++----------
site/_docs/howto.md | 2 +-
10 files changed, 48 insertions(+), 29 deletions(-)
diff --git a/.ratignore b/.ratignore
index 65bd8f2cec..f1f293be29 100644
--- a/.ratignore
+++ b/.ratignore
@@ -50,3 +50,7 @@ site/favicon.ico
# jenv
.jenv-version
+
+# Kotlin compiler session and log files
+**/.kotlin/sessions/kotlin-compiler*.salive
+**/.kotlin/errors/errors*.log
diff --git a/build.gradle.kts b/build.gradle.kts
index 86be76ef0a..4225cfeffd 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -171,7 +171,7 @@ fun reportsForHumans() =
!(System.getenv()["CI"]?.toBoolean() ?: false)
reports {
if (enableJacoco) {
val jacocoAggregateTestReport by
creating(JacocoCoverageReport::class) {
- testType.set(TestSuiteType.UNIT_TEST)
+ testSuiteName = "test"
}
}
}
@@ -262,7 +262,8 @@ override fun execute(context: ComponentMetadataContext) {
}
if (enableJacoco) {
for (p in subprojects) {
- if (p.name != "bom") {
+ val hasTests = p.file("src/test/java").isDirectory ||
p.file("src/test/kotlin").isDirectory
+ if (p.name != "bom" && hasTests) {
jacocoAggregation(p)
}
}
@@ -380,6 +381,7 @@ fun
com.github.autostyle.gradle.BaseFormatExtension.license() {
val testRuntimeOnly by configurations
testImplementation(platform("org.junit:junit-bom"))
testImplementation("org.junit.jupiter:junit-jupiter")
+ testRuntimeOnly("org.junit.platform:junit-platform-launcher")
testImplementation("org.hamcrest:hamcrest")
if (project.props.bool("junit4", default = false)) {
// Allow projects to opt-out of junit dependency, so they can
be JUnit5-only
@@ -496,8 +498,12 @@ fun
com.github.autostyle.gradle.BaseFormatExtension.license() {
// Ensure builds are reproducible
isPreserveFileTimestamps = false
isReproducibleFileOrder = true
- dirMode = "775".toInt(8)
- fileMode = "664".toInt(8)
+ dirPermissions {
+ unix("775")
+ }
+ filePermissions {
+ unix("664")
+ }
}
tasks {
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index fdf111eef7..62a9436fb4 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -42,8 +42,12 @@
// Ensure builds are reproducible
isPreserveFileTimestamps = false
isReproducibleFileOrder = true
- dirMode = "775".toInt(8)
- fileMode = "664".toInt(8)
+ dirPermissions {
+ unix("775")
+ }
+ filePermissions {
+ unix("664")
+ }
}
java {
diff --git
a/cassandra/src/test/java/org/apache/calcite/test/CassandraExtension.java
b/cassandra/src/test/java/org/apache/calcite/test/CassandraExtension.java
index fa66f78edc..8d227f25d9 100644
--- a/cassandra/src/test/java/org/apache/calcite/test/CassandraExtension.java
+++ b/cassandra/src/test/java/org/apache/calcite/test/CassandraExtension.java
@@ -157,7 +157,7 @@ private static CassandraResource
getOrCreate(ExtensionContext context) {
/** Cassandra resource. */
private static class CassandraResource
- implements ExtensionContext.Store.CloseableResource {
+ implements AutoCloseable {
private final CqlSession session;
private CassandraResource() {
diff --git a/gradle.properties b/gradle.properties
index 8b9ad66b3d..f577301b4e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -46,14 +46,14 @@ org.checkerframework.version=0.5.16
com.github.autostyle.version=3.0
com.github.johnrengelman.shadow.version=5.1.0
com.github.spotbugs.version=2.0.0
-com.github.vlsi.vlsi-release-plugins.version=1.90
+com.github.vlsi.vlsi-release-plugins.version=3.0.1
com.google.protobuf.version=0.8.10
de.thetaphi.forbiddenapis.version=3.7
jacoco.version=0.8.12
-kotlin.version=1.9.22
+kotlin.version=2.0.21
net.ltgt.errorprone.version=1.3.0
me.champeau.jmh.version=0.7.2
-org.jetbrains.gradle.plugin.idea-ext.version=0.5
+org.jetbrains.gradle.plugin.idea-ext.version=1.4.1
org.nosphere.apache.rat.version=0.8.1
org.owasp.dependencycheck.version=6.1.6
org.sonarqube.version=3.5.0.2730
@@ -75,7 +75,7 @@ checkstyle.version=8.28
spotbugs.version=3.1.11
errorprone.version=2.5.1
# The property is used in https://github.com/wildfly/jandex regression
testing, so avoid renaming
-jandex.version=2.2.3.Final
+jandex.version=3.5.3
# We support Guava versions as old as 21.0 but prefer more recent versions.
# elasticsearch does not like asm:6.2.1+
@@ -83,8 +83,8 @@ aggdesigner-algorithm.version=6.1
apiguardian-api.version=1.1.2
arrow-gandiva.version=15.0.0
arrow.version=15.0.0
-asm.version=9.6
-byte-buddy.version=1.14.15
+asm.version=9.9.1
+byte-buddy.version=1.18.8
cassandra-all.version=4.1.6
cassandra-java-driver-core.version=4.18.1
cassandra-unit.version=4.3.1.0
@@ -138,7 +138,7 @@ json-smart.version=2.6.0
jsr305.version=3.0.2
jsoup.version=1.11.3
junit4.version=4.13.2
-junit5.version=5.9.1
+junit5.version=5.10.5
kafka-clients.version=2.1.1
kerby.version=1.1.1
log4j2.version=2.17.1
diff --git a/gradle/wrapper/gradle-wrapper.jar
b/gradle/wrapper/gradle-wrapper.jar
index d64cd49177..2c3521197d 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and
b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties
b/gradle/wrapper/gradle-wrapper.properties
index bcc1d6e79e..436598da21 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -16,8 +16,8 @@
#
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionSha256Sum=f1771298a70f6db5a29daf62378c4e18a17fc33c9ba6b14362e0cdf40610380d
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 1aa94a4269..f5feea6d6b 100755
--- a/gradlew
+++ b/gradlew
@@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+# SPDX-License-Identifier: Apache-2.0
+#
##############################################################################
#
@@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
-#
https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#
https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set
(https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
diff --git a/gradlew.bat b/gradlew.bat
index 93e3f59f13..9d21a21834 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your
PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your
PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
goto fail
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
goto fail
diff --git a/site/_docs/howto.md b/site/_docs/howto.md
index 430c530c8f..9035a2c552 100644
--- a/site/_docs/howto.md
+++ b/site/_docs/howto.md
@@ -32,7 +32,7 @@
## Building from a source distribution
Prerequisite is Java (JDK 8, 11, 17, 21 or 23)
-and Gradle (version 8.7) on your path.
+and Gradle (version 8.14.4) on your path.
Unpack the source distribution `.tar.gz` file,
`cd` to the root directory of the unpacked source,
