From 59404e58d219ab900ff3787497cf148f53253ac8 Mon Sep 17 00:00:00 2001
From: Tim te Beek <tim@moderne.io>
Date: Thu, 12 Sep 2024 14:03:37 +0200
Subject: [PATCH] Declare to throw MojoExecutionException &
 MojoFailureException

---
 .../org/openrewrite/maven/AbstractRewriteBaseRunMojo.java    | 5 +++--
 .../org/openrewrite/maven/AbstractRewriteDryRunMojo.java     | 3 ++-
 .../java/org/openrewrite/maven/AbstractRewriteRunMojo.java   | 3 ++-
 .../java/org/openrewrite/maven/MavenMojoProjectParser.java   | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/openrewrite/maven/AbstractRewriteBaseRunMojo.java b/src/main/java/org/openrewrite/maven/AbstractRewriteBaseRunMojo.java
index c77b8dd5..39411b9e 100644
--- a/src/main/java/org/openrewrite/maven/AbstractRewriteBaseRunMojo.java
+++ b/src/main/java/org/openrewrite/maven/AbstractRewriteBaseRunMojo.java
@@ -18,6 +18,7 @@
 import io.micrometer.core.instrument.Metrics;
 import org.apache.maven.artifact.DependencyResolutionRequiredException;
 import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.codehaus.plexus.classworlds.realm.ClassRealm;
 import org.jspecify.annotations.Nullable;
@@ -102,7 +103,7 @@ protected Path repositoryRoot() {
         return maybeBaseDir;
     }
 
-    protected ResultsContainer listResults(ExecutionContext ctx) throws MojoExecutionException {
+    protected ResultsContainer listResults(ExecutionContext ctx) throws MojoExecutionException, MojoFailureException {
         try (MeterRegistryProvider meterRegistryProvider = new MeterRegistryProvider(getLog(),
                 metricsUri, metricsUsername, metricsPassword)) {
             Metrics.addRegistry(meterRegistryProvider.registry());
@@ -226,7 +227,7 @@ private static void updateOption(Recipe recipe, Field field, @Nullable String op
                 String.format("Unable to convert option: %s value: %s to type: %s", name, optionValue, type));
     }
 
-    protected LargeSourceSet loadSourceSet(Path repositoryRoot, Environment env, ExecutionContext ctx) throws DependencyResolutionRequiredException, MojoExecutionException {
+    protected LargeSourceSet loadSourceSet(Path repositoryRoot, Environment env, ExecutionContext ctx) throws DependencyResolutionRequiredException, MojoExecutionException, MojoFailureException {
         List<NamedStyles> styles = loadStyles(project, env);
 
         //Parse and collect source files from each project in the maven session.
diff --git a/src/main/java/org/openrewrite/maven/AbstractRewriteDryRunMojo.java b/src/main/java/org/openrewrite/maven/AbstractRewriteDryRunMojo.java
index 4393fa80..fd79883c 100644
--- a/src/main/java/org/openrewrite/maven/AbstractRewriteDryRunMojo.java
+++ b/src/main/java/org/openrewrite/maven/AbstractRewriteDryRunMojo.java
@@ -16,6 +16,7 @@
 package org.openrewrite.maven;
 
 import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.jspecify.annotations.Nullable;
 import org.openrewrite.ExecutionContext;
@@ -47,7 +48,7 @@ public class AbstractRewriteDryRunMojo extends AbstractRewriteBaseRunMojo {
     private boolean failOnDryRunResults;
 
     @Override
-    public void execute() throws MojoExecutionException {
+    public void execute() throws MojoExecutionException, MojoFailureException {
         if (rewriteSkip) {
             getLog().info("Skipping execution");
             putState(State.SKIPPED);
diff --git a/src/main/java/org/openrewrite/maven/AbstractRewriteRunMojo.java b/src/main/java/org/openrewrite/maven/AbstractRewriteRunMojo.java
index e40ae79d..384911ea 100644
--- a/src/main/java/org/openrewrite/maven/AbstractRewriteRunMojo.java
+++ b/src/main/java/org/openrewrite/maven/AbstractRewriteRunMojo.java
@@ -16,6 +16,7 @@
 package org.openrewrite.maven;
 
 import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
 import org.jspecify.annotations.Nullable;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.FileAttributes;
@@ -41,7 +42,7 @@
 public class AbstractRewriteRunMojo extends AbstractRewriteBaseRunMojo {
 
     @Override
-    public void execute() throws MojoExecutionException {
+    public void execute() throws MojoExecutionException, MojoFailureException {
         if (rewriteSkip) {
             getLog().info("Skipping execution");
             putState(State.SKIPPED);
diff --git a/src/main/java/org/openrewrite/maven/MavenMojoProjectParser.java b/src/main/java/org/openrewrite/maven/MavenMojoProjectParser.java
index 8b16d480..e8303fb1 100644
--- a/src/main/java/org/openrewrite/maven/MavenMojoProjectParser.java
+++ b/src/main/java/org/openrewrite/maven/MavenMojoProjectParser.java
@@ -133,7 +133,7 @@ public MavenMojoProjectParser(Log logger, Path baseDir, boolean pomCacheEnabled,
     }
 
     public Stream<SourceFile> listSourceFiles(MavenProject mavenProject, List<NamedStyles> styles,
-                                              ExecutionContext ctx) throws DependencyResolutionRequiredException, AbstractMojoExecutionException {
+                                              ExecutionContext ctx) throws DependencyResolutionRequiredException, MojoExecutionException, MojoFailureException {
         if (runPerSubmodule) {
             //If running per submodule, parse the source files for only the current project.
             List<Marker> projectProvenance = generateProvenance(mavenProject);