Skip to content

Commit e9a04ac

Browse files
committed
Fix rpm resolutions in bwc
1 parent 246064f commit e9a04ac

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,7 @@ private static String dependencyNotation(ElasticsearchDistribution distribution)
166166
var extension = distribution.getType().getExtension(distribution.getPlatform());
167167
var classifier = distribution.getType().getClassifier(distribution.getPlatform(), distroVersion);
168168
var group = distribution.getVersion().endsWith("-SNAPSHOT") ? FAKE_SNAPSHOT_IVY_GROUP : FAKE_IVY_GROUP;
169-
var definition = group + ":elasticsearch" + ":" + distribution.getVersion() + classifier + "@" + extension;
170-
171-
return definition;
169+
return group + ":elasticsearch" + ":" + distribution.getVersion() + classifier + "@" + extension;
172170
}
173171

174172
private void setupResolutionsContainer(Project project) {

build-tools/src/main/java/org/elasticsearch/gradle/ElasticsearchDistributionType.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
package org.elasticsearch.gradle;
1111

12+
import org.elasticsearch.gradle.Architecture;
13+
1214
public interface ElasticsearchDistributionType {
1315

1416
String getName();
@@ -26,6 +28,8 @@ default String getExtension(ElasticsearchDistribution.Platform platform) {
2628
}
2729

2830
default String getClassifier(ElasticsearchDistribution.Platform platform, Version version) {
29-
return ":" + Architecture.current().classifier;
31+
return version.onOrAfter("9.2.0")
32+
? ":" + platform + "-" + Architecture.current().classifier
33+
: ":" + Architecture.current().bwcClassifier;
3034
}
3135
}

0 commit comments

Comments
 (0)