From 0ea5917fea857c96725d66ac188f3aca83ec56e0 Mon Sep 17 00:00:00 2001 From: Mark Vieira Date: Thu, 28 Jul 2022 10:12:51 -0700 Subject: [PATCH 1/3] Improve BWC distribution mismatch error message --- .../gradle/internal/InternalDistributionBwcSetupPlugin.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java index 3856e9826e7f0..a5aa04ada36da 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java @@ -24,6 +24,7 @@ import org.gradle.language.base.plugins.LifecycleBasePlugin; import java.io.File; +import java.nio.file.Path; import java.util.ArrayList; import java.util.List; import java.util.Locale; @@ -249,8 +250,10 @@ static void createBuildBwcTask( @Override public void execute(Task task) { if (expectedOutputFile.exists() == false) { + Path relativeOutputPath = project.getRootDir().toPath().relativize(expectedOutputFile.toPath()); throw new InvalidUserDataException( - "Building " + bwcVersion.get() + " didn't generate expected artifact " + expectedOutputFile + "Building " + bwcVersion.get() + " didn't generate expected artifact [" + relativeOutputPath + "]. " + + "The working branch may be out of date." ); } } From 6f93db4cbcb34e3dd3782e73606e0140acdad927 Mon Sep 17 00:00:00 2001 From: Mark Vieira Date: Thu, 28 Jul 2022 10:52:40 -0700 Subject: [PATCH 2/3] Spotless --- .../internal/InternalDistributionBwcSetupPlugin.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java index a5aa04ada36da..7979b63991c99 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java @@ -252,8 +252,12 @@ public void execute(Task task) { if (expectedOutputFile.exists() == false) { Path relativeOutputPath = project.getRootDir().toPath().relativize(expectedOutputFile.toPath()); throw new InvalidUserDataException( - "Building " + bwcVersion.get() + " didn't generate expected artifact [" + relativeOutputPath + "]. " + - "The working branch may be out of date." + "Building " + + bwcVersion.get() + + " didn't generate expected artifact [" + + relativeOutputPath + + "]. " + + "The working branch may be out of date." ); } } From 6df5bed9bfb3a5ecc45a72f256ec283df468fcb0 Mon Sep 17 00:00:00 2001 From: Mark Vieira Date: Thu, 28 Jul 2022 13:49:55 -0700 Subject: [PATCH 3/3] Further improve message --- .../internal/InternalDistributionBwcSetupPlugin.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java index 7979b63991c99..f974b02a1c5b3 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java @@ -251,14 +251,9 @@ static void createBuildBwcTask( public void execute(Task task) { if (expectedOutputFile.exists() == false) { Path relativeOutputPath = project.getRootDir().toPath().relativize(expectedOutputFile.toPath()); - throw new InvalidUserDataException( - "Building " - + bwcVersion.get() - + " didn't generate expected artifact [" - + relativeOutputPath - + "]. " - + "The working branch may be out of date." - ); + final String message = "Building %s didn't generate expected artifact [%s]. The working branch may be " + + "out-of-date - try merging in the latest upstream changes to the branch."; + throw new InvalidUserDataException(message.formatted(bwcVersion.get(), relativeOutputPath)); } } });