Skip to content

Commit 7d2816f

Browse files
breskebybreskeby
committed
Replace deprecated api in artifact transforms (elastic#84015)
`ArtifactAttributes.ARTIFACT_FORMAT` has been deprecated in favor of public available `ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE`
1 parent 0ddd4be commit 7d2816f

File tree

10 files changed

+30
-34
lines changed

10 files changed

+30
-34
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import java.io.File;
2424

2525
import static org.elasticsearch.gradle.internal.conventions.GUtils.capitalize;
26-
import static org.gradle.api.internal.artifacts.ArtifactAttributes.ARTIFACT_FORMAT;
2726

2827
/**
2928
* Provides a DSL and common configurations to define different types of
@@ -75,12 +74,14 @@ private void registerAndConfigureDistributionArchivesExtension(Project project)
7574
sub.getArtifacts().add(DEFAULT_CONFIGURATION_NAME, distributionArchive.getArchiveTask());
7675
var extractedConfiguration = sub.getConfigurations().create(EXTRACTED_CONFIGURATION_NAME);
7776
extractedConfiguration.setCanBeResolved(false);
78-
extractedConfiguration.getAttributes().attribute(ARTIFACT_FORMAT, ArtifactTypeDefinition.DIRECTORY_TYPE);
77+
extractedConfiguration.getAttributes()
78+
.attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.DIRECTORY_TYPE);
7979
sub.getArtifacts().add(EXTRACTED_CONFIGURATION_NAME, distributionArchive.getExpandedDistTask());
8080
// The "composite" configuration is specifically used for resolving transformed artifacts in an included build
8181
var compositeConfiguration = sub.getConfigurations().create(COMPOSITE_CONFIGURATION_NAME);
8282
compositeConfiguration.setCanBeResolved(false);
83-
compositeConfiguration.getAttributes().attribute(ARTIFACT_FORMAT, ArtifactTypeDefinition.DIRECTORY_TYPE);
83+
compositeConfiguration.getAttributes()
84+
.attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.DIRECTORY_TYPE);
8485
compositeConfiguration.getAttributes().attribute(Attribute.of("composite", Boolean.class), true);
8586
sub.getArtifacts().add(COMPOSITE_CONFIGURATION_NAME, distributionArchive.getArchiveTask());
8687
sub.getTasks().register("extractedAssemble", task ->

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import org.gradle.api.artifacts.repositories.IvyArtifactRepository;
2020
import org.gradle.api.artifacts.type.ArtifactTypeDefinition;
2121
import org.gradle.api.attributes.Attribute;
22-
import org.gradle.api.internal.artifacts.ArtifactAttributes;
2322

2423
import java.util.Arrays;
2524

@@ -40,21 +39,21 @@ public void apply(Project project) {
4039
project.getDependencies().getArtifactTypes().maybeCreate(ArtifactTypeDefinition.ZIP_TYPE);
4140
project.getDependencies().registerTransform(UnzipTransform.class, transformSpec -> {
4241
transformSpec.getFrom()
43-
.attribute(ArtifactAttributes.ARTIFACT_FORMAT, ArtifactTypeDefinition.ZIP_TYPE)
42+
.attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.ZIP_TYPE)
4443
.attribute(jdkAttribute, true);
4544
transformSpec.getTo()
46-
.attribute(ArtifactAttributes.ARTIFACT_FORMAT, ArtifactTypeDefinition.DIRECTORY_TYPE)
45+
.attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.DIRECTORY_TYPE)
4746
.attribute(jdkAttribute, true);
4847
transformSpec.parameters(parameters -> parameters.setTrimmedPrefixPattern(JDK_TRIMMED_PREFIX));
4948
});
5049

5150
ArtifactTypeDefinition tarArtifactTypeDefinition = project.getDependencies().getArtifactTypes().maybeCreate("tar.gz");
5251
project.getDependencies().registerTransform(SymbolicLinkPreservingUntarTransform.class, transformSpec -> {
5352
transformSpec.getFrom()
54-
.attribute(ArtifactAttributes.ARTIFACT_FORMAT, tarArtifactTypeDefinition.getName())
53+
.attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, tarArtifactTypeDefinition.getName())
5554
.attribute(jdkAttribute, true);
5655
transformSpec.getTo()
57-
.attribute(ArtifactAttributes.ARTIFACT_FORMAT, ArtifactTypeDefinition.DIRECTORY_TYPE)
56+
.attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.DIRECTORY_TYPE)
5857
.attribute(jdkAttribute, true);
5958
transformSpec.parameters(parameters -> {
6059
parameters.setTrimmedPrefixPattern(JDK_TRIMMED_PREFIX);
@@ -65,7 +64,7 @@ public void apply(Project project) {
6564
NamedDomainObjectContainer<Jdk> jdksContainer = project.container(Jdk.class, name -> {
6665
Configuration configuration = project.getConfigurations().create("jdk_" + name);
6766
configuration.setCanBeConsumed(false);
68-
configuration.getAttributes().attribute(ArtifactAttributes.ARTIFACT_FORMAT, ArtifactTypeDefinition.DIRECTORY_TYPE);
67+
configuration.getAttributes().attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.DIRECTORY_TYPE);
6968
configuration.getAttributes().attribute(jdkAttribute, true);
7069
Jdk jdk = new Jdk(name, configuration, project.getObjects());
7170
configuration.defaultDependencies(dependencies -> {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import org.gradle.api.artifacts.Configuration;
3636
import org.gradle.api.artifacts.dsl.DependencyHandler;
3737
import org.gradle.api.artifacts.type.ArtifactTypeDefinition;
38-
import org.gradle.api.internal.artifacts.ArtifactAttributes;
3938
import org.gradle.api.plugins.JavaBasePlugin;
4039
import org.gradle.api.provider.Provider;
4140
import org.gradle.api.specs.Specs;
@@ -313,7 +312,7 @@ private static Object convertPath(
313312

314313
private static Configuration configureExamplePlugin(Project project) {
315314
Configuration examplePlugin = project.getConfigurations().create(EXAMPLE_PLUGIN_CONFIGURATION);
316-
examplePlugin.getAttributes().attribute(ArtifactAttributes.ARTIFACT_FORMAT, ArtifactTypeDefinition.ZIP_TYPE);
315+
examplePlugin.getAttributes().attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.ZIP_TYPE);
317316
DependencyHandler deps = project.getDependencies();
318317
deps.add(EXAMPLE_PLUGIN_CONFIGURATION, deps.project(Map.of("path", ":plugins:analysis-icu", "configuration", "zip")));
319318
return examplePlugin;

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import org.gradle.api.artifacts.dsl.DependencyHandler;
1919
import org.gradle.api.artifacts.repositories.IvyArtifactRepository;
2020
import org.gradle.api.artifacts.type.ArtifactTypeDefinition;
21-
import org.gradle.api.internal.artifacts.ArtifactAttributes;
2221
import org.gradle.api.model.ObjectFactory;
2322
import org.gradle.api.provider.Property;
2423
import org.gradle.api.provider.Provider;
@@ -61,14 +60,14 @@ public void setDockerAvailability(Provider<Boolean> dockerAvailability) {
6160
@Override
6261
public void apply(Project project) {
6362
project.getDependencies().registerTransform(UnzipTransform.class, transformSpec -> {
64-
transformSpec.getFrom().attribute(ArtifactAttributes.ARTIFACT_FORMAT, ArtifactTypeDefinition.ZIP_TYPE);
65-
transformSpec.getTo().attribute(ArtifactAttributes.ARTIFACT_FORMAT, ArtifactTypeDefinition.DIRECTORY_TYPE);
63+
transformSpec.getFrom().attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.ZIP_TYPE);
64+
transformSpec.getTo().attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.DIRECTORY_TYPE);
6665
});
6766

6867
ArtifactTypeDefinition tarArtifactTypeDefinition = project.getDependencies().getArtifactTypes().maybeCreate("tar.gz");
6968
project.getDependencies().registerTransform(SymbolicLinkPreservingUntarTransform.class, transformSpec -> {
70-
transformSpec.getFrom().attribute(ArtifactAttributes.ARTIFACT_FORMAT, tarArtifactTypeDefinition.getName());
71-
transformSpec.getTo().attribute(ArtifactAttributes.ARTIFACT_FORMAT, ArtifactTypeDefinition.DIRECTORY_TYPE);
69+
transformSpec.getFrom().attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, tarArtifactTypeDefinition.getName());
70+
transformSpec.getTo().attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.DIRECTORY_TYPE);
7271
});
7372

7473
setupResolutionsContainer(project);
@@ -80,7 +79,8 @@ private void setupDistributionContainer(Project project, Property<Boolean> docke
8079
distributionsContainer = project.container(ElasticsearchDistribution.class, name -> {
8180
Configuration fileConfiguration = project.getConfigurations().create("es_distro_file_" + name);
8281
Configuration extractedConfiguration = project.getConfigurations().create(DISTRO_EXTRACTED_CONFIG_PREFIX + name);
83-
extractedConfiguration.getAttributes().attribute(ArtifactAttributes.ARTIFACT_FORMAT, ArtifactTypeDefinition.DIRECTORY_TYPE);
82+
extractedConfiguration.getAttributes()
83+
.attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.DIRECTORY_TYPE);
8484
return new ElasticsearchDistribution(
8585
name,
8686
project.getObjects(),

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import org.gradle.api.artifacts.Configuration;
3333
import org.gradle.api.artifacts.type.ArtifactTypeDefinition;
3434
import org.gradle.api.file.RegularFile;
35-
import org.gradle.api.internal.artifacts.ArtifactAttributes;
3635
import org.gradle.api.plugins.BasePlugin;
3736
import org.gradle.api.plugins.JavaPlugin;
3837
import org.gradle.api.plugins.JavaPluginExtension;
@@ -236,7 +235,7 @@ public Object doCall() {
236235

237236
// also make the zip available as a configuration (used when depending on this project)
238237
Configuration configuration = project.getConfigurations().create("zip");
239-
configuration.getAttributes().attribute(ArtifactAttributes.ARTIFACT_FORMAT, ArtifactTypeDefinition.ZIP_TYPE);
238+
configuration.getAttributes().attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.ZIP_TYPE);
240239
project.getArtifacts().add("zip", bundle);
241240

242241
return bundle;

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.gradle.api.artifacts.dsl.DependencyHandler;
2525
import org.gradle.api.artifacts.type.ArtifactTypeDefinition;
2626
import org.gradle.api.attributes.Attribute;
27-
import org.gradle.api.internal.artifacts.ArtifactAttributes;
2827
import org.gradle.api.plugins.JavaBasePlugin;
2928
import org.gradle.api.tasks.Copy;
3029
import org.gradle.api.tasks.SourceSet;
@@ -53,16 +52,16 @@ public void apply(Project project) {
5352
project.getDependencies().getArtifactTypes().maybeCreate(ArtifactTypeDefinition.JAR_TYPE);
5453
project.getDependencies().registerTransform(UnzipTransform.class, transformSpec -> {
5554
transformSpec.getFrom()
56-
.attribute(ArtifactAttributes.ARTIFACT_FORMAT, ArtifactTypeDefinition.JAR_TYPE)
55+
.attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.JAR_TYPE)
5756
.attribute(restAttribute, true);
5857
transformSpec.getTo()
59-
.attribute(ArtifactAttributes.ARTIFACT_FORMAT, ArtifactTypeDefinition.DIRECTORY_TYPE)
58+
.attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.DIRECTORY_TYPE)
6059
.attribute(restAttribute, true);
6160
});
6261

6362
ConfigurationContainer configurations = project.getConfigurations();
6463
Configuration restTestSpecs = configurations.create(REST_TEST_SPECS_CONFIGURATION_NAME);
65-
restTestSpecs.getAttributes().attribute(ArtifactAttributes.ARTIFACT_FORMAT, ArtifactTypeDefinition.DIRECTORY_TYPE);
64+
restTestSpecs.getAttributes().attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.DIRECTORY_TYPE);
6665
restTestSpecs.getAttributes().attribute(restAttribute, true);
6766

6867
TaskProvider<Copy> copyRestTestSpecs = project.getTasks().register("copyRestTestSpecs", Copy.class, t -> {

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import org.gradle.api.file.FileSystemOperations;
3838
import org.gradle.api.file.FileTree;
3939
import org.gradle.api.file.RegularFile;
40-
import org.gradle.api.internal.artifacts.ArtifactAttributes;
4140
import org.gradle.api.internal.file.FileOperations;
4241
import org.gradle.api.logging.Logger;
4342
import org.gradle.api.logging.Logging;
@@ -343,7 +342,7 @@ public void module(Provider<RegularFile> module) {
343342
private void registerExtractedConfig(Provider<RegularFile> pluginProvider) {
344343
Dependency pluginDependency = this.project.getDependencies().create(project.files(pluginProvider));
345344
Configuration extractedConfig = project.getConfigurations().detachedConfiguration(pluginDependency);
346-
extractedConfig.getAttributes().attribute(ArtifactAttributes.ARTIFACT_FORMAT, ArtifactTypeDefinition.DIRECTORY_TYPE);
345+
extractedConfig.getAttributes().attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.DIRECTORY_TYPE);
347346
extractedConfig.getAttributes().attribute(bundleAttribute, true);
348347
pluginAndModuleConfiguration.from(extractedConfig);
349348
}
@@ -353,10 +352,10 @@ private void configureArtifactTransforms() {
353352
project.getDependencies().getArtifactTypes().maybeCreate(ArtifactTypeDefinition.ZIP_TYPE);
354353
project.getDependencies().registerTransform(UnzipTransform.class, transformSpec -> {
355354
transformSpec.getFrom()
356-
.attribute(ArtifactAttributes.ARTIFACT_FORMAT, ArtifactTypeDefinition.ZIP_TYPE)
355+
.attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.ZIP_TYPE)
357356
.attribute(bundleAttribute, true);
358357
transformSpec.getTo()
359-
.attribute(ArtifactAttributes.ARTIFACT_FORMAT, ArtifactTypeDefinition.DIRECTORY_TYPE)
358+
.attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.DIRECTORY_TYPE)
360359
.attribute(bundleAttribute, true);
361360
transformSpec.getParameters().setAsFiletreeOutput(true);
362361
});

‎modules/reindex/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ if (Os.isFamily(Os.FAMILY_WINDOWS)) {
111111
* To avoid testing against too many old versions, always pick first and last version per major
112112
*/
113113
project.getDependencies().registerTransform(UnzipTransform.class, transformSpec -> {
114-
transformSpec.getFrom().attribute(ArtifactAttributes.ARTIFACT_FORMAT, ArtifactTypeDefinition.ZIP_TYPE);
115-
transformSpec.getTo().attribute(ArtifactAttributes.ARTIFACT_FORMAT, ArtifactTypeDefinition.DIRECTORY_TYPE);
114+
transformSpec.getFrom().attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.ZIP_TYPE);
115+
transformSpec.getTo().attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.DIRECTORY_TYPE);
116116
});
117117

