honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix BWC distribution resolution errors (#64310) 

(cherry picked from commit e6ffe9e7b73f7f4dd28ec1059bb9651a98d8f5f5)
This commit is contained in:
Mark Vieira 2020-10-28 12:48:16 -07:00
parent e7f2beae05
commit 13fb6dbe4b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java
View File

@ -151,11 +151,13 @@ public class InternalDistributionBwcSetupPlugin implements Plugin<Project> {
private static List<DistributionProject> resolveArchiveProjects(File checkoutDir, Version bwcVersion) { private static List<DistributionProject> resolveArchiveProjects(File checkoutDir, Version bwcVersion) {
List<String> projects = new ArrayList<>(); List<String> projects = new ArrayList<>();
projects.addAll(asList("deb", "rpm")); // All active BWC branches publish default and oss variants of rpm and deb packages
if (bwcVersion.onOrAfter("7.0.0")) { 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")); projects.addAll(asList("oss-windows-zip", "windows-zip", "oss-darwin-tar", "darwin-tar", "oss-linux-tar", "linux-tar"));
} else { } 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", "oss-deb", "oss-rpm")); projects.addAll(asList("oss-zip", "zip", "tar", "oss-tar"));
} }
return projects.stream().map(name -> { return projects.stream().map(name -> {