You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2015/04/10 09:41:42 UTC
svn commit: r1672574 -
/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
Author: cziegeler
Date: Fri Apr 10 07:41:42 2015
New Revision: 1672574
URL: http://svn.apache.org/r1672574
Log:
Remove unused code and add failing project to exception
Modified:
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
Modified: sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java?rev=1672574&r1=1672573&r2=1672574&view=diff
==============================================================================
--- sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java (original)
+++ sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java Fri Apr 10 07:41:42 2015
@@ -18,9 +18,7 @@ package org.apache.sling.maven.slingstar
import java.io.File;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import org.apache.maven.AbstractMavenLifecycleParticipant;
import org.apache.maven.MavenExecutionException;
@@ -71,25 +69,19 @@ public class DependencyLifecycleParticip
@Override
public void afterProjectsRead(final MavenSession session) throws MavenExecutionException {
- log.info("Searching for slingstart projects...");
- try {
- final Map<String, MavenProject> projectMap = new HashMap<String, MavenProject>();
- for (final MavenProject project : session.getProjects()) {
- projectMap.put(project.getGroupId() + ":" + project.getArtifactId() + ":" + project.getVersion(),
- project);
- }
-
+ log.debug("Searching for slingstart projects...");
for (final MavenProject project : session.getProjects()) {
for (Plugin plugin : project.getBuild().getPlugins()) {
if (plugin.getArtifactId().equals(PLUGIN_ID)) {
- addDependencies(artifactHandlerManager, resolver, log,
- session, project, plugin);
+ try {
+ addDependencies(artifactHandlerManager, resolver, log,
+ session, project, plugin);
+ } catch (final Exception e) {
+ throw new MavenExecutionException("Unable to determine plugin-based dependencies for project " + project, e);
+ }
}
}
}
- } catch (final Exception e) {
- throw new MavenExecutionException("Unable to determine plugin-based dependencies", e);
- }
}
public static void addDependencies(final ArtifactHandlerManager artifactHandlerManager,