118118
def versions = ['2', '1', '090']
@@ -123,7 +123,7 @@ if (Os.isFamily(Os.FAMILY_WINDOWS)) {
123123
}
124124
versions.each { version ->
125125
def oldEsDependency = configurations['es' + version]
126-
oldEsDependency.getAttributes().attribute(ArtifactAttributes.ARTIFACT_FORMAT, ArtifactTypeDefinition.DIRECTORY_TYPE);
126+
oldEsDependency.getAttributes().attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.DIRECTORY_TYPE);
127127
TaskProvider<AntFixture> fixture = tasks.register("oldEs${version}Fixture", AntFixture) {
128128
dependsOn project.configurations.oldesFixture, jdks.legacy, oldEsDependency
129129
executable = "${BuildParams.runtimeJavaHome}/bin/java"

‎rest-api-spec/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ configurations {
2323
// easy and efficient
2424
basicRestSpecs {
2525
attributes {
26-
attribute(org.gradle.api.internal.artifacts.ArtifactAttributes.ARTIFACT_FORMAT, ArtifactTypeDefinition.DIRECTORY_TYPE)
26+
attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.DIRECTORY_TYPE)
2727
}
2828
}
2929
}

‎x-pack/qa/repository-old-versions/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ if (Os.isFamily(Os.FAMILY_WINDOWS)) {
4848
* To avoid testing against too many old versions, always pick first and last version per major
4949
*/
5050
project.getDependencies().registerTransform(UnzipTransform.class, transformSpec -> {
51-
transformSpec.getFrom().attribute(ArtifactAttributes.ARTIFACT_FORMAT, ArtifactTypeDefinition.ZIP_TYPE);
52-
transformSpec.getTo().attribute(ArtifactAttributes.ARTIFACT_FORMAT, ArtifactTypeDefinition.DIRECTORY_TYPE);
51+
transformSpec.getFrom().attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.ZIP_TYPE);
52+
transformSpec.getTo().attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.DIRECTORY_TYPE);
5353
});
5454

5555
for (String versionString : ['5.0.0', '5.6.16', '6.0.0', '6.8.20']) {
@@ -60,7 +60,7 @@ if (Os.isFamily(Os.FAMILY_WINDOWS)) {
6060
String configName = "es${versionNoDots}"
6161

6262
def config = configurations.create(configName)
63-
config.getAttributes().attribute(ArtifactAttributes.ARTIFACT_FORMAT, ArtifactTypeDefinition.DIRECTORY_TYPE);
63+
config.getAttributes().attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.DIRECTORY_TYPE);
6464
dependencies.add(configName, artifact)
6565

6666
String repoLocation = "${buildDir}/cluster/shared/repo/${versionNoDots}"

0 commit comments

Comments
 (0)