Skip to content

Commit 8e2c948

Browse files
authored
Update Gradle wrapper to 9.0.0 (#132932)
Updating to the latest Gradle GA version to keep our build uptodate * Rework RestCompatTestTransformTask to CC compatibility * Fix build integration tests due to api changes * Updating javaparser
1 parent 3ccb52d commit 8e2c948

File tree

36 files changed

+193
-111
lines changed

36 files changed

+193
-111
lines changed

build-tools-internal/gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=443c9c8ee2ac1ee0e11881a40f2376d79c66386264a44b24a9f8ca67e633375f
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-all.zip
3+
distributionSha256Sum=f759b8dd5204e2e3fa4ca3e73f452f087153cf81bac9561eeb854229cc2c5365
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-all.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/fixtures/AbstractRestResourcesFuncTest.groovy

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,10 @@ abstract class AbstractRestResourcesFuncTest extends AbstractGradleFuncTest {
5353
}
5454
"""
5555

56-
subProject(":distribution:archives:integ-test-zip") << "configurations.create('extracted')\n"
57-
subProject(":distribution:archives:integ-test-zip") << "configurations.create('default')\n"
56+
subProject(":distribution:archives:integ-test-zip") << """
57+
apply plugin: 'base'
58+
configurations.create('extracted')
59+
"""
5860
}
5961

6062
void setupRestResources(List<String> apis, List<String> tests = [], List<String> xpackTests = []) {

build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/InternalDistributionArchiveSetupPluginFuncTest.groovy

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,8 @@ class InternalDistributionArchiveSetupPluginFuncTest extends AbstractGradleFuncT
8080
def "registered distribution provides archives and directory variant"() {
8181
given:
8282
file('someFile.txt') << "some content"
83-
84-
settingsFile << """
85-
include ':consumer'
86-
include ':producer-tar'
87-
"""
83+
subProject("consumer")
84+
subProject("producer-tar")
8885

8986
buildFile << """
9087
import org.gradle.api.artifacts.type.ArtifactTypeDefinition;
@@ -154,9 +151,7 @@ class InternalDistributionArchiveSetupPluginFuncTest extends AbstractGradleFuncT
154151
def "builds extracted distribution via extractedAssemble"() {
155152
given:
156153
file('someFile.txt') << "some content"
157-
settingsFile << """
158-
include ':producer-tar'
159-
"""
154+
subProject("producer-tar")
160155

161156
buildFile << """
162157
import org.gradle.api.artifacts.type.ArtifactTypeDefinition;

build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPluginFuncTest.groovy

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,5 +117,4 @@ class InternalDistributionBwcSetupPluginFuncTest extends AbstractGitAwareGradleF
117117
result.output.contains("nested folder /distribution/bwc/minor/build/bwc/checkout-8.x/" +
118118
"distribution/archives/darwin-tar/build/install/elasticsearch-8.4.0-SNAPSHOT")
119119
}
120-
121120
}

build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/SymbolicLinkPreservingTarFuncTest.groovy

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99

1010
package org.elasticsearch.gradle.internal
1111

12-
import spock.lang.Ignore
12+
13+
import spock.lang.Unroll
1314

1415
import org.apache.commons.compress.archivers.tar.TarArchiveEntry
1516
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream
1617
import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream
1718
import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream
1819
import org.elasticsearch.gradle.fixtures.AbstractGradleFuncTest
1920
import org.gradle.api.GradleException
20-
import spock.lang.Unroll
2121

2222
import java.nio.file.Files
2323
import java.nio.file.Path
@@ -66,8 +66,12 @@ tasks.register("buildBZip2Tar", SymbolicLinkPreservingTar) { SymbolicLinkPreserv
6666
from fileTree("archiveRoot")
6767
6868
into('config') {
69-
dirMode 0750
70-
fileMode 0660
69+
dirPermissions {
70+
unix(0750)
71+
}
72+
filePermissions {
73+
unix(0660)
74+
}
7175
from "real-folder2"
7276
}
7377
}
@@ -118,8 +122,10 @@ tasks.register("buildTar", SymbolicLinkPreservingTar) { SymbolicLinkPreservingTa
118122
preserverTimestamp << [true, false]
119123
}
120124

121-
private boolean assertTar(final File archive, final Function<? super FileInputStream, ? extends InputStream> wrapper, boolean preserveFileTimestamps)
122-
throws IOException {
125+
private boolean assertTar(final File archive,
126+
final Function<? super FileInputStream, ? extends InputStream> wrapper,
127+
boolean preserveFileTimestamps)
128+
throws IOException {
123129
try (TarArchiveInputStream tar = new TarArchiveInputStream(wrapper.apply(new FileInputStream(archive)))) {
124130
TarArchiveEntry entry = tar.getNextTarEntry();
125131
boolean realFolderEntry = false;
@@ -132,7 +138,7 @@ tasks.register("buildTar", SymbolicLinkPreservingTar) { SymbolicLinkPreservingTa
132138
if (entry.getName().equals("real-folder/")) {
133139
assert entry.isDirectory()
134140
realFolderEntry = true
135-
} else if (entry.getName().equals("real-folder/file")) {
141+
} else if (entry.getName().equals("real-folder/file")) {
136142
assert entry.isFile()
137143
fileEntry = true
138144
} else if (entry.getName().equals("real-folder/link-to-file")) {
@@ -145,7 +151,7 @@ tasks.register("buildTar", SymbolicLinkPreservingTar) { SymbolicLinkPreservingTa
145151
} else if (entry.getName().equals("config/sub/")) {
146152
assert entry.isDirectory()
147153
assert entry.getMode() == 16872
148-
}else if (entry.getName().equals("link-in-folder/")) {
154+
} else if (entry.getName().equals("link-in-folder/")) {
149155
assert entry.isDirectory()
150156
linkInFolderEntry = true
151157
} else if (entry.getName().equals("link-in-folder/link-to-file")) {

build-tools-internal/src/integTest/resources/org/elasticsearch/gradle/internal/fake_git/remote/distribution/bwc/bugfix3/build.gradle

Whitespace-only changes.

build-tools-internal/src/integTest/resources/org/elasticsearch/gradle/internal/fake_git/remote/distribution/bwc/bugfix4/build.gradle

Whitespace-only changes.

build-tools-internal/src/integTest/resources/org/elasticsearch/gradle/internal/fake_git/remote/distribution/bwc/bugfix5/build.gradle

Whitespace-only changes.

build-tools-internal/src/integTest/resources/org/elasticsearch/gradle/internal/fake_git/remote/distribution/bwc/staged2/build.gradle

Whitespace-only changes.

build-tools-internal/src/main/groovy/org/elasticsearch/gradle/internal/AntTask.groovy

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@
99

1010
package org.elasticsearch.gradle.internal
1111

12+
import groovy.ant.AntBuilder
13+
1214
import org.apache.tools.ant.BuildListener
1315
import org.apache.tools.ant.BuildLogger
1416
import org.apache.tools.ant.DefaultLogger
1517
import org.apache.tools.ant.Project
1618
import org.gradle.api.DefaultTask
17-
import org.gradle.api.GradleException
1819
import org.gradle.api.file.FileSystemOperations
19-
import org.gradle.api.tasks.Input
2020
import org.gradle.api.tasks.TaskAction
2121

22-
import javax.inject.Inject
2322
import java.nio.charset.Charset
23+
import javax.inject.Inject
2424

2525
/**
2626
* A task which will run ant commands.
@@ -83,7 +83,8 @@ public abstract class AntTask extends DefaultTask {
8383
return new DefaultLogger(
8484
errorPrintStream: stream,
8585
outputPrintStream: stream,
86-
messageOutputLevel: outputLevel)
86+
messageOutputLevel: outputLevel
87+
)
8788
}
8889

8990
/**

0 commit comments

Comments
 (0)