From e08688f0f76e7038f0c4f6a51509d805f569acf6 Mon Sep 17 00:00:00 2001
From: Martin Mois <martin.mois@gmail.com>
Date: Fri, 3 Nov 2023 16:48:01 +0100
Subject: [PATCH] #366 <skip> and -Djapicmp.skip work

---
 .../main/java/japicmp/maven/JApiCmpMojo.java  |  9 +++---
 .../japicmp-test-maven-plugin/pom.xml         | 31 +++++++++++++++++++
 .../src/test/java/japicmp/test/ITSkip.java    | 28 +++++++++++++++++
 3 files changed, 63 insertions(+), 5 deletions(-)
 create mode 100644 japicmp-testbase/japicmp-test-maven-plugin/src/test/java/japicmp/test/ITSkip.java

diff --git a/japicmp-maven-plugin/src/main/java/japicmp/maven/JApiCmpMojo.java b/japicmp-maven-plugin/src/main/java/japicmp/maven/JApiCmpMojo.java
index a1d9a82c7..8f7807447 100644
--- a/japicmp-maven-plugin/src/main/java/japicmp/maven/JApiCmpMojo.java
+++ b/japicmp-maven-plugin/src/main/java/japicmp/maven/JApiCmpMojo.java
@@ -66,8 +66,10 @@ public class JApiCmpMojo extends AbstractMojo {
 	private List<Dependency> oldClassPathDependencies;
 	@org.apache.maven.plugins.annotations.Parameter(required = false)
 	private List<Dependency> newClassPathDependencies;
-	@org.apache.maven.plugins.annotations.Parameter(property = "japicmp.skip", required = false)
+	@org.apache.maven.plugins.annotations.Parameter(defaultValue = "false")
 	private boolean skip;
+	@org.apache.maven.plugins.annotations.Parameter(property = "japicmp.skip", defaultValue = "false")
+	private boolean skipExec;
 	@org.apache.maven.plugins.annotations.Parameter(property = "japicmp.skipXmlReport", required = false)
 	private boolean skipXmlReport;
 	@org.apache.maven.plugins.annotations.Parameter(property = "japicmp.skipHtmlReport", required = false)
@@ -104,7 +106,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
 		MavenParameters mavenParameters = new MavenParameters(this.artifactRepositories,
 			this.mavenProject, this.mojoExecution, this.versionRangeWithProjectVersion, this.repoSystem, this.repoSession,
 			this.remoteRepos);
-		PluginParameters pluginParameters = new PluginParameters(this.skip, this.newVersion, this.oldVersion, this.parameter, this.dependencies, Optional.of(
+		PluginParameters pluginParameters = new PluginParameters(this.skipExec || this.skip, this.newVersion, this.oldVersion, this.parameter, this.dependencies, Optional.of(
 			this.projectBuildDir), Optional.<String>absent(), true, this.oldVersions, this.newVersions, this.oldClassPathDependencies,
 			this.newClassPathDependencies);
 		executeWithParameters(pluginParameters, mavenParameters);
@@ -185,8 +187,6 @@ private void setUpOverrideCompatibilityChanges(JarArchiveComparatorOptions compa
 		}
 	}
 
-
-
 	private boolean skipModule(PluginParameters pluginParameters, MavenParameters mavenParameters) {
 		SkipModuleStrategy skipModuleStrategy = new SkipModuleStrategy(pluginParameters, mavenParameters, getLog());
 		return skipModuleStrategy.skip();
@@ -197,7 +197,6 @@ private enum ConfigurationVersion {
 	}
 
 	private static DefaultArtifact createDefaultArtifact(MavenProject mavenProject, String version) {
-
         org.apache.maven.artifact.Artifact artifact = mavenProject.getArtifact();
         return createDefaultArtifact(artifact.getGroupId(), artifact.getArtifactId(), artifact.getClassifier(), artifact.getType(), version);
 	}
diff --git a/japicmp-testbase/japicmp-test-maven-plugin/pom.xml b/japicmp-testbase/japicmp-test-maven-plugin/pom.xml
index ecdf69305..b62f8d8ac 100644
--- a/japicmp-testbase/japicmp-test-maven-plugin/pom.xml
+++ b/japicmp-testbase/japicmp-test-maven-plugin/pom.xml
@@ -650,6 +650,37 @@
 							</dependencies>
 						</configuration>
 					</execution>
+					<execution>
+						<id>skip</id>
+						<phase>pre-integration-test</phase>
+						<goals>
+							<goal>cmp</goal>
+						</goals>
+						<configuration>
+							<skip>true</skip>
+							<oldVersion>
+								<dependency>
+									<groupId>com.github.siom79.japicmp</groupId>
+									<artifactId>japicmp-test-v1</artifactId>
+									<version>${project.version}</version>
+								</dependency>
+							</oldVersion>
+							<newVersion>
+								<dependency>
+									<groupId>com.github.siom79.japicmp</groupId>
+									<artifactId>japicmp-test-v2</artifactId>
+									<version>${project.version}</version>
+								</dependency>
+							</newVersion>
+							<dependencies>
+								<dependency>
+									<groupId>org.apache.commons</groupId>
+									<artifactId>commons-math3</artifactId>
+									<version>3.4</version>
+								</dependency>
+							</dependencies>
+						</configuration>
+					</execution>
 				</executions>
 			</plugin>
 			<!-- run site plugin to build reports during 'pre-integration-test' phase
diff --git a/japicmp-testbase/japicmp-test-maven-plugin/src/test/java/japicmp/test/ITSkip.java b/japicmp-testbase/japicmp-test-maven-plugin/src/test/java/japicmp/test/ITSkip.java
new file mode 100644
index 000000000..bb44c3a09
--- /dev/null
+++ b/japicmp-testbase/japicmp-test-maven-plugin/src/test/java/japicmp/test/ITSkip.java
@@ -0,0 +1,28 @@
+package japicmp.test;
+
+import org.junit.Test;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThat;
+
+public class ITSkip {
+
+	@Test
+	 public void testXmlReportNotGenerated() throws IOException {
+		assertThat(Files.exists(Paths.get(System.getProperty("user.dir"), "target", "japicmp", "skip.html")), is(false));
+	}
+
+	@Test
+	public void testHtmlReportNotGenerated() throws IOException {
+		assertThat(Files.exists(Paths.get(System.getProperty("user.dir"), "target", "japicmp", "skip.xml")), is(false));
+	}
+
+	@Test
+	public void testDiffReportGenerated() throws IOException {
+		assertThat(Files.exists(Paths.get(System.getProperty("user.dir"), "target", "japicmp", "skip.diff")), is(false));
+	}
+}