You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jv...@apache.org on 2003/01/01 04:10:30 UTC
cvs commit: jakarta-turbine-maven/src/java/org/apache/maven/plugin PluginManager.java
jvanzyl 2002/12/31 19:10:30
Modified: src/java/org/apache/maven MavenSession.java
src/java/org/apache/maven/jelly/tags/maven ReactorTag.java
src/java/org/apache/maven/plugin PluginManager.java
Log:
o Correcting the project verification. I put it all in the attainGoals method
for now so that every project will be verified. We can add some options
to make this configurable. Thanks to Dion for pointing this one out.
Revision Changes Path
1.2 +7 -1 jakarta-turbine-maven/src/java/org/apache/maven/MavenSession.java
Index: MavenSession.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/MavenSession.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MavenSession.java 31 Dec 2002 07:04:31 -0000 1.1
+++ MavenSession.java 1 Jan 2003 03:10:30 -0000 1.2
@@ -320,6 +320,12 @@
getPluginManager().attainGoals( getRootProject() );
}
+ /**
+ *
+ * @param project
+ * @throws UnknownGoalException
+ * @throws Exception
+ */
public void attainGoals( Project project )
throws UnknownGoalException, Exception
{
1.3 +2 -11 jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/maven/ReactorTag.java
Index: ReactorTag.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/maven/ReactorTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ReactorTag.java 31 Dec 2002 08:28:19 -0000 1.2
+++ ReactorTag.java 1 Jan 2003 03:10:30 -0000 1.3
@@ -106,9 +106,6 @@
/** Banner to display when each project is processed. */
private String banner;
- /** Do we want to verifiy deps. By default, yes. */
- private boolean verifyDependencies = true;
-
/**
* Post processing flag. If this is set then we will hold on to the
* processed projects, otherwise they will be dumped.
@@ -178,13 +175,7 @@
System.out.println( "| " + getBanner() + " " + project.getName() );
System.out.println( "+----------------------------------------" );
- if ( verifyDependencies )
- {
- project.verifyDependencies();
- }
-
project.setGoalNames( getGoals() );
-
getMavenContext().getMavenSession().attainGoals( project );
if ( getPostProcessing() )
1.23 +5 -1 jakarta-turbine-maven/src/java/org/apache/maven/plugin/PluginManager.java
Index: PluginManager.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/plugin/PluginManager.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- PluginManager.java 31 Dec 2002 07:03:47 -0000 1.22
+++ PluginManager.java 1 Jan 2003 03:10:30 -0000 1.23
@@ -461,6 +461,10 @@
public void attainGoals( Project project )
throws UnknownGoalException, Exception
{
+ // Before attempting to attain the goals verify the project
+ // if desired.
+ project.verifyDependencies();
+
// Currently we will not attempt to load a maven.xml file when the project.xml
// file is not present.
if ( project.getFile() != null )