Revert #969 because fixing the skip bug caused inconsistent behavior between check.skip and apply.skip.

Author: nedtwigg

plugin-maven/CHANGES.md

@@ -5,6 +5,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changed
 * Added support and bump Eclipse formatter default versions to `4.21` for `eclipse-groovy`. Change is only applied for JVM 11+.
+### Fixed
+ * Revert change from 2.17.2 regarding [skip bug](https://github.com/diffplug/spotless/pull/969) because fixing the skip bug caused inconsistent behavior between `check.skip` and `apply.skip`.
 
 ## [2.17.2] - 2021-10-14
 ### Fixed

plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java

@@ -73,12 +73,6 @@ public abstract class AbstractSpotlessMojo extends AbstractMojo {
 	@Component
 	private ResourceManager resourceManager;
 
-	@Parameter(defaultValue = "${mojoExecution.goal}", required = true, readonly = true)
-	private String goal;
-
-	@Parameter(property = "spotless.check.skip", defaultValue = "false")
-	private boolean skip;
-
 	@Parameter(defaultValue = "${repositorySystemSession}", required = true, readonly = true)
 	private RepositorySystemSession repositorySystemSession;
 
@@ -153,11 +147,6 @@ public final void execute() throws MojoExecutionException {
 	}
 
 	private void execute(FormatterFactory formatterFactory) throws MojoExecutionException {
-		if (skip) {
-			getLog().info(String.format("Spotless %s skipped", goal));
-			return;
-		}
-
 		FormatterConfig config = getFormatterConfig();
 		List<File> files = collectFiles(formatterFactory, config);
 

plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java

@@ -20,6 +20,7 @@
 
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
 
 import com.diffplug.spotless.Formatter;
 import com.diffplug.spotless.PaddedCell;
@@ -29,9 +30,16 @@
  */
 @Mojo(name = "apply", threadSafe = true)
 public class SpotlessApplyMojo extends AbstractSpotlessMojo {
+	@Parameter(property = "spotless.apply.skip", defaultValue = "false")
+	private boolean skip;
 
 	@Override
 	protected void process(Iterable<File> files, Formatter formatter) throws MojoExecutionException {
+		if (skip) {
+			getLog().info("Spotless apply skipped");
+			return;
+		}
+
 		for (File file : files) {
 			try {
 				PaddedCell.DirtyState dirtyState = PaddedCell.calculateDirtyState(formatter, file);

plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java

@@ -23,6 +23,7 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
 
 import com.diffplug.spotless.Formatter;
 import com.diffplug.spotless.PaddedCell;
@@ -35,8 +36,16 @@
 @Mojo(name = "check", defaultPhase = LifecyclePhase.VERIFY, threadSafe = true)
 public class SpotlessCheckMojo extends AbstractSpotlessMojo {
 
+	@Parameter(property = "spotless.check.skip", defaultValue = "false")
+	private boolean skip;
+
 	@Override
 	protected void process(Iterable<File> files, Formatter formatter) throws MojoExecutionException {
+		if (skip) {
+			getLog().info("Spotless check skipped");
+			return;
+		}
+
 		List<File> problemFiles = new ArrayList<>();
 		for (File file : files) {
 			try {