From 893e413c4e3db065fe778b65ceeec7124c3a7144 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Tue, 28 Jan 2025 13:40:53 -0500 Subject: [PATCH] Update gradle to 8.10.2 to support JDK23 Signed-off-by: Peter Zhu --- .github/workflows/CI.yml | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 10 +++------- gradlew | 4 ---- gradlew.bat | 4 ---- 4 files changed, 6 insertions(+), 18 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index b65aea6e9..f844161d0 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -38,7 +38,7 @@ jobs: Build-k-NN-Linux: strategy: matrix: - java: [21] + java: [21, 23] name: Build and Test k-NN Plugin on Linux runs-on: ubuntu-latest @@ -101,7 +101,7 @@ jobs: Build-k-NN-MacOS: strategy: matrix: - java: [ 21 ] + java: [21, 23] name: Build and Test k-NN Plugin on MacOS needs: Get-CI-Image-Tag @@ -144,7 +144,7 @@ jobs: Build-k-NN-Windows: strategy: matrix: - java: [ 21 ] + java: [21, 23] name: Build and Test k-NN Plugin on Windows needs: Get-CI-Image-Tag diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b42703b94..6acc1431e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,12 +1,8 @@ -# -# Copyright OpenSearch Contributors -# SPDX-License-Identifier: Apache-2.0 -# - distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=f2b9ed0faf8472cbe469255ae6c86eddb77076c75191741b4a462f33128dd419 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip +distributionSha256Sum=2ab88d6de2c23e6adae7363ae6e29cbdd2a709e992929b48b6530fd0c7133bd6 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index a71dbba9b..1aa94a426 100755 --- a/gradlew +++ b/gradlew @@ -1,8 +1,4 @@ #!/bin/sh -# -# Copyright OpenSearch Contributors -# SPDX-License-Identifier: Apache-2.0 -# # # Copyright © 2015-2021 the original authors. diff --git a/gradlew.bat b/gradlew.bat index cd8910282..6689b85be 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,8 +1,4 @@ @rem -@rem Copyright OpenSearch Contributors -@rem SPDX-License-Identifier: Apache-2.0 -@rem -@rem @rem Copyright 2015 the original author or authors. @rem @rem Licensed under the Apache License, Version 2.0 (the "License");