Use effective reactor in SnapshotFinder

hinerm · hinerm · commit 601f5f4e971a · 2015-03-25T14:52:46.000-05:00
The RequireReproducibleBuilds enforcer rule and VerifyNoSnapshots mojo now attempt to use the effective reactor instead of the invocation-based reactor as defined by the framework. This should allow multi-module projects that maintain internal SNAPSHOT couplings to build individual submodules, provided: * They are fully connected via parent/module linkages * The complete multi-module project is on disk This is necessary for use cases such as the Eclipse m2e plugin, which flattens multi-module projects to individual builds. Note that the Maven model allows multi-module configuration where the aggregator is not a parent of any of its modules. In this case, since the submodules have no reference to their aggregator, SNAPSHOT couplings must be prohibited. Closes #12
diff --git a/src/main/java/org/scijava/maven/plugin/RequireReproducibleBuilds.java b/src/main/java/org/scijava/maven/plugin/RequireReproducibleBuilds.java
@@ -38,9 +38,11 @@
 import org.apache.maven.enforcer.rule.api.EnforcerRule;
 import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
 import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
+import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
+import org.apache.maven.project.ProjectBuildingException;
 import org.apache.maven.shared.dependency.tree.DependencyTreeBuilder;
 import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
@@ -81,18 +83,29 @@ public void execute(final EnforcerRuleHelper helper)
 		final Log log = helper.getLog();
 		try {
 			final MavenProject project = (MavenProject) helper.evaluate("${project}");
+			final MavenSession session = (MavenSession) helper.evaluate("${session}");
 			final ArtifactRepository localRepository =
 				(ArtifactRepository) helper.evaluate("${localRepository}");
-
-			@SuppressWarnings("unchecked")
-			final List<MavenProject> reactorModules =
-				(List<MavenProject>) helper.evaluate("${reactorProjects}");
 			final MavenProjectBuilder projectBuilder =
 				(MavenProjectBuilder) helper.getComponent(MavenProjectBuilder.class);
 			final DependencyTreeBuilder treeBuilder =
 				(DependencyTreeBuilder) helper
 					.getComponent(DependencyTreeBuilder.class);
 
+			@SuppressWarnings("unchecked")
+			List<MavenProject> reactorModules =
+				(List<MavenProject>) helper.evaluate("${reactorProjects}");
+
+			try {
+				reactorModules =
+					DependencyUtils.findEffectiveReactor(reactorModules, session,
+						project, projectBuilder, localRepository);
+			}
+			catch (ProjectBuildingException exc) {
+				log
+					.warn("Error during project construction:\n" + exc.getMessage(), exc);
+			}
+
 			// populate groupIds
 			final Set<String> ids = new HashSet<String>();
 			if (groupId != null) ids.add(groupId);
@@ -140,4 +153,5 @@ public boolean isResultValid(final EnforcerRule cachedRule) {
 	public String getCacheId() {
 		return null;
 	}
+
 }
diff --git a/src/main/java/org/scijava/maven/plugin/VerifyNoSnapshotsMojo.java b/src/main/java/org/scijava/maven/plugin/VerifyNoSnapshotsMojo.java
@@ -35,11 +35,13 @@
 import java.util.Set;
 
 import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
+import org.apache.maven.project.ProjectBuildingException;
 import org.apache.maven.shared.dependency.tree.DependencyTreeBuilder;
 
 /**
@@ -63,6 +65,9 @@ public class VerifyNoSnapshotsMojo extends AbstractMojo {
 
 	// -- Parameters --
 
+	/** @parameter default-value="${session}" */
+	private MavenSession mavenSession;
+
 	/** @parameter default-value="${project}" */
 	private MavenProject mavenProject;
 
@@ -99,6 +104,17 @@ public class VerifyNoSnapshotsMojo extends AbstractMojo {
 	@Override
 	public void execute() throws MojoExecutionException, MojoFailureException {
 
+
+		try {
+			reactorModules =
+				DependencyUtils.findEffectiveReactor(reactorModules, mavenSession,
+					mavenProject, projectBuilder, localRepository);
+		}
+		catch (ProjectBuildingException exc) {
+			getLog()
+				.warn("Error during project construction:\n" + exc.getMessage(), exc);
+		}
+
 		// Enter recursive project checking
 		final SnapshotFinder fs =
 			new SnapshotFinder(projectBuilder, localRepository, mavenProject
