Skip to content

Commit b5c6d92

Browse files
breskebybreskeby
committed
Revert "[Build] Update Gradle wrapper to 8.11.1 (#115886)"
This reverts commit 8f943a6. breaks serverless build. needs further investigation
1 parent 5d4072d commit b5c6d92

File tree

12 files changed

+30
-125
lines changed

12 files changed

+30
-125
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=89d4e70e4e84e2d2dfbb63e4daa53e21b25017cc70c37e4eea31ee51fb15098a
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
3+
distributionSha256Sum=2ab88d6de2c23e6adae7363ae6e29cbdd2a709e992929b48b6530fd0c7133bd6
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchJavadocPlugin.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import org.gradle.api.artifacts.Configuration;
1919
import org.gradle.api.artifacts.Dependency;
2020
import org.gradle.api.artifacts.ProjectDependency;
21-
import org.gradle.api.internal.artifacts.dependencies.ProjectDependencyInternal;
2221
import org.gradle.api.plugins.BasePluginExtension;
2322
import org.gradle.api.plugins.JavaPlugin;
2423
import org.gradle.api.tasks.javadoc.Javadoc;
@@ -83,15 +82,12 @@ private void configureJavadocForConfiguration(Project project, boolean shadow, C
8382
.sorted(Comparator.comparing(Dependency::getGroup))
8483
.filter(d -> d instanceof ProjectDependency)
8584
.map(d -> (ProjectDependency) d)
85+
.filter(p -> p.getDependencyProject() != null)
8686
.forEach(projectDependency -> configureDependency(project, shadow, projectDependency));
8787
}
8888

