You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2008/08/13 00:36:35 UTC

svn commit: r685355 - in /maven: components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/lifecycle/ core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/ core-integration-testing/tr...

Author: jdcasey
Date: Tue Aug 12 15:36:35 2008
New Revision: 685355

URL: http://svn.apache.org/viewvc?rev=685355&view=rev
Log:
[MNG-3703][MNG-3705] Fixing ${executedProject} for reports, and ensuring that project.getExecutionProject() will provide a concrete, relevant project instance for reports as well. Also improving the integration test for MNG-3703.

Added:
    maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/src/main/java/jar/CheckReport.java
Removed:
    maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/readme.txt
Modified:
    maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
    maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3703ExecutionProjectWithRelativePathsTest.java
    maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/pom.xml
    maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/src/main/java/jar/AbstractCheckMojo.java
    maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/src/main/java/jar/CheckMojo.java
    maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/project/pom.xml

Modified: maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=685355&r1=685354&r2=685355&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java (original)
+++ maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java Tue Aug 12 15:36:35 2008
@@ -19,6 +19,18 @@
  * under the License.
  */
 
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Stack;
+import java.util.StringTokenizer;
+
 import org.apache.maven.BuildFailureException;
 import org.apache.maven.artifact.handler.ArtifactHandler;
 import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
@@ -77,18 +89,6 @@
 import org.codehaus.plexus.util.xml.Xpp3DomWriter;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Stack;
