Skip to content

Commit f5a6e6d

Browse files
authored
Update to Gradle 8.3 (opensearch-project#8896)
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
1 parent c42ada8 commit f5a6e6d

File tree

6 files changed

+7
-6
lines changed

6 files changed

+7
-6
lines changed

buildSrc/src/main/java/org/opensearch/gradle/test/RestIntegTestTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
* conventional configured tasks of {@link RestIntegTestTask}
4545
*/
4646
@CacheableTask
47-
public class RestIntegTestTask extends StandaloneRestIntegTestTask implements TestSuiteConventionMappings {
47+
public abstract class RestIntegTestTask extends StandaloneRestIntegTestTask implements TestSuiteConventionMappings {
4848
@SuppressWarnings("rawtypes")
4949
@Override
5050
public Task configure(Closure closure) {

buildSrc/src/main/java/org/opensearch/gradle/test/TestTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import org.gradle.api.tasks.testing.Test;
1616

1717
@CacheableTask
18-
public class TestTask extends Test implements TestSuiteConventionMappings {
18+
public abstract class TestTask extends Test implements TestSuiteConventionMappings {
1919
@SuppressWarnings("rawtypes")
2020
@Override
2121
public Task configure(Closure closure) {

buildSrc/src/main/java/org/opensearch/gradle/testclusters/StandaloneRestIntegTestTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
* {@link Nested} inputs.
6363
*/
6464
@CacheableTask
65-
public class StandaloneRestIntegTestTask extends Test implements TestClustersAware, FileSystemOperationsAware {
65+
public abstract class StandaloneRestIntegTestTask extends Test implements TestClustersAware, FileSystemOperationsAware {
6666

6767
private Collection<OpenSearchCluster> clusters = new HashSet<>();
6868
private Closure<Void> beforeStart;

gradle/wrapper/gradle-wrapper.jar

346 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
distributionBase=GRADLE_USER_HOME
1313
distributionPath=wrapper/dists
14-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
14+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
1515
zipStoreBase=GRADLE_USER_HOME
1616
zipStorePath=wrapper/dists
17-
distributionSha256Sum=7c3ad722e9b0ce8205b91560fd6ce8296ac3eadf065672242fd73c06b8eeb6ee
17+
distributionSha256Sum=bb09982fdf52718e4c7b25023d10df6d35a5fff969860bdf5a5bd27a3ab27a9e

gradlew

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ done
8383
# This is normally unused
8484
# shellcheck disable=SC2034
8585
APP_BASE_NAME=${0##*/}
86-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
86+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87+
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
8788

8889
# Use the maximum available, or set MAX_FD != -1 to use that value.
8990
MAX_FD=maximum

0 commit comments

Comments
 (0)