From 13fb6dbe4b1c3c2f4010f4e8a358e0cb677b6e5a Mon Sep 17 00:00:00 2001 From: Mark Vieira Date: Wed, 28 Oct 2020 12:48:16 -0700 Subject: [PATCH] Fix BWC distribution resolution errors (#64310) (cherry picked from commit e6ffe9e7b73f7f4dd28ec1059bb9651a98d8f5f5) --- .../internal/InternalDistributionBwcSetupPlugin.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java index a6080685673..1872a69f8a0 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java @@ -151,11 +151,13 @@ public class InternalDistributionBwcSetupPlugin implements Plugin { private static List resolveArchiveProjects(File checkoutDir, Version bwcVersion) { List projects = new ArrayList<>(); - projects.addAll(asList("deb", "rpm")); - if (bwcVersion.onOrAfter("7.0.0")) { + // All active BWC branches publish default and oss variants of rpm and deb packages + projects.addAll(asList("deb", "rpm", "oss-deb", "oss-rpm")); + + if (bwcVersion.onOrAfter("7.0.0")) { // starting with 7.0 we bundle a jdk which means we have platform-specific archives projects.addAll(asList("oss-windows-zip", "windows-zip", "oss-darwin-tar", "darwin-tar", "oss-linux-tar", "linux-tar")); - } else { - projects.addAll(asList("oss-zip", "zip", "oss-deb", "oss-rpm")); + } else { // prior to 7.0 we published only a single zip and tar archives for oss and default distributions + projects.addAll(asList("oss-zip", "zip", "tar", "oss-tar")); } return projects.stream().map(name -> {