Skip to content

Commit cdf6ea3

Browse files
authored
IGNITE-28482 Revert "IGNITE-28433 Bump gradle-wrapper from 8.6 to 8.14.4" (#7942)
1 parent a0ec2ec commit cdf6ea3

7 files changed

Lines changed: 107 additions & 141 deletions

File tree

buildscripts/java-integration-test.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ apply plugin: 'jvm-test-suite'
2020
testing {
2121
suites {
2222
integrationTest(JvmTestSuite) {
23+
testType = TestSuiteType.INTEGRATION_TEST
2324
useJUnitJupiter()
2425

2526
dependencies {

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ shadow = "com.gradleup.shadow:8.3.10"
114114
cmake = "dev.welbyseely.gradle-cmake-plugin:0.0.5"
115115
# NOTE: do not update nebula to 12.x.x+, because newer versions are not compatible with Java 11.
116116
nebula = "com.netflix.nebula.ospackage:11.11.2"
117-
docker = "com.palantir.docker:0.37.0"
117+
docker = "com.palantir.docker:0.36.0"
118118
dockerRemoteApi = "com.bmuschko.docker-remote-api:10.0.0"
119119
checksum = "org.gradle.crypto.checksum:1.4.0"
120120
setupbuilder = "de.inetsoftware.setupbuilder:8.4.21"

gradle/wrapper/gradle-wrapper.jar

15.7 KB
Binary file not shown.
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
4-
networkTimeout=10000
5-
validateDistributionUrl=true
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
64
zipStoreBase=GRADLE_USER_HOME
75
zipStorePath=wrapper/dists

gradlew

Lines changed: 15 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 89 additions & 94 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

settings.gradle

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,6 @@ pluginManagement {
2020
maven {
2121
url "https://plugins.gradle.org/m2/"
2222
}
23-
mavenCentral()
24-
}
25-
resolutionStrategy {
26-
eachPlugin {
27-
// com.palantir.docker 0.37.0 is only available on Maven Central, not the Gradle Plugin Portal,
28-
// so the plugin marker artifact is missing and Gradle cannot resolve it automatically.
29-
// This mapping redirects the plugin ID to the actual Maven artifact.
30-
if (requested.id.id == 'com.palantir.docker' || requested.id.id == 'com.palantir.docker-compose') {
31-
useModule("com.palantir.gradle.docker:gradle-docker:${requested.version}")
32-
}
33-
}
3423
}
3524
}
3625

0 commit comments

Comments
 (0)