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

fix gradle check fail due to renameing -min in #1094 (#1289) (#1291) 

Signed-off-by: Xue Zhou <xuezhou@amazon.com>
This commit is contained in:
Xue Zhou 2021-09-24 19:07:25 +00:00 committed by Nicholas Walter Knize
parent 86ce37f48a
commit 2183c7ce82
No known key found for this signature in database
GPG Key ID: 51F0CC22F625308A
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
buildSrc/src/main/java/org/opensearch/gradle/internal/InternalDistributionBwcSetupPlugin.java
View File

@ -239,10 +239,17 @@ public class InternalDistributionBwcSetupPlugin implements Plugin<Project> {
DistributionProject(String name, String baseDir, Version version, String classifier, String extension, File checkoutDir) { DistributionProject(String name, String baseDir, Version version, String classifier, String extension, File checkoutDir) {
this.name = name; this.name = name;
this.projectPath = baseDir + "/" + name; this.projectPath = baseDir + "/" + name;
if (version.onOrAfter("1.1.0")) {
this.distFile = new File(
checkoutDir,
baseDir + "/" + name + "/build/distributions/opensearch-min-" + version + "-SNAPSHOT" + classifier + "." + extension
);
} else {
this.distFile = new File( this.distFile = new File(
checkoutDir, checkoutDir,
baseDir + "/" + name + "/build/distributions/opensearch-" + version + "-SNAPSHOT" + classifier + "." + extension baseDir + "/" + name + "/build/distributions/opensearch-" + version + "-SNAPSHOT" + classifier + "." + extension
); );
}
// we only ported this down to the 7.x branch. // we only ported this down to the 7.x branch.
if (version.onOrAfter("7.10.0") && (name.endsWith("zip") || name.endsWith("tar"))) { if (version.onOrAfter("7.10.0") && (name.endsWith("zip") || name.endsWith("tar"))) {
this.expandedDistDir = new File(checkoutDir, baseDir + "/" + name + "/build/install"); this.expandedDistDir = new File(checkoutDir, baseDir + "/" + name + "/build/install");