Make the mojo define old & new classpaths automatically

japicmp-maven-plugin/src/main/java/japicmp/maven/JApiCmpMojo.java

@@ -141,6 +141,11 @@ Optional<XmlOutput> executeWithParameters(PluginParameters pluginParameters, Mav
 			getLog().warn("Skipping execution because no new version could be resolved/found.");
 			return Optional.absent();
 		}
+		if (jarArchiveComparator.getJarArchiveComparatorOptions().getClassPathMode() == JarArchiveComparatorOptions.ClassPathMode.ONE_COMMON_CLASSPATH) {
+			getLog().debug("comparing " + options.getOldArchives() + " to " + options.getNewArchives() + " using " + jarArchiveComparator.getCommonClasspathAsString());
+		} else {
+			getLog().debug("comparing " + options.getOldArchives() + " using " + jarArchiveComparator.getOldClassPathAsString() + " to " + options.getNewArchives() + " using " + jarArchiveComparator.getNewClassPathAsString());
+		}
 		List<JApiClass> jApiClasses = jarArchiveComparator.compare(options.getOldArchives(), options.getNewArchives());
 		try {
 			PostAnalysisScriptExecutor postAnalysisScriptExecutor = new PostAnalysisScriptExecutor();
@@ -593,7 +598,7 @@ private String createFilename(MavenParameters mavenParameters) {
 		return sb.toString();
 	}
 
-	private void setUpClassPath(JarArchiveComparatorOptions comparatorOptions, PluginParameters pluginParameters, MavenParameters mavenParameters) throws MojoFailureException {
+	private void setUpClassPath(JarArchiveComparatorOptions comparatorOptions, PluginParameters pluginParameters, MavenParameters mavenParameters) throws MojoFailureException, MojoExecutionException {
 		if (pluginParameters != null) {
 			if (pluginParameters.getDependenciesParam() != null) {
 				if (pluginParameters.getOldClassPathDependencies() != null || pluginParameters.getNewClassPathDependencies() != null) {
@@ -636,23 +641,59 @@ private void setUpClassPath(JarArchiveComparatorOptions comparatorOptions, Plugi
 					comparatorOptions.setClassPathMode(JarArchiveComparatorOptions.ClassPathMode.TWO_SEPARATE_CLASSPATHS);
 				} else {
 					if (getLog().isDebugEnabled()) {
-						getLog().debug("None of the elements <oldClassPathDependencies/>, <newClassPathDependencies/> or <dependencies/> found. Using " + JApiCli.ClassPathMode.ONE_COMMON_CLASSPATH);
+						getLog().debug("None of the elements <oldClassPathDependencies/>, <newClassPathDependencies/> or <dependencies/> found. Using " + JarArchiveComparatorOptions.ClassPathMode.TWO_SEPARATE_CLASSPATHS);
 					}
-					comparatorOptions.setClassPathMode(JarArchiveComparatorOptions.ClassPathMode.ONE_COMMON_CLASSPATH);
+					comparatorOptions.setClassPathMode(JarArchiveComparatorOptions.ClassPathMode.TWO_SEPARATE_CLASSPATHS);
 				}
 			}
 		}
 		setUpClassPathUsingMavenProject(comparatorOptions, mavenParameters, pluginParameters, ConfigurationVersion.NEW);
 	}
 
-	private void setUpClassPathUsingMavenProject(JarArchiveComparatorOptions comparatorOptions, MavenParameters mavenParameters, PluginParameters pluginParameters, ConfigurationVersion configurationVersion) throws MojoFailureException {
-		MavenProject mavenProject = mavenParameters.getMavenProject();
-		notNull(mavenProject, "Maven parameter mavenProject should be provided by maven container.");
+	private void setUpClassPathUsingMavenProject(JarArchiveComparatorOptions comparatorOptions, MavenParameters mavenParameters, PluginParameters pluginParameters, ConfigurationVersion configurationVersion) throws MojoFailureException, MojoExecutionException {
+		if (comparatorOptions.getClassPathMode() == JarArchiveComparatorOptions.ClassPathMode.TWO_SEPARATE_CLASSPATHS) {
+			if (pluginParameters.getOldVersionParam() != null) {
+				Dependency dependency = pluginParameters.getOldVersionParam().getDependency();
+				if (dependency != null) {
+					Set<Artifact> comparisonArtifacts = resolveArtifact(dependency, mavenParameters, false, pluginParameters, ConfigurationVersion.OLD);
+					if (!comparisonArtifacts.isEmpty()) {
+						setUpClassPathEntries(comparisonArtifacts.iterator().next(), mavenParameters, pluginParameters, comparatorOptions.getOldClassPath());
+					}
+				}
+			} else if (pluginParameters.getOldVersionsParam() != null) {
+				// TODO
+			} else {
+				// TODO rather than calling getComparisonArtifact again, populateArchivesListsFromParameters should compute the old CP for various modes
+				Artifact comparisonArtifact = getComparisonArtifact(mavenParameters, pluginParameters, ConfigurationVersion.OLD);
+				if (comparisonArtifact.getVersion() != null) {
+					setUpClassPathEntries(comparisonArtifact, mavenParameters, pluginParameters, comparatorOptions.getOldClassPath());
+				}
+			}
+		}
+		if (pluginParameters.getNewVersionParam() != null) {
+			Dependency dependency = pluginParameters.getNewVersionParam().getDependency();
+			if (dependency != null) {
+				Set<Artifact> comparisonArtifacts = resolveArtifact(dependency, mavenParameters, false, pluginParameters, ConfigurationVersion.NEW);
+				if (!comparisonArtifacts.isEmpty()) {
+					setUpClassPathEntries(comparisonArtifacts.iterator().next(), mavenParameters, pluginParameters, comparatorOptions.getNewClassPath());
+				}
+			}
+		} else if (pluginParameters.getNewVersionsParam() != null) {
+			// TODO
+		} else {
+			MavenProject mavenProject = mavenParameters.getMavenProject();
+			notNull(mavenProject, "Maven parameter mavenProject should be provided by maven container.");
+			String packaging = mavenProject.getPackaging();
+			packaging = mapPackaging(packaging, "bundle".equalsIgnoreCase(packaging), "jar");
+			DefaultArtifact artifact = new DefaultArtifact(mavenProject.getGroupId(), mavenProject.getArtifactId(), packaging, mavenProject.getVersion());
+			setUpClassPathEntries(artifact, mavenParameters, pluginParameters, comparatorOptions.getClassPathEntries());
+		}
+	}
+
+	private void setUpClassPathEntries(Artifact comparisonArtifact, MavenParameters mavenParameters, PluginParameters pluginParameters, List<String> classPath) throws MojoFailureException {
+		getLog().debug("setting up classpath entries for " + comparisonArtifact);
 		CollectRequest request = new CollectRequest();
-		String packaging = mavenProject.getPackaging();
-		packaging = mapPackaging(packaging, "bundle".equalsIgnoreCase(packaging), "jar");
-		DefaultArtifact defaultArtifact = new DefaultArtifact(mavenProject.getGroupId(), mavenProject.getArtifactId(), packaging, mavenProject.getVersion());
-		request.setRoot(new org.eclipse.aether.graph.Dependency(defaultArtifact, "compile"));
+		request.setRoot(new org.eclipse.aether.graph.Dependency(comparisonArtifact, "compile"));
 		try {
 			DependencyResult dependencyResult = mavenParameters.getRepoSystem().resolveDependencies(mavenParameters.getRepoSession(), new DependencyRequest(
 				request, new DependencyFilter() {
@@ -678,7 +719,7 @@ public boolean accept(final DependencyNode node, final List<DependencyNode> pare
 				}
 			}
 			for (String classPathEntry : classPathEntries) {
-				comparatorOptions.getClassPathEntries().add(classPathEntry);
+				classPath.add(classPathEntry);
 			}
 		} catch (final DependencyResolutionException e) {
 			throw new MojoFailureException(e.getMessage(), e);

japicmp-testbase/japicmp-test-service-impl-base/japicmp-test-service-impl-v1/src/main/java/japicmp/test/service/InterfaceMethodAddedImpl.java

@@ -1,4 +1,4 @@
-package japicmp.test.service;
+package japicmp.test.service; // v1
 
 public class InterfaceMethodAddedImpl implements InterfaceMethodAdded {
 }

japicmp-testbase/japicmp-test-service-impl-base/japicmp-test-service-impl-v1/src/main/java/japicmp/test/service/InterfaceMethodRemovedImpl.java

@@ -1,4 +1,4 @@
-package japicmp.test.service;
+package japicmp.test.service; // v1
 
 public class InterfaceMethodRemovedImpl implements InterfaceMethodRemoved {
 	@Override

japicmp-testbase/japicmp-test-service-impl-base/japicmp-test-service-impl-v1/src/main/java/japicmp/test/service/SubclassAddsNewStaticField.java

@@ -1,4 +1,4 @@
-package japicmp.test.service;
+package japicmp.test.service; // v1
 
 public class SubclassAddsNewStaticField extends SuperclassWithSubclassAddsNewStaticField {
 }

japicmp-testbase/japicmp-test-service-impl-base/japicmp-test-service-impl-v1/src/main/java/japicmp/test/service/SuperclassChanged.java

@@ -0,0 +1,4 @@
+package japicmp.test.service; // v1
+
+public class SuperclassChanged extends SuperclassV1 {
+}

japicmp-testbase/japicmp-test-service-impl-base/japicmp-test-service-impl-v2/src/main/java/japicmp/test/service/InterfaceMethodAddedImpl.java

@@ -1,4 +1,4 @@
-package japicmp.test.service;
+package japicmp.test.service; // v2
 
 public class InterfaceMethodAddedImpl implements InterfaceMethodAdded {
 	@Override

japicmp-testbase/japicmp-test-service-impl-base/japicmp-test-service-impl-v2/src/main/java/japicmp/test/service/InterfaceMethodRemovedImpl.java

@@ -1,4 +1,4 @@
-package japicmp.test.service;
+package japicmp.test.service; // v2
 
 public class InterfaceMethodRemovedImpl implements InterfaceMethodRemoved {
 

japicmp-testbase/japicmp-test-service-impl-base/japicmp-test-service-impl-v2/src/main/java/japicmp/test/service/SubclassAddsNewStaticField.java

@@ -1,4 +1,4 @@
-package japicmp.test.service;
+package japicmp.test.service; // v2
 
 public class SubclassAddsNewStaticField extends SuperclassWithSubclassAddsNewStaticField {
 	public static int field = 42;

japicmp-testbase/japicmp-test-service-impl-base/japicmp-test-service-impl-v2/src/main/java/japicmp/test/service/SuperclassChanged.java

@@ -0,0 +1,4 @@
+package japicmp.test.service; // v2
+
+public class SuperclassChanged extends SuperclassV2 {
+}

japicmp-testbase/japicmp-test-service-impl-base/japicmp-test-service-test/pom.xml

@@ -94,20 +94,6 @@
 							<version>${project.version}</version>
 						</dependency>
 					</newVersion>
-					<oldClassPathDependencies>
-						<dependency>
-							<groupId>com.github.siom79.japicmp</groupId>
-							<artifactId>japicmp-test-service-v1</artifactId>
-							<version>${project.version}</version>
-						</dependency>
-					</oldClassPathDependencies>
-					<newClassPathDependencies>
-						<dependency>
-							<groupId>com.github.siom79.japicmp</groupId>
-							<artifactId>japicmp-test-service-v2</artifactId>
-							<version>${project.version}</version>
-						</dependency>
-					</newClassPathDependencies>
 					<parameter>
 						<accessModifier>public</accessModifier>
 						<onlyModified>true</onlyModified>

japicmp-testbase/japicmp-test-service-impl-base/japicmp-test-service-test/src/test/java/japicmp/test/service/MavenPluginTestIT.java

@@ -22,6 +22,9 @@ public void testTextOutput() throws IOException {
 		Optional<String> lineOptional = findLineThatContains(lines, "SubclassAddsNewStaticField");
 		assertThat(lineOptional.isPresent(), is(true));
 		assertThat(lineOptional.get().contains("***!"), is(true));
+		lineOptional = findLineThatContains(lines, "SuperclassChanged");
+		assertThat(lineOptional.isPresent(), is(true));
+		assertThat(lineOptional.get().contains("***!"), is(true));
 	}
 
 	private Optional<String> findLineThatContains(List<String> lines, String str) {

japicmp-testbase/japicmp-test-service-impl-base/japicmp-test-service-v1/src/main/java/japicmp/test/service/InterfaceMethodAdded.java

@@ -1,4 +1,4 @@
-package japicmp.test.service;
+package japicmp.test.service; // v1
 
 public interface InterfaceMethodAdded {
 }

japicmp-testbase/japicmp-test-service-impl-base/japicmp-test-service-v1/src/main/java/japicmp/test/service/InterfaceMethodRemoved.java

@@ -1,4 +1,4 @@
-package japicmp.test.service;
+package japicmp.test.service; // v1
 
 public interface InterfaceMethodRemoved {
 	void methodRemoved();

japicmp-testbase/japicmp-test-service-impl-base/japicmp-test-service-v1/src/main/java/japicmp/test/service/SuperclassV1.java

@@ -0,0 +1,4 @@
+package japicmp.test.service; // v1
+
+public class SuperclassV1 {
+}

japicmp-testbase/japicmp-test-service-impl-base/japicmp-test-service-v1/src/main/java/japicmp/test/service/SuperclassWithSubclassAddsNewStaticField.java

@@ -1,4 +1,4 @@
-package japicmp.test.service;
+package japicmp.test.service; // v1
 
 public class SuperclassWithSubclassAddsNewStaticField {
 	public static final int field = 42;

japicmp-testbase/japicmp-test-service-impl-base/japicmp-test-service-v2/src/main/java/japicmp/test/service/InterfaceMethodAdded.java

@@ -1,4 +1,4 @@
-package japicmp.test.service;
+package japicmp.test.service; // v2
 
 public interface InterfaceMethodAdded {
 

japicmp-testbase/japicmp-test-service-impl-base/japicmp-test-service-v2/src/main/java/japicmp/test/service/InterfaceMethodRemoved.java

@@ -1,4 +1,4 @@
-package japicmp.test.service;
+package japicmp.test.service; // v2
 
 public interface InterfaceMethodRemoved {
 }

japicmp-testbase/japicmp-test-service-impl-base/japicmp-test-service-v2/src/main/java/japicmp/test/service/SuperclassV2.java

@@ -0,0 +1,4 @@
+package japicmp.test.service; // v2
+
+public class SuperclassV2 {
+}

japicmp-testbase/japicmp-test-service-impl-base/japicmp-test-service-v2/src/main/java/japicmp/test/service/SuperclassWithSubclassAddsNewStaticField.java

@@ -1,4 +1,4 @@
-package japicmp.test.service;
+package japicmp.test.service; // v2
 
 public class SuperclassWithSubclassAddsNewStaticField {
 	public static final int field = 42;

japicmp/src/main/java/japicmp/cmp/JApiCmpArchive.java

@@ -20,4 +20,10 @@ public File getFile() {
 	public Version getVersion() {
 		return version;
 	}
+
+	@Override
+	public String toString() {
+		return file + "@" + version.getStringVersion();
+	}
+
 }