-import java.util.StringTokenizer;
-
 /**
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
@@ -574,6 +574,40 @@
             }
             
             calculateConcreteConfiguration( mojoExecution, project, session );
+            
+            List reportExecutions = null;
+            if ( mojoDescriptor.isRequiresReports() )
+            {
+                reportExecutions = getReportExecutions( project, forkEntryPoints, mojoExecution, session );
+            }
+            
+            boolean hasFork = false;
+            if ( mojoDescriptor.getExecutePhase() != null || mojoDescriptor.getExecuteGoal() != null )
+            {
+                hasFork = true;
+            }
+            else if ( reportExecutions != null )
+            {
+                for ( Iterator it = reportExecutions.iterator(); it.hasNext(); )
+                {
+                    MojoExecution reportExecution = (MojoExecution) it.next();
+                    MojoDescriptor reportDescriptor = reportExecution.getMojoDescriptor();
+                    if ( reportDescriptor.getExecutePhase() != null || reportDescriptor.getExecuteGoal() != null )
+                    {
+                        hasFork = true;
+                    }
+                }
+                
+            }
+            
+            if ( hasFork )
+            {
+                MavenProject executionProject = new MavenProject( project );
+                
+                calculateConcreteState( executionProject, session );
+                
+                project.setExecutionProject( executionProject );
+            }
 
             if ( mojoDescriptor.getExecutePhase() != null || mojoDescriptor.getExecuteGoal() != null )
             {
@@ -582,13 +616,11 @@
                 forkLifecycle( mojoDescriptor, forkEntryPoints, session, project );
 
                 forkEntryPoints.pop();
-                
-                calculateConcreteState( project.getExecutionProject(), session );
             }
             
             if ( mojoDescriptor.isRequiresReports() )
             {
-                List reports = getReports( project, forkEntryPoints, mojoExecution, session );
+                List reports = getReports( reportExecutions, project, mojoExecution, session );
 
                 mojoExecution.setReports( reports );
 
@@ -607,6 +639,12 @@
                     }
                 }
             }
+            
+            if ( hasFork )
+            {
+                // TODO: Would be nice to find a way to cause the execution project to stay in a concrete state...
+                calculateConcreteState( project.getExecutionProject(), session );
+            }
 
             try
             {
@@ -642,6 +680,8 @@
                 throw new LifecycleExecutionException( e.getMessage(), e );
             }
             
+            project.setExecutionProject( null );
+            
             restoreDynamicState( project, session );
             
             if ( usesAllProjects )
@@ -793,7 +833,7 @@
         }
     }
 
-    private List getReports( MavenProject project, Stack forkEntryPoints, MojoExecution mojoExecution, MavenSession session )
+    private List getReportExecutions( MavenProject project, Stack forkEntryPoints, MojoExecution mojoExecution, MavenSession session )
         throws LifecycleExecutionException, PluginNotFoundException
     {
         List reportPlugins = project.getReportPlugins();
@@ -862,7 +902,7 @@
 
                 if ( reportSets == null || reportSets.isEmpty() )
                 {
-                    reports.addAll( getReports( reportPlugin, forkEntryPoints, null, project, session, mojoExecution ) );
+                    reports.addAll( getReportExecutions( reportPlugin, forkEntryPoints, null, project, session, mojoExecution ) );
                 }
                 else
                 {
@@ -870,15 +910,15 @@
                     {
                         ReportSet reportSet = (ReportSet) j.next();
 
-                        reports.addAll( getReports( reportPlugin, forkEntryPoints, reportSet, project, session, mojoExecution ) );
+                        reports.addAll( getReportExecutions( reportPlugin, forkEntryPoints, reportSet, project, session, mojoExecution ) );
                     }
                 }
             }
         }
         return reports;
     }
-
-    private List getReports( ReportPlugin reportPlugin,
+    
+    private List getReportExecutions( ReportPlugin reportPlugin,
                              Stack forkEntryPoints,
                              ReportSet reportSet,
                              MavenProject project,
@@ -909,38 +949,53 @@
                 }
 
                 MojoExecution reportExecution = new MojoExecution( mojoDescriptor, id );
+                reports.add( reportExecution );
+            }
+        }
+        return reports;
+    }
 
-                try
-                {
-                    MavenReport reportMojo = pluginManager.getReport( project, reportExecution, session );
+    private List getReports( List reportExecutions, MavenProject project, MojoExecution mojoExecution, MavenSession session )
+        throws LifecycleExecutionException
+    {
+        List reports = new ArrayList();
+        
+        for ( Iterator it = reportExecutions.iterator(); it.hasNext(); )
+        {
+            MojoExecution reportExecution = (MojoExecution) it.next();
+            PluginDescriptor pluginDescriptor = reportExecution.getMojoDescriptor().getPluginDescriptor();
+            
+            try
+            {
+                MavenReport reportMojo = pluginManager.getReport( project, reportExecution, session );
 
-                    // Comes back null if it was a plugin, not a report - these are mojos in the reporting plugins that are not reports
-                    if ( reportMojo != null )
-                    {
-                        reports.add( reportMojo );
-                        mojoExecution.addMojoExecution( reportExecution );
-                    }
-                }
-                catch ( PluginManagerException e )
-                {
-                    throw new LifecycleExecutionException(
-                        "Error getting reports from the plugin '" + reportPlugin.getKey() + "': " + e.getMessage(), e );
-                }
-                catch ( PluginConfigurationException e )
-                {
-                    throw new LifecycleExecutionException(
-                        "Error getting reports from the plugin '" + reportPlugin.getKey() + "'", e );
-                }
-                catch ( ArtifactNotFoundException e )
+                // Comes back null if it was a plugin, not a report - these are mojos in the reporting plugins that are not reports
+                if ( reportMojo != null )
                 {
-                    throw new LifecycleExecutionException( e.getMessage(), e );
-                }
-                catch ( ArtifactResolutionException e )
-                {
-                    throw new LifecycleExecutionException( e.getMessage(), e );
+                    reports.add( reportMojo );
+                    mojoExecution.addMojoExecution( reportExecution );
                 }
             }
+            catch ( PluginManagerException e )
+            {
+                throw new LifecycleExecutionException(
+                    "Error getting reports from the plugin '" + pluginDescriptor.getId() + "': " + e.getMessage(), e );
+            }
+            catch ( PluginConfigurationException e )
+            {
+                throw new LifecycleExecutionException(
+                    "Error getting reports from the plugin '" + pluginDescriptor.getId() + "'", e );
+            }
+            catch ( ArtifactNotFoundException e )
+            {
+                throw new LifecycleExecutionException( e.getMessage(), e );
+            }
+            catch ( ArtifactResolutionException e )
+            {
+                throw new LifecycleExecutionException( e.getMessage(), e );
+            }
         }
+        
         return reports;
     }
 
@@ -1121,12 +1176,11 @@
             removeFromLifecycle( forkEntryPoints, lifecycleMappings );
         }
 
-        MavenProject executionProject = new MavenProject( project );
         if ( targetPhase != null )
         {
             Lifecycle lifecycle = getLifecycleForPhase( targetPhase );
 
-            executeGoalWithLifecycle( targetPhase, forkEntryPoints, session, lifecycleMappings, executionProject,
+            executeGoalWithLifecycle( targetPhase, forkEntryPoints, session, lifecycleMappings, project.getExecutionProject(),
                                       lifecycle );
         }
         else
@@ -1134,9 +1188,8 @@
             String goal = mojoDescriptor.getExecuteGoal();
             MojoDescriptor desc = getMojoDescriptor( pluginDescriptor, goal );
             executeGoals( Collections.singletonList( new MojoExecution( desc ) ), forkEntryPoints, session,
-                          executionProject );
+                          project.getExecutionProject() );
         }
-        project.setExecutionProject( executionProject );
     }
 
     private Lifecycle getLifecycleForPhase( String phase )

Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3703ExecutionProjectWithRelativePathsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3703ExecutionProjectWithRelativePathsTest.java?rev=685355&r1=685354&r2=685355&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3703ExecutionProjectWithRelativePathsTest.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3703ExecutionProjectWithRelativePathsTest.java Tue Aug 12 15:36:35 2008
@@ -20,22 +20,17 @@
 package org.apache.maven.integrationtests;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
 
 import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
 import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
  * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-3703">MNG-3703</a>.
- *
- * @todo Fill in a better description of what this test verifies!
  * 
+ * @todo Fill in a better description of what this test verifies!
  * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
  * @author jdcasey
- * 
  */
 public class MavenITmng3703ExecutionProjectWithRelativePathsTest
     extends AbstractMavenIntegrationTestCase
