Merge pull request #578 from gradle/maven/use-wrapper

Use Maven wrapper
gradle · Sep 24, 2024 · d391e20 · d391e20
2 parents 45107dd + 3fdea4a
commit d391e20
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 4 deletions.
diff --git a/src/main/java/org/gradle/profiler/BuildToolCommandLineScenarioDefinition.java b/src/main/java/org/gradle/profiler/BuildToolCommandLineScenarioDefinition.java
@@ -1,6 +1,7 @@
 package org.gradle.profiler;
 
 import javax.annotation.Nullable;
+import javax.annotation.OverridingMethodsMustInvokeSuper;
 import java.io.File;
 import java.io.PrintStream;
 import java.util.List;
@@ -33,9 +34,14 @@ protected void printDetail(PrintStream out) {
         out.println("  Targets: " + getTargets());
     }
 
-    public String getExecutablePath() {
+    public String getExecutablePath(File projectDir) {
         String toolHomePath = getToolHome() == null ? System.getenv(getToolHomeEnvName()) : getToolHome().getAbsolutePath();
-        return toolHomePath == null ? getExecutableName() : toolHomePath + "/bin/" + getExecutableName();
+        return toolHomePath == null ? getExecutablePathWithoutToolHome(projectDir) : toolHomePath + "/bin/" + getExecutableName();
+    }
+
+    @OverridingMethodsMustInvokeSuper
+    protected String getExecutablePathWithoutToolHome(File projectDir) {
+        return getExecutableName();
     }
 
     @Override

diff --git a/src/main/java/org/gradle/profiler/bazel/BazelScenarioInvoker.java b/src/main/java/org/gradle/profiler/bazel/BazelScenarioInvoker.java
@@ -14,7 +14,7 @@ public void run(BazelScenarioDefinition scenario, InvocationSettings settings, C
         List<String> targets = scenario.getTargets();
 
         List<String> commandLine = new ArrayList<>();
-        commandLine.add(scenario.getExecutablePath());
+        commandLine.add(scenario.getExecutablePath(settings.getProjectDir()));
         commandLine.addAll(targets);
 
         doRun(scenario, settings, resultConsumer, commandLine);

diff --git a/src/main/java/org/gradle/profiler/maven/MavenScenarioDefinition.java b/src/main/java/org/gradle/profiler/maven/MavenScenarioDefinition.java
@@ -58,6 +58,19 @@ protected String getExecutableName() {
         }
     }
 
+    @Override
+    protected String getExecutablePathWithoutToolHome(File projectDir) {
+        String wrapperName = OperatingSystem.isWindows()
+            ? "mvnw.cmd"
+            : "mvnw";
+        File wrapper = new File(projectDir, wrapperName);
+        if (wrapper.isFile()) {
+            return wrapper.getAbsolutePath();
+        } else {
+            return super.getExecutablePathWithoutToolHome(projectDir);
+        }
+    }
+
     @Override
     protected String getToolHomeEnvName() {
         return "MAVEN_HOME";

diff --git a/src/main/java/org/gradle/profiler/maven/MavenScenarioInvoker.java b/src/main/java/org/gradle/profiler/maven/MavenScenarioInvoker.java
@@ -15,7 +15,7 @@ public class MavenScenarioInvoker extends BuildToolCommandLineInvoker<MavenScena
     @Override
     public void run(MavenScenarioDefinition scenario, InvocationSettings settings, Consumer<BuildInvocationResult> resultConsumer) {
         List<String> commandLine = new ArrayList<>();
-        commandLine.add(scenario.getExecutablePath());
+        commandLine.add(scenario.getExecutablePath(settings.getProjectDir()));
         commandLine.addAll(scenario.getTargets());
         scenario.getSystemProperties().forEach((key, value) ->
             commandLine.add(String.format("-D%s=%s", key, value)));