maven-m2-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tryg...@apache.org
Subject cvs commit: maven-components/maven-core/src/test/resources/validation missing-1-pom.xml missing-artifactId-pom.xml missing-groupId-pom.xml missing-type-pom.xml missing-version-pom.xml
Date Sat, 19 Jun 2004 20:20:55 GMT
trygvis     2004/06/19 13:20:55

  Modified:    maven-core/src/main/java/org/apache/maven/project
                        DefaultMavenProjectBuilder.java
                        MavenProjectBuilder.java
               maven-core/src/main/resources/org/apache/maven plexus.xml
               maven-core/src/test/java/org/apache/maven/project
                        AbstractProjectTestCase.java
                        DefaultProjectBuilderTest.java
                        ProjectReactorTest.java
               maven-core/src/test/resources/projects
                        child-which-inherits-from-super-model.xml child.xml
               maven-core/src/test/resources/projects/base-directory-alignment
                        project-which-needs-directory-alignment-child.xml
               maven-core/src/test/resources/projects/recursive-inheritance/b
                        project.xml
               maven-core/src/test/resources/projects/recursive-inheritance/c
                        project.xml
               maven-core/src/test/resources/projects/recursive-inheritance/d
                        project.xml
  Added:       maven-core/src/main/java/org/apache/maven/project
                        MavenProjectBuildingResult.java
               maven-core/src/main/java/org/apache/maven/project/validation
                        DefaultModelValidator.java
                        ModelValidationResult.java ModelValidator.java
               maven-core/src/test/java/org/apache/maven/project/validation
                        DefaultModelValidatorTest.java
               maven-core/src/test/resources/validation missing-1-pom.xml
                        missing-artifactId-pom.xml missing-groupId-pom.xml
                        missing-type-pom.xml missing-version-pom.xml
  Log:
  o Adding ModelValidator with test case.
  o Updating the poms used in other tests because they wasn't valid by the
    definition of a valid pom.
  
  Revision  Changes    Path
  1.4       +37 -18    maven-components/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
  
  Index: DefaultMavenProjectBuilder.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultMavenProjectBuilder.java	15 Jun 2004 04:10:04 -0000	1.3
  +++ DefaultMavenProjectBuilder.java	19 Jun 2004 20:20:54 -0000	1.4
  @@ -16,6 +16,21 @@
    * limitations under the License.
    */
   
  +import java.io.File;
  +import java.io.FileReader;
  +import java.io.IOException;
  +import java.io.InputStreamReader;
  +import java.io.Reader;
  +import java.io.StringReader;
  +import java.io.StringWriter;
  +import java.util.ArrayList;
  +import java.util.HashMap;
  +import java.util.Iterator;
  +import java.util.LinkedList;
  +import java.util.List;
  +import java.util.Map;
  +import java.util.Properties;
  +
   import org.apache.maven.artifact.MavenArtifact;
   import org.apache.maven.artifact.collector.ArtifactCollector;
   import org.apache.maven.artifact.factory.MavenArtifactFactory;
  @@ -25,7 +40,10 @@
   import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
   import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
   import org.apache.maven.project.inheritance.ModelInheritanceAssembler;
  +import org.apache.maven.project.validation.ModelValidationResult;
  +import org.apache.maven.project.validation.ModelValidator;
   import org.apache.maven.wagon.manager.WagonManager;
  +
   import org.codehaus.plexus.logging.AbstractLogEnabled;
   import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
   import org.codehaus.plexus.util.CollectionUtils;
  @@ -34,28 +52,12 @@
   import org.codehaus.plexus.util.dag.DAG;
   import org.codehaus.plexus.util.dag.TopologicalSorter;
   
  -import java.io.File;
  -import java.io.FileReader;
  -import java.io.IOException;
  -import java.io.InputStreamReader;
  -import java.io.Reader;
  -import java.io.StringReader;
  -import java.io.StringWriter;
  -import java.util.ArrayList;
  -import java.util.HashMap;
  -import java.util.Iterator;
  -import java.util.LinkedList;
  -import java.util.List;
  -import java.util.Map;
  -import java.util.Properties;
  -
   public class DefaultMavenProjectBuilder
       extends AbstractLogEnabled
       implements MavenProjectBuilder, Initializable
   {
  -    private MavenXpp3Writer modelWriter;
  -
  -    private MavenXpp3Reader modelReader;
  +    ///////////////////////////////////////////////////////////////////////////
  +    // Requirements
   
       private MavenArtifactFactory artifactory;
   
  @@ -65,6 +67,15 @@
   
       private WagonManager wagonManager;
   
  +    private ModelValidator validator;
  +
  +    ///////////////////////////////////////////////////////////////////////////
  +    // Private Members
  +
  +    private MavenXpp3Writer modelWriter;
  +
  +    private MavenXpp3Reader modelReader;
  +
       private Model superModel;
   
       public void initialize()
  @@ -124,10 +135,18 @@
               }
               */
   
  +            ModelValidationResult validationResult = validator.validate( project.getModel()
);
  +
  +            if ( validationResult.getMessageCount() > 0 )
  +            {
  +                throw new ProjectBuildingException( "Exception while building project:
" + validationResult.toString() );
  +            }
  +
               project.setFile( projectDescriptor );
   
               project.initialize();
   
  +//            return new MavenProjectBuildingResult( project );
               return project;
           }
           catch ( Exception e )
  
  
  
  1.2       +0 -1      maven-components/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
  
  Index: MavenProjectBuilder.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MavenProjectBuilder.java	11 Jun 2004 15:11:54 -0000	1.1
  +++ MavenProjectBuilder.java	19 Jun 2004 20:20:54 -0000	1.2
  @@ -44,5 +44,4 @@
   
       List getSortedProjects( List projects )
           throws Exception;
  -
   }
  
  
  
  1.1                  maven-components/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuildingResult.java
  
  Index: MavenProjectBuildingResult.java
  ===================================================================
  package org.apache.maven.project;
  
  /*
   * LICENSE
   */
  
  import org.apache.maven.project.validation.ModelValidationResult;
  
  /**
   * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
   * @version $Id: MavenProjectBuildingResult.java,v 1.1 2004/06/19 20:20:54 trygvis Exp $
   */
  public class MavenProjectBuildingResult
  {
      /** */
      private MavenProject project;
  
      /** */
      private ModelValidationResult modelValidationResult;
  
      /** */
      private boolean successful;
  
      /**
       * 
       * @param project
       */
      public MavenProjectBuildingResult( MavenProject project )
      {
          this.project = project;
  
          successful = true;
      }
  
      public MavenProjectBuildingResult( ModelValidationResult modelValidationResult )
      {
          this.modelValidationResult = modelValidationResult;
  
          successful = modelValidationResult.getMessageCount() == 0;
      }
  
      /**
       * @return Returns the modelValidationResult.
       */
      public ModelValidationResult getModelValidationResult()
      {
          return modelValidationResult;
      }
  
      /**
       * @return Returns the project.
       */
      public MavenProject getProject()
      {
          return project;
      }
  
      /**
       * Returns true if the project is valid.
       * 
       * @return Returns true if the project is valid.
       */
      public boolean isSuccessful()
      {
          return successful;
      }
  }
  
  
  
  1.1                  maven-components/maven-core/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
  
  Index: DefaultModelValidator.java
  ===================================================================
  package org.apache.maven.project.validation;
  
  /*
   * LICENSE
   */
  
  import org.apache.maven.model.Model;
  
  /**
   * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
   * @version $Id: DefaultModelValidator.java,v 1.1 2004/06/19 20:20:54 trygvis Exp $
   */
  public class DefaultModelValidator
      implements ModelValidator
  {
      ///////////////////////////////////////////////////////////////////////////
      // ModelValidator Implementation
  
      public ModelValidationResult validate( Model model )
      {
          ModelValidationResult result = new ModelValidationResult();
  
          validateStringNotEmpty( "groupId", result, model.getGroupId() );
  
          validateStringNotEmpty( "artifactId", result, model.getArtifactId() );
  
          validateStringNotEmpty( "type", result, model.getType() );
  
          validateStringNotEmpty( "version", result, model.getVersion() );
  
          return result;
      }
  
      ///////////////////////////////////////////////////////////////////////////
      // Field validator
  
      /**
       * Asserts:
       *
       * <ul>
       *  <li><code>string.length != null</code>
       *  <li><code>string.length > 0</code>
       * </ul>
       */
      private boolean validateStringNotEmpty( String fieldName, ModelValidationResult result,
String string )
      {
          if ( !validateNotNull( fieldName, result, string ) )
              return false;
  
          if ( string.length() > 0 )
              return true;
  
          result.addMessage( "'" + fieldName + "' is empty." );
  
          return false;
      }
  
      /**
       * Asserts:
       *
       * <ul>
       *  <li><code>string != null</code>
       * </ul>
       */
      private boolean validateNotNull( String fieldName, ModelValidationResult result, Object
object )
      {
          if ( object != null )
              return true;
  
          result.addMessage( "'" + fieldName + "' is missing." );
  
          return false;
      }
  }
  
  
  
  1.1                  maven-components/maven-core/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java
  
  Index: ModelValidationResult.java
  ===================================================================
  package org.apache.maven.project.validation;
  
  /*
   * LICENSE
   */
  
  import java.util.ArrayList;
  import java.util.List;
  
  /**
   * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
   * @version $Id: ModelValidationResult.java,v 1.1 2004/06/19 20:20:54 trygvis Exp $
   */
  public class ModelValidationResult
  {
      /** */
      private final static String NEWLINE = System.getProperty( "line.separator" );
  
      /** */
      private List messages;
  
      public ModelValidationResult()
      {
          messages = new ArrayList();
      }
  
      public int getMessageCount()
      {
          return messages.size();
      }
  
      public String getMessage( int i )
      {
          return messages.get( i ).toString();
      }
  
      public void addMessage( String message )
      {
          messages.add( message );
      }
  
      public String toString()
      {
          if ( messages.size() == 0 )
              return "There was no validation errors.";
  
          StringBuffer message = new StringBuffer();
  
          if ( messages.size() == 1 )
              message.append( "There was 1 validation error: " );
          else
              message.append( "There was " + messages.size() + " validation errors: " + NEWLINE);
  
          for ( int i = 0; i < messages.size(); i++ )
          {
              message.append( "#" + (i + 1) + ": " + messages.get( i ).toString() + NEWLINE
);
          }
  
          return message.toString();
      }
  }
  
  
  
  1.1                  maven-components/maven-core/src/main/java/org/apache/maven/project/validation/ModelValidator.java
  
  Index: ModelValidator.java
  ===================================================================
  package org.apache.maven.project.validation;
  
  /*
   * LICENSE
   */
  
  import org.apache.maven.model.Model;
  
  /**
   * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
   * @version $Id: ModelValidator.java,v 1.1 2004/06/19 20:20:54 trygvis Exp $
   */
  public interface ModelValidator
  {
      String ROLE = ModelValidator.class.getName();
  
      ModelValidationResult validate( Model model );
  }
  
  
  
  1.11      +7 -0      maven-components/maven-core/src/main/resources/org/apache/maven/plexus.xml
  
  Index: plexus.xml
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/main/resources/org/apache/maven/plexus.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- plexus.xml	17 Jun 2004 22:04:37 -0000	1.10
  +++ plexus.xml	19 Jun 2004 20:20:54 -0000	1.11
  @@ -72,6 +72,9 @@
           <requirement>
             <role>org.apache.maven.wagon.manager.WagonManager</role>
           </requirement>
  +        <requirement>
  +          <role>org.apache.maven.project.validation.ModelValidator</role>
  +        </requirement>
         </requirements>
       </component>
       <component>
  @@ -111,6 +114,10 @@
       <component>
         <role>org.apache.maven.project.inheritance.ModelInheritanceAssembler</role>
         <implementation>org.apache.maven.project.inheritance.DefaultModelInheritanceAssembler</implementation>
  +    </component>
  +    <component>
  +      <role>org.apache.maven.project.validation.ModelValidator</role>
  +      <implementation>org.apache.maven.project.validation.DefaultModelValidator</implementation>
       </component>
       <component>
         <role>org.apache.maven.artifact.snapshot.SnapshotResolver</role>
  
  
  
  1.3       +2 -2      maven-components/maven-core/src/test/java/org/apache/maven/project/AbstractProjectTestCase.java
  
  Index: AbstractProjectTestCase.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/project/AbstractProjectTestCase.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractProjectTestCase.java	14 Jun 2004 17:42:41 -0000	1.2
  +++ AbstractProjectTestCase.java	19 Jun 2004 20:20:54 -0000	1.3
  @@ -3,9 +3,9 @@
   import java.io.File;
   import java.io.InputStream;
   
  -import org.codehaus.plexus.PlexusTestCase;
  -import org.codehaus.plexus.util.FileUtils;
   import org.apache.maven.MavenPlexusComponentTestBase;
  +
  +import org.codehaus.plexus.util.FileUtils;
   
   public class AbstractProjectTestCase
       extends MavenPlexusComponentTestBase
  
  
  
  1.4       +3 -7      maven-components/maven-core/src/test/java/org/apache/maven/project/DefaultProjectBuilderTest.java
  
  Index: DefaultProjectBuilderTest.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/project/DefaultProjectBuilderTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultProjectBuilderTest.java	14 Jun 2004 21:32:43 -0000	1.3
  +++ DefaultProjectBuilderTest.java	19 Jun 2004 20:20:54 -0000	1.4
  @@ -1,18 +1,14 @@
   package org.apache.maven.project;
   
  -import org.apache.maven.model.Build;
  +import java.io.File;
  +
   import org.apache.maven.model.Model;
  -import org.apache.maven.model.Resource;
  -import org.apache.maven.model.UnitTest;
   import org.apache.maven.project.helpers.ProjectTestHelper;
   
  -import java.io.File;
  -
   public class DefaultProjectBuilderTest
       extends AbstractProjectTestCase
           
  -{
  - 
  +{ 
       public DefaultProjectBuilderTest( String testName )
       {
           super( testName ); 
  
  
  
  1.2       +1 -2      maven-components/maven-core/src/test/java/org/apache/maven/project/ProjectReactorTest.java
  
  Index: ProjectReactorTest.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/project/ProjectReactorTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ProjectReactorTest.java	11 Jun 2004 15:11:55 -0000	1.1
  +++ ProjectReactorTest.java	19 Jun 2004 20:20:54 -0000	1.2
  @@ -9,7 +9,6 @@
   public class ProjectReactorTest
       extends AbstractProjectTestCase
   {
  -    
       public ProjectReactorTest( String testName )
       {
           super( testName );    
  @@ -34,7 +33,7 @@
   
           for ( int i = 0; i < files.length; i++ )
           {
  -            projects.add( projectBuilder.build( new File( f, files[i] ), false, false )
);
  +            projects.add( projectBuilder.build( new File( f, files[i] ), true, false )
);
           }
   
           List sortedProjects = projectBuilder.getSortedProjects( projects );
  
  
  
  1.1                  maven-components/maven-core/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java
  
  Index: DefaultModelValidatorTest.java
  ===================================================================
  package org.apache.maven.project.validation;
  
  /*
   * LICENSE
   */
  
  import java.io.FileReader;
  import java.io.Reader;
  
  import org.apache.maven.MavenPlexusComponentTestBase;
  import org.apache.maven.model.Model;
  import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
  
  /**
   * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
   * @version $Id: DefaultModelValidatorTest.java,v 1.1 2004/06/19 20:20:54 trygvis Exp $
   */
  public class DefaultModelValidatorTest
      extends MavenPlexusComponentTestBase
  {
      private Model model;
  
      private ModelValidator validator;
  
      public DefaultModelValidatorTest( String testName )
      {
          super( testName );
      }
  
      public void testMissingArtifactId()
          throws Exception
      {
          ModelValidationResult result = validate( "missing-artifactId-pom.xml" );
  
          assertEquals( 1, result.getMessageCount() );
  
          assertEquals( "'artifactId' is missing.", result.getMessage( 0 ) );
      }
  
      public void testMissingGroupId()
          throws Exception
      {
          ModelValidationResult result = validate( "missing-groupId-pom.xml" );
      
          assertEquals( 1, result.getMessageCount() );
      
          assertEquals( "'groupId' is missing.", result.getMessage( 0 ) );
      }
  
      public void testMissingType()
          throws Exception
      {
          ModelValidationResult result = validate( "missing-type-pom.xml" );
      
          assertEquals( 1, result.getMessageCount() );
      
          assertEquals( "'type' is empty.", result.getMessage( 0 ) );
      }
  
      public void testMissingVersion()
          throws Exception
      {
          ModelValidationResult result = validate( "missing-version-pom.xml" );
      
          assertEquals( 1, result.getMessageCount() );
  
          assertEquals( "'version' is missing.", result.getMessage( 0 ) );
      }
  
      public void testMissingAll()
          throws Exception
      {
          ModelValidationResult result = validate( "missing-1-pom.xml" );
      
          assertEquals( 3, result.getMessageCount() );
  
          assertEquals( "'groupId' is missing.", result.getMessage( 0 ) );
          assertEquals( "'artifactId' is missing.", result.getMessage( 1 ) );
          // type is inherited from the super pom
          assertEquals( "'version' is missing.", result.getMessage( 2 ) );
      }
  
      private ModelValidationResult validate( String testName )
          throws Exception
      {
          Reader input = new FileReader( getTestFile( "src/test/resources/validation/" + testName
) );
  
          MavenXpp3Reader reader = new MavenXpp3Reader();
  
          validator = (ModelValidator) lookup( ModelValidator.ROLE );
  
          model = reader.read( input );
  
          ModelValidationResult result = validator.validate( model );
  
          assertNotNull( result );
  
          input.close();
  
          return result;
      }
  }
  
  
  
  1.2       +1 -0      maven-components/maven-core/src/test/resources/projects/child-which-inherits-from-super-model.xml
  
  Index: child-which-inherits-from-super-model.xml
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/test/resources/projects/child-which-inherits-from-super-model.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- child-which-inherits-from-super-model.xml	11 Jun 2004 15:11:56 -0000	1.1
  +++ child-which-inherits-from-super-model.xml	19 Jun 2004 20:20:54 -0000	1.2
  @@ -2,6 +2,7 @@
     <groupId>foo</groupId>
     <artifactId>bar</artifactId>
     <name>Babar</name>
  +  <version>4.5</version>
     
     <!-- Build element should be inherited from the super model -->
     
  
  
  
  1.2       +4 -0      maven-components/maven-core/src/test/resources/projects/child.xml
  
  Index: child.xml
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/test/resources/projects/child.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- child.xml	11 Jun 2004 15:11:56 -0000	1.1
  +++ child.xml	19 Jun 2004 20:20:54 -0000	1.2
  @@ -7,4 +7,8 @@
       <artifactId>maven-project-test</artifactId>
       <version>1.0-beta-9</version>
     </parent>
  +
  +  <artifactId>child-artifact</artifactId>
  +  <groupId>maven</groupId>
  +  <version>1.0-beta-9</version>
   </project>
  
  
  
  1.2       +4 -0      maven-components/maven-core/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment-child.xml
  
  Index: project-which-needs-directory-alignment-child.xml
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment-child.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project-which-needs-directory-alignment-child.xml	11 Jun 2004 15:11:56 -0000	1.1
  +++ project-which-needs-directory-alignment-child.xml	19 Jun 2004 20:20:54 -0000	1.2
  @@ -7,4 +7,8 @@
       <artifactId>project-which-needs-directory-alignment.xml</artifactId>
       <version>1.0-beta-9</version>
     </parent>
  +
  +  <groupId>maven</groupId>
  +  <artifactId>maven-foo</artifactId>
  +  <version>1.0</version>
   </project>
  
  
  
  1.2       +1 -1      maven-components/maven-core/src/test/resources/projects/recursive-inheritance/b/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/test/resources/projects/recursive-inheritance/b/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	11 Jun 2004 15:11:56 -0000	1.1
  +++ project.xml	19 Jun 2004 20:20:55 -0000	1.2
  @@ -11,7 +11,7 @@
     <groupId>b</groupId>
     <artifactId>b</artifactId>
     <name>b</name>
  -  <currentVersion>1.0</currentVersion>
  +  <version>1.0</version>
   
     <dependencies>
       <dependency>
  
  
  
  1.2       +1 -1      maven-components/maven-core/src/test/resources/projects/recursive-inheritance/c/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/test/resources/projects/recursive-inheritance/c/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	11 Jun 2004 15:11:56 -0000	1.1
  +++ project.xml	19 Jun 2004 20:20:55 -0000	1.2
  @@ -11,7 +11,7 @@
     <groupId>c</groupId>
     <artifactId>c</artifactId>
     <name>c</name>
  -  <currentVersion>1.0</currentVersion>
  +  <version>1.0</version>
   
     <dependencies>
       <dependency>
  
  
  
  1.2       +2 -2      maven-components/maven-core/src/test/resources/projects/recursive-inheritance/d/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/test/resources/projects/recursive-inheritance/d/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	11 Jun 2004 15:11:56 -0000	1.1
  +++ project.xml	19 Jun 2004 20:20:55 -0000	1.2
  @@ -8,10 +8,10 @@
       <artifactId>toplevel</artifactId>
       <version>1.0-beta-8</version>
     </parent>
  -  <groupartifactId>d</groupartifactId>
  +  <groupId>d</groupId>
     <artifactId>d</artifactId>
     <name>d</name>
  -  <currentVersion>1.0</currentVersion>
  +  <version>1.0</version>
   
     <dependencies>
       <dependency>
  
  
  
  1.1                  maven-components/maven-core/src/test/resources/validation/missing-1-pom.xml
  
  Index: missing-1-pom.xml
  ===================================================================
  <project>
  </project>
  
  
  
  1.1                  maven-components/maven-core/src/test/resources/validation/missing-artifactId-pom.xml
  
  Index: missing-artifactId-pom.xml
  ===================================================================
  <project>
    <groupId>foo</groupId>
    <version>99.44</version>
    <type>bleh</type>
  </project>
  
  
  
  1.1                  maven-components/maven-core/src/test/resources/validation/missing-groupId-pom.xml
  
  Index: missing-groupId-pom.xml
  ===================================================================
  <project>
    <artifactId>bar</artifactId>
    <version>99.44</version>
    <type>bleh</type>
  </project>
  
  
  
  1.1                  maven-components/maven-core/src/test/resources/validation/missing-type-pom.xml
  
  Index: missing-type-pom.xml
  ===================================================================
  <project>
    <groupId>foo</groupId>
    <artifactId>bar</artifactId>
    <version>99.44</version>
    <type></type>
  </project>
  
  
  
  1.1                  maven-components/maven-core/src/test/resources/validation/missing-version-pom.xml
  
  Index: missing-version-pom.xml
  ===================================================================
  <project>
    <groupId>foo</groupId>
    <artifactId>bar</artifactId>
    <type>bleh</type>
  </project>
  
  
  

Mime
View raw message