8989
private void configureDependency(Project project, boolean shadowed, ProjectDependency dep) {
90-
// we should use variant aware dependency management to resolve artifacts required for javadoc here
91-
Project upstreamProject = project.project(((ProjectDependencyInternal) dep).getIdentityPath().getPath());
92-
if (upstreamProject == null) {
93-
return;
94-
}
90+
var upstreamProject = dep.getDependencyProject();
9591
if (shadowed) {
9692
/*
9793
* Include the source of shadowed upstream projects so we don't

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/TestWithDependenciesPlugin.java‎

Lines changed: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,11 @@
1010
package org.elasticsearch.gradle.internal.test;
1111

1212
import org.apache.commons.lang.StringUtils;
13+
import org.elasticsearch.gradle.plugin.PluginBuildPlugin;
1314
import org.gradle.api.Plugin;
1415
import org.gradle.api.Project;
1516
import org.gradle.api.artifacts.Configuration;
16-
import org.gradle.api.artifacts.Dependency;
1717
import org.gradle.api.artifacts.ProjectDependency;
18-
import org.gradle.api.artifacts.dsl.DependencyHandler;
19-
import org.gradle.api.attributes.Attribute;
20-
import org.gradle.api.attributes.LibraryElements;
21-
import org.gradle.api.internal.artifacts.dependencies.ProjectDependencyInternal;
2218
import org.gradle.api.plugins.ExtraPropertiesExtension;
2319
import org.gradle.api.tasks.Copy;
2420
import org.gradle.api.tasks.SourceSetContainer;
@@ -49,34 +45,23 @@ public void apply(final Project project) {
4945

5046
Configuration testImplementationConfig = project.getConfigurations().getByName("testImplementation");
5147
testImplementationConfig.getDependencies().all(dep -> {
52-
if (dep instanceof ProjectDependency && dep.getGroup().contains("plugin")) {
53-
addPluginResources(project, ((ProjectDependency) dep));
48+
if (dep instanceof ProjectDependency
49+
&& ((ProjectDependency) dep).getDependencyProject().getPlugins().hasPlugin(PluginBuildPlugin.class)) {
50+
project.getGradle()
51+
.projectsEvaluated(gradle -> addPluginResources(project, ((ProjectDependency) dep).getDependencyProject()));
5452
}
5553
});
5654
}
5755

58-
private static void addPluginResources(final Project project, final ProjectDependency projectDependency) {
59-
final File outputDir = new File(project.getBuildDir(), "/generated-test-resources/" + projectDependency.getName());
60-
String camelProjectName = stream(projectDependency.getName().split("-")).map(t -> StringUtils.capitalize(t))
56+
private static void addPluginResources(final Project project, final Project pluginProject) {
57+
final File outputDir = new File(project.getBuildDir(), "/generated-test-resources/" + pluginProject.getName());
58+
String camelProjectName = stream(pluginProject.getName().split("-")).map(t -> StringUtils.capitalize(t))
6159
.collect(Collectors.joining());
6260
String taskName = "copy" + camelProjectName + "Metadata";
63-
String metadataConfiguration = "resolved" + camelProjectName + "Metadata";
64-
Configuration pluginMetadata = project.getConfigurations().maybeCreate(metadataConfiguration);
65-
pluginMetadata.getAttributes().attribute(Attribute.of("pluginMetadata", Boolean.class), true);
66-
pluginMetadata.getAttributes()
67-
.attribute(
68-
LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE,
69-
project.getObjects().named(LibraryElements.class, LibraryElements.RESOURCES)
70-
);
71-
DependencyHandler dependencyHandler = project.getDependencies();
72-
ProjectDependencyInternal pluginProject = (ProjectDependencyInternal) projectDependency;
73-
74-
String path = pluginProject.getIdentityPath().getPath();
75-
Dependency pluginMetadataDependency = dependencyHandler.project(Map.of("path", path));
76-
dependencyHandler.add(metadataConfiguration, pluginMetadataDependency);
7761
project.getTasks().register(taskName, Copy.class, copy -> {
7862
copy.into(outputDir);
79-
copy.from(pluginMetadata);
63+
copy.from(pluginProject.getTasks().named("pluginProperties"));
64+
copy.from(pluginProject.file("src/main/plugin-metadata"));
8065
});
8166

8267
Map<String, Object> map = Map.of("builtBy", taskName);

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/RestTestBasePlugin.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import org.gradle.api.file.ConfigurableFileCollection;
4444
import org.gradle.api.file.FileCollection;
4545
import org.gradle.api.file.FileTree;
46-
import org.gradle.api.internal.artifacts.dependencies.ProjectDependencyInternal;
4746
import org.gradle.api.provider.ProviderFactory;
4847
import org.gradle.api.tasks.ClasspathNormalizer;
4948
import org.gradle.api.tasks.PathSensitivity;
@@ -252,7 +251,7 @@ private void copyDependencies(Project project, DependencySet dependencies, Confi
252251
configuration.getDependencies()
253252
.stream()
254253
.filter(d -> d instanceof ProjectDependency)
255-
.map(d -> project.getDependencies().project(Map.of("path", ((ProjectDependencyInternal) d).getIdentityPath().getPath())))
254+
.map(d -> project.getDependencies().project(Map.of("path", ((ProjectDependency) d).getDependencyProject().getPath())))
256255
.forEach(dependencies::add);
257256
}
258257

@@ -329,11 +328,8 @@ private Configuration createPluginConfiguration(Project project, String name, bo
329328
Collection<Dependency> additionalDependencies = new LinkedHashSet<>();
330329
for (Iterator<Dependency> iterator = dependencies.iterator(); iterator.hasNext();) {
331330
Dependency dependency = iterator.next();
332-
// this logic of relying on other projects metadata should probably live in a build service
333331
if (dependency instanceof ProjectDependency projectDependency) {
334-
Project dependencyProject = project.project(
335-
((ProjectDependencyInternal) projectDependency).getIdentityPath().getPath()
336-
);
332+
Project dependencyProject = projectDependency.getDependencyProject();
337333
List<String> extendedPlugins = dependencyProject.getExtensions()
338334
.getByType(PluginPropertiesExtension.class)
339335
.getExtendedPlugins();

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/toolchain/AbstractCustomJavaToolchainResolver.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ static String toArchString(Architecture architecture) {
3434
case X86_64 -> "x64";
3535
case AARCH64 -> "aarch64";
3636
case X86 -> "x86";
37-
default -> throw new UnsupportedOperationException("Architecture " + architecture);
3837
};
3938
}
4039

‎build-tools-internal/src/main/resources/minimumGradleVersion‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.11.1
1+
8.10.2

‎build-tools/src/main/java/org/elasticsearch/gradle/LazyFileOutputStream.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,6 @@ public void write(byte b[], int off, int len) throws IOException {
3939
bootstrap();
4040
delegate.write(b, off, len);
4141
}
42-
43-
@Override
44-
public void write(byte b[]) throws IOException {
45-
bootstrap();
46-
delegate.write(b);
47-
}
4842
};
4943
}
5044

‎build-tools/src/main/java/org/elasticsearch/gradle/plugin/BasePluginBuildPlugin.java‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
import org.gradle.api.Task;
2525
import org.gradle.api.Transformer;
2626
import org.gradle.api.artifacts.type.ArtifactTypeDefinition;
27-
import org.gradle.api.attributes.Attribute;
28-
import org.gradle.api.attributes.LibraryElements;
2927
import org.gradle.api.file.CopySpec;
3028
import org.gradle.api.file.FileCollection;
3129
import org.gradle.api.file.RegularFile;
@@ -128,27 +126,9 @@ private TaskProvider<Zip> createBundleTasks(final Project project, PluginPropert
128126
// know about the plugin (used by test security code to statically initialize the plugin in unit tests)
129127
var testSourceSet = project.getExtensions().getByType(SourceSetContainer.class).getByName("test");
130128
Map<String, Object> map = Map.of("builtBy", buildProperties);
131-
132-
File generatedResources = new File(project.getBuildDir(), "generated-resources");
133-
testSourceSet.getOutput().dir(map, generatedResources);
129+
testSourceSet.getOutput().dir(map, new File(project.getBuildDir(), "generated-resources"));
134130
testSourceSet.getResources().srcDir(pluginMetadata);
135131

136-
// expose the plugin properties and metadata for other plugins to use in their tests.
137-
// See TestWithDependenciesPlugin for how this is used.
138-
project.getConfigurations().create("pluginMetadata", conf -> {
139-
conf.getAttributes().attribute(Attribute.of("pluginMetadata", Boolean.class), true);
140-
conf.getAttributes()
141-
.attribute(
142-
LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE,
143-
project.getObjects().named(LibraryElements.class, LibraryElements.RESOURCES)
144-
);
145-
});
146-
147-
project.getArtifacts().add("pluginMetadata", new File(project.getBuildDir(), "generated-descriptor"), artifact -> {
148-
artifact.builtBy(buildProperties);
149-
});
150-
project.getArtifacts().add("pluginMetadata", pluginMetadata);
151-
// getAttributes().attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, "plugin-metadata");
152132
var bundleSpec = createBundleSpec(project, pluginMetadata, buildProperties);
153133
extension.setBundleSpec(bundleSpec);
154134
// create the actual bundle task, which zips up all the files for the plugin

‎distribution/packages/build.gradle‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ import java.util.regex.Pattern
4343
*/
4444

4545
plugins {
46-
id "com.netflix.nebula.ospackage-base" version "11.10.0"
46+
id "com.netflix.nebula.ospackage-base" version "11.9.1"
4747
}
4848

4949
['deb', 'rpm'].each { type ->
@@ -195,7 +195,7 @@ def commonPackageConfig(String type, String architecture) {
195195
configurationFile '/etc/elasticsearch/users_roles'
196196
from("${packagingFiles}") {
197197
dirPermissions {
198-
unix(0750)
198+
unix(02750)
199199
}
200200
into('/etc')
201201
permissionGroup 'elasticsearch'
@@ -208,7 +208,7 @@ def commonPackageConfig(String type, String architecture) {
208208
from("${packagingFiles}/etc/elasticsearch") {
209209
into('/etc/elasticsearch')
210210
dirPermissions {
211-
unix(0750)
211+
unix(02750)
212212
}
213213
setgid = true
214214
filePermissions {
@@ -260,7 +260,7 @@ def commonPackageConfig(String type, String architecture) {
260260

261261
// ========= empty dirs =========
262262
// NOTE: these are created under packagingFiles as empty, but the permissions are set here
263-
Closure copyEmptyDir = { path, u, g, gid, mode ->
263+
Closure copyEmptyDir = { path, u, g, mode ->
264264
File file = new File(path)
265265
into(file.parent) {
266266
from "${packagingFiles}/${file.parent}"
@@ -272,12 +272,12 @@ def commonPackageConfig(String type, String architecture) {
272272
dirPermissions {
273273
unix(mode)
274274
}
275-
setgid(gid)
275+
setgid (mode == 02750)
276276
}
277277
}
278-
copyEmptyDir('/var/log/elasticsearch', 'elasticsearch', 'elasticsearch', true, 0750)
279-
copyEmptyDir('/var/lib/elasticsearch', 'elasticsearch', 'elasticsearch', true, 0750)
280-
copyEmptyDir('/usr/share/elasticsearch/plugins', 'root', 'root', false, 0755)
278+
copyEmptyDir('/var/log/elasticsearch', 'elasticsearch', 'elasticsearch', 02750)
279+
copyEmptyDir('/var/lib/elasticsearch', 'elasticsearch', 'elasticsearch', 02750)
280+
copyEmptyDir('/usr/share/elasticsearch/plugins', 'root', 'root', 0755)
281281

282282
// the oss package conflicts with the default distribution and vice versa
283283
conflicts('elasticsearch-oss')

‎gradle/verification-metadata.xml‎

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -944,11 +944,6 @@
944944
<sha256 value="d694edd7bae3bc1a8e0dae2f5a22c479ff04d6b9bfcb0ab751a42f02e02d2100" origin="Generated by Gradle"/>
945945
</artifact>
946946
</component>
947-
<component group="com.netflix.nebula" name="gradle-ospackage-plugin" version="11.10.0">
948-
<artifact name="gradle-ospackage-plugin-11.10.0.jar">
949-
<sha256 value="93c264b05864f8db979a169a99e4bfaad84caa30b829743f67210382dff89619" origin="Generated by Gradle"/>
950-
</artifact>
951-
</component>
952947
<component group="com.netflix.nebula" name="gradle-ospackage-plugin" version="11.9.1">
953948
<artifact name="gradle-ospackage-plugin-11.9.1.jar">
954949
<sha256 value="63b2c387cb83481bb8d7e33e0be02e9000c0ec30843ca7730641392f3f5f28ad" origin="Generated by Gradle"/>
@@ -3050,11 +3045,6 @@
30503045
<sha256 value="29b2628d0f028119715916849c19eed45b32cdc67eb13551798c73afa4aa23d6" origin="Generated by Gradle"/>
30513046
</artifact>
30523047
</component>
3053-
<component group="org.apache.maven" name="maven-archiver" version="3.5.1">
3054-
<artifact name="maven-archiver-3.5.1.jar">
3055-
<sha256 value="d0674469f8e6fbc866dbc5c955463d7629b7755ac7c87a235b9469d8257d6b8c" origin="Generated by Gradle"/>
3056-
</artifact>
3057-
</component>
30583048
<component group="org.apache.maven" name="maven-artifact" version="3.6.1">
30593049
<artifact name="maven-artifact-3.6.1.jar">
30603050
<sha256 value="797fa1bcf54d7216e863b8177c04507d09c708eec153626eca473054c0eb56f3" origin="Generated by Gradle"/>
@@ -3070,11 +3060,6 @@
30703060
<sha256 value="c29763149b09b294c981d12d70f96ea4edb60d462238bb5dcbaae224e6acfdaa" origin="Generated by Gradle"/>
30713061
</artifact>
30723062
</component>
3073-
<component group="org.apache.maven" name="maven-model" version="3.1.1">
3074-
<artifact name="maven-model-3.1.1.jar">
3075-
<sha256 value="e71bad235af182c43dfcaa9b649032352cf859f9d09f79e1f537268384176de1" origin="Generated by Gradle"/>
3076-
</artifact>
3077-
</component>
30783063
<component group="org.apache.maven" name="maven-model" version="3.6.1">
30793064
<artifact name="maven-model-3.6.1.jar">
30803065
<sha256 value="ab10ced4a0f692cae285effacc70d458806ede856b9a2b3b318de1eb2f2f3b05" origin="Generated by Gradle"/>
@@ -3145,11 +3130,6 @@
31453130
<sha256 value="3ba9c619893c767db0f9c3e826d5118b57c35229301bcd16d865a89cec16a7e5" origin="Generated by Gradle"/>
31463131
</artifact>
31473132
</component>
3148-
<component group="org.apache.maven.shared" name="maven-shared-utils" version="3.3.3">
3149-
<artifact name="maven-shared-utils-3.3.3.jar">
3150-
<sha256 value="44a60c610f4e31524b03d81a698b1ecceba116320ea510babf859575b2ea7233" origin="Generated by Gradle"/>
3151-
</artifact>
3152-
</component>
31533133
<component group="org.apache.mina" name="mina-core" version="2.0.17">
31543134
<artifact name="mina-core-2.0.17.jar">
31553135
<sha256 value="08316826fa2b9357b061e52fa8f19ccae75420c949ebe29e28759d2bddd9b39b" origin="Generated by Gradle"/>
@@ -3458,11 +3438,6 @@
34583438
<sha256 value="92654f493ecfec52082e76354f0ebf87648dc3d5cec2e3c3cdb947c016747a53" origin="Generated by Gradle"/>
34593439
</artifact>
34603440
</component>
3461-
<component group="org.codehaus.plexus" name="plexus-archiver" version="4.2.3">
3462-
<artifact name="plexus-archiver-4.2.3.jar">
3463-
<sha256 value="fff8157bfb3d6f1f099c7da7de3e14bfd061ad4ab29599afa7bbf0271368d748" origin="Generated by Gradle"/>
3464-
</artifact>
3465-
</component>
34663441
<component group="org.codehaus.plexus" name="plexus-classworlds" version="2.6.0">
34673442
<artifact name="plexus-classworlds-2.6.0.jar">
34683443
<sha256 value="52f77c5ec49f787c9c417ebed5d6efd9922f44a202f217376e4f94c0d74f3549" origin="Generated by Gradle"/>
@@ -3478,16 +3453,6 @@
34783453
<sha256 value="e003802501574637f7abdc4e83e6d509a31e9ff825d12da6d1e419acf9688705" origin="Generated by Gradle"/>
34793454
</artifact>
34803455
</component>
3481-
<component group="org.codehaus.plexus" name="plexus-interpolation" version="1.26">
3482-
<artifact name="plexus-interpolation-1.26.jar">
3483-
<sha256 value="b3b5412ce17889103ea564bcdfcf9fb3dfa540344ffeac6b538a73c9d7182662" origin="Generated by Gradle"/>
3484-
</artifact>
3485-
</component>
3486-
<component group="org.codehaus.plexus" name="plexus-io" version="3.2.0">
3487-
<artifact name="plexus-io-3.2.0.jar">
3488-
<sha256 value="15cf8cbd9e014b7156482bbb48e515613158bdd9b4b908d21e6b900f7876f6ff" origin="Generated by Gradle"/>
3489-
</artifact>
3490-
</component>
34913456
<component group="org.codehaus.plexus" name="plexus-utils" version="3.2.0">
34923457
<artifact name="plexus-utils-3.2.0.jar">
34933458
<sha256 value="0b91029df4c216b8824bd95361f52e260e86ccf93a2619fd88c8f15d23dcb30d" origin="Generated by Gradle"/>
@@ -3903,11 +3868,6 @@
39033868
<sha256 value="631656eb38639b0ae41161f706ff7fbe04313b5b8f42892da5ec656390031fc6" origin="Generated by Gradle"/>
39043869
</artifact>
39053870
</component>
3906-
<component group="org.iq80.snappy" name="snappy" version="0.4">
3907-
<artifact name="snappy-0.4.jar">
3908-
<sha256 value="46a0c87d504ce9d6063e1ff6e4d20738feb49d8abf85b5071a7d18df4f11bac9" origin="Generated by Gradle"/>
3909-
</artifact>
3910-
</component>
39113871
<component group="org.javassist" name="javassist" version="3.18.1-GA">
39123872
<artifact name="javassist-3.18.1-GA.jar">
39133873
<sha256 value="3fb71231afd098bb0f93f5eb97aa8291c8d0556379125e596f92ec8f944c6162" origin="Generated by Gradle"/>
@@ -4663,11 +4623,6 @@
46634623
<sha256 value="211b306cfc44f8f96df3a0a3ddaf75ba8c5289eed77d60d72f889bb855f535e5" origin="Generated by Gradle"/>
46644624
</artifact>
46654625
</component>
4666-
<component group="org.vafer" name="jdeb" version="1.10">
4667-
<artifact name="jdeb-1.10.jar">
4668-
<sha256 value="254cbb052f718f36ee2a75ae95bd2e0251b0513fc76d038b6dbbcf0942fcc11f" origin="Generated by Gradle"/>
4669-
</artifact>
4670-
</component>
46714626
<component group="org.vafer" name="jdeb" version="1.8">
46724627
<artifact name="jdeb-1.8.jar">
46734628
<sha256 value="374fe02a09314da6ec8219e005598e760323a1abe4b715cc33ce3e2a9bcda932" origin="Generated by Gradle"/>

0 commit comments

Comments
 (0)