@@ -46,7 +41,7 @@
         super( "(2.0.9,)" ); // only test in 2.0.9+
     }
 
-    public void testitMNG3703 ()
+    public void testForkFromMojo()
         throws Exception
     {
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3703-executionProjectRelativePaths" );
@@ -61,12 +56,42 @@
 
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
+
+        verifier = new Verifier( projectDir.getAbsolutePath() );
+
+        verifier.executeGoal( "package" );
+
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
         
+        File logFile = new File( projectDir, "log.txt" );
+        logFile.renameTo( new File( projectDir, "log-mojo.txt" ) );
+    }
+
+    public void testForkFromReport()
+        throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3703-executionProjectRelativePaths" );
+        File pluginDir = new File( testDir, "maven-mng3703-plugin" );
+        File projectDir = new File( testDir, "project" );
+
+        Verifier verifier;
+
+        verifier = new Verifier( pluginDir.getAbsolutePath() );
+
+        verifier.executeGoal( "install" );
+
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
+
         verifier = new Verifier( projectDir.getAbsolutePath() );
 
-        verifier.executeGoal( "validate" );
+        verifier.executeGoal( "site" );
 
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
+        
+        File logFile = new File( projectDir, "log.txt" );
+        logFile.renameTo( new File( projectDir, "log-report.txt" ) );
     }
 }

Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/pom.xml?rev=685355&r1=685354&r2=685355&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/pom.xml Tue Aug 12 15:36:35 2008
@@ -24,5 +24,10 @@
     	<artifactId>maven-project</artifactId>
     	<version>2.0.9</version>
     </dependency>
+    <dependency>
+    	<groupId>org.apache.maven.reporting</groupId>
+    	<artifactId>maven-reporting-impl</artifactId>
+    	<version>2.0.4.1</version>
+    </dependency>
   </dependencies>
 </project>
\ No newline at end of file

Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/src/main/java/jar/AbstractCheckMojo.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/src/main/java/jar/AbstractCheckMojo.java?rev=685355&r1=685354&r2=685355&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/src/main/java/jar/AbstractCheckMojo.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/src/main/java/jar/AbstractCheckMojo.java Tue Aug 12 15:36:35 2008
@@ -56,7 +56,7 @@
         
         if ( getTestProject().getBasedir() == null )
         {
-            throw new MojoExecutionException( "Basedir is null on the " + getTestProjectLabel() + " instance." );
+            throw new MojoExecutionException( "Basedir is null on the " + getTestProjectLabel() + " instance (during mojo execution)." );
         }
         
         String executionBasedir = getTestProject().getBasedir().getAbsolutePath();

Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/src/main/java/jar/CheckMojo.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/src/main/java/jar/CheckMojo.java?rev=685355&r1=685354&r2=685355&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/src/main/java/jar/CheckMojo.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/src/main/java/jar/CheckMojo.java Tue Aug 12 15:36:35 2008
@@ -20,8 +20,7 @@
 
 /**
  * @goal check
- * @phase validate
- * @execute phase="validate"
+ * @execute phase="compile"
  */
 public class CheckMojo
     extends AbstractCheckMojo
@@ -34,6 +33,6 @@
     
     protected String getTestProjectLabel()
     {
-        return "execution project";
+        return "forked project";
     }
 }

Added: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/src/main/java/jar/CheckReport.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/src/main/java/jar/CheckReport.java?rev=685355&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/src/main/java/jar/CheckReport.java (added)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/src/main/java/jar/CheckReport.java Tue Aug 12 15:36:35 2008
@@ -0,0 +1,152 @@
+package jar;
+
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import org.apache.maven.doxia.siterenderer.DefaultSiteRenderer;
+import org.apache.maven.doxia.siterenderer.Renderer;
+import org.apache.maven.project.MavenProject;
+
+import com.sun.tools.jdi.LinkedHashMap;
+import org.apache.maven.reporting.AbstractMavenReport;
+import org.apache.maven.reporting.MavenReportException;
+
+/**
+ * @goal check-report
+ * @execute phase="compile"
+ */
+public class CheckReport
+    extends AbstractMavenReport
+{
+
+    /**
+     * @parameter default-value="${project}"
+     * @required
+     * @readonly
+     */
+    private MavenProject project;
+
+    /**
+     * @parameter default-value="${executedProject}"
+     * @required
+     * @readonly
+     */
+    private MavenProject executionProject;
+
+    /**
+     * @parameter default-value="${project.build.directory}/generated-site/mng3703"
+     * @readonly
+     */
+    private String outputDirectory;
+
+    protected void executeReport( Locale locale )
+        throws MavenReportException
+    {
+        if ( getMainProject().getBasedir() == null )
+        {
+            throw new MavenReportException( "Basedir is null on the main project instance." );
+        }
+
+        if ( executionProject.getBasedir() == null )
+        {
+            throw new MavenReportException( "Basedir is null on the forked project instance (during report execution)." );
+        }
+
+        String executionBasedir = executionProject.getBasedir().getAbsolutePath();
+
+        Map failedPaths = new LinkedHashMap();
+
+        checkListOfPaths( executionProject.getCompileSourceRoots(), executionBasedir, "compileSourceRoots", failedPaths );
+        checkListOfPaths( executionProject.getTestCompileSourceRoots(), executionBasedir, "testCompileSourceRoots",
+                          failedPaths );
+        checkListOfPaths( executionProject.getScriptSourceRoots(), executionBasedir, "scriptSourceRoots", failedPaths );
+
+        if ( !failedPaths.isEmpty() )
+        {
+            StringBuffer buffer = new StringBuffer();
+            buffer.append( "The following paths were relative (should have been absolute):" );
+            for ( Iterator it = failedPaths.entrySet().iterator(); it.hasNext(); )
+            {
+                Map.Entry entry = (Map.Entry) it.next();
+
+                buffer.append( "\n-  " ).append( entry.getKey() ).append( ": '" ).append( entry.getValue() ).append(
+                                                                                                                     "'" );
+            }
+
+            throw new MavenReportException( buffer.toString() );
+        }
+    }
+
+    protected MavenProject getMainProject()
+    {
+        return project;
+    }
+
+    protected MavenProject getExecutionProject()
+    {
+        return executionProject;
+    }
+
+    private void checkListOfPaths( List paths, String base, String label, Map failedPaths )
+    {
+        if ( paths != null && !paths.isEmpty() )
+        {
+            for ( int i = 0; i < paths.size(); i++ )
+            {
+                String root = (String) paths.get( i );
+                if ( !root.startsWith( base ) )
+                {
+                    failedPaths.put( label + "[" + i + "]", root );
+                }
+            }
+        }
+    }
+
+    protected String getOutputDirectory()
+    {
+        return outputDirectory;
+    }
+
+    protected MavenProject getProject()
+    {
+        return project;
+    }
+
+    protected Renderer getSiteRenderer()
+    {
+        return new DefaultSiteRenderer();
+    }
+
+    public String getDescription( Locale locale )
+    {
+        return getOutputName();
+    }
+
+    public String getName( Locale locale )
+    {
+        return getOutputName();
+    }
+
+    public String getOutputName()
+    {
+        return "check-report";
+    }
+}

Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/project/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/project/pom.xml?rev=685355&r1=685354&r2=685355&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/project/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/project/pom.xml Tue Aug 12 15:36:35 2008
@@ -1,9 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?><project>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.its.mng3703</groupId>
+  <groupId>org.apache.maven.its.mng3704</groupId>
   <artifactId>project</artifactId>
   <name>project</name>
   <version>1</version>
+  <url>http://maven.apache.org</url>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
   
   <build>
     <plugins>
@@ -13,21 +22,31 @@
         <version>1</version>
         <executions>
           <execution>
-            <id>check</id>
-            <phase>validate</phase>
+            <id>test</id>
+            <phase>package</phase>
             <goals>
               <goal>check</goal>
             </goals>
           </execution>
-          <execution>
-            <id>run</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
         </executions>
       </plugin>
     </plugins>
   </build>
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.mng3703</groupId>
+        <artifactId>maven-mng3703-plugin</artifactId>
+        <version>1</version>
+        <reportSets>
+          <reportSet>
+            <id>test-report</id>
+            <reports>
+              <report>check-report</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+    </plugins>
+  </reporting>
 </project>
\ No newline at end of file