From b7817b925d713a3262bed083ff9b98f0b3864477 Mon Sep 17 00:00:00 2001 From: Dmytro Vyazelenko <696855+vyazelenko@users.noreply.github.com> Date: Tue, 14 Jan 2025 17:34:02 +0100 Subject: [PATCH] Revert "[Java] Upgrade to Gradle 8.12." This reverts commit 075579d8166197c773a1d7b78ab822acd8713728. --- build.gradle | 6 +++--- gradle/libs.versions.toml | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 439e158cc..c96c6a86c 100644 --- a/build.gradle +++ b/build.gradle @@ -359,7 +359,7 @@ project(':agrona') { repositories { maven { name = 'MavenCentral' - url = !isReleaseVersion ? ossrhSnapshotsRepoUrl : ossrhReleasesRepoUrl + url(!isReleaseVersion ? ossrhSnapshotsRepoUrl : ossrhReleasesRepoUrl) credentials { username = ossrhUsername password = ossrhPassword @@ -445,7 +445,7 @@ project(':agrona-agent') { repositories { maven { name = 'MavenCentral' - url = !isReleaseVersion ? ossrhSnapshotsRepoUrl : ossrhReleasesRepoUrl + url(!isReleaseVersion ? ossrhSnapshotsRepoUrl : ossrhReleasesRepoUrl) credentials { username = ossrhUsername password = ossrhPassword @@ -517,7 +517,7 @@ project(':agrona-concurrency-tests') { tasks.register('parseResultsFile', JavaExec) { dependsOn shadowJar - group = 'verification' + group 'verification' classpath = files(tasks.shadowJar) workingDir = layout.buildDirectory.get() args = ['-p', jcstressResults, '-r', 'reports/jcstress'] diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 98efaa7c4..74fef2442 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ byteBuddy = "1.15.11" checkstyle = "10.21.1" junit5 = "5.11.4" jmh = "1.37" -gradle = "8.12" +gradle = "8.11.1" [libraries] junit4 = { group = "junit", name = "junit", version = "4.13.2" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e0fd02028..c1d5e0185 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f3b75f3b0..f5feea6d6 100755 --- a/gradlew +++ b/gradlew @@ -86,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 -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || 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