Modified: maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java?rev=813685&r1=813684&r2=813685&view=diff ============================================================================== --- maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java (original) +++ maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java Fri Sep 11 06:57:01 2009 @@ -59,18 +59,18 @@ validateId( "artifactId", result, model.getArtifactId() ); validateStringNotEmpty( "packaging", result, model.getPackaging() ); - + if ( !model.getModules().isEmpty() && !"pom".equals( model.getPackaging() ) ) { - result.addMessage( "Packaging '" + model.getPackaging() + "' is invalid. Aggregator projects " + - "require 'pom' as packaging." ); + result.addMessage( "Packaging '" + model.getPackaging() + "' is invalid. Aggregator projects " + + "require 'pom' as packaging." ); } - + Parent parent = model.getParent(); if ( parent != null ) { - if ( parent.getGroupId().equals( model.getGroupId() ) && - parent.getArtifactId().equals( model.getArtifactId() ) ) + if ( parent.getGroupId().equals( model.getGroupId() ) + && parent.getArtifactId().equals( model.getArtifactId() ) ) { result.addMessage( "The parent element cannot have the same ID as the project." ); } @@ -93,7 +93,7 @@ if ( Artifact.SCOPE_SYSTEM.equals( d.getScope() ) ) { String systemPath = d.getSystemPath(); - + if ( StringUtils.isEmpty( systemPath ) ) { result.addMessage( "For dependency " + d + ": system-scoped dependency must specify systemPath." ); @@ -102,8 +102,8 @@ { if ( ! new File( systemPath ).isAbsolute() ) { - result.addMessage( "For dependency " + d + ": system-scoped dependency must " + - "specify an absolute path systemPath." ); + result.addMessage( "For dependency " + d + ": system-scoped dependency must " + + "specify an absolute path systemPath." ); } } } @@ -130,7 +130,7 @@ if ( Artifact.SCOPE_SYSTEM.equals( d.getScope() ) ) { String systemPath = d.getSystemPath(); - + if ( StringUtils.isEmpty( systemPath ) ) { result.addMessage( "For managed dependency " + d + ": system-scoped dependency must specify systemPath." ); @@ -139,8 +139,8 @@ { if ( ! new File( systemPath ).isAbsolute() ) { - result.addMessage( "For managed dependency " + d + ": system-scoped dependency must " + - "specify an absolute path systemPath." ); + result.addMessage( "For managed dependency " + d + ": system-scoped dependency must " + + "specify an absolute path systemPath." ); } } }
Modified: maven/maven-2/branches/maven-2.2.x/maven-project/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-project/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java?rev=813685&r1=813684&r2=813685&view=diff ============================================================================== --- maven/maven-2/branches/maven-2.2.x/maven-project/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java (original) +++ maven/maven-2/branches/maven-2.2.x/maven-project/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java Fri Sep 11 06:57:01 2009 @@ -30,7 +30,7 @@ /** * Verifies the version of a dependency listed in a parent's * dependencyManagement section is chosen over another version of the same - * dependency, listed transitively. + * dependency, listed transitively. * * @author <a href="mailto:[email protected]";>Patrick Schneider</a> * @version $Id$ @@ -67,16 +67,18 @@ assertEquals( pom0Basedir, project1.getParent().getBasedir() ); Set set = project1.getArtifacts(); - assertNotNull("No artifacts", set); - assertTrue("No Artifacts", set.size() > 0); - assertTrue("Set size should be 3, is " + set.size(), set.size() == 3); - + assertNotNull( "No artifacts", set ); + assertTrue( "No Artifacts", set.size() > 0 ); + assertTrue( "Set size should be 3, is " + set.size(), set.size() == 3 ); + Iterator iter = set.iterator(); - while (iter.hasNext()) { - Artifact artifact = (Artifact)iter.next(); - System.out.println("Artifact: " + artifact.getDependencyConflictId() + " " + artifact.getVersion() + - " Optional=" + (artifact.isOptional() ? "true" : "false")); - assertTrue("Incorrect version for " + artifact.getDependencyConflictId(), artifact.getVersion().equals("1.0")); + while ( iter.hasNext() ) + { + Artifact artifact = (Artifact) iter.next(); + System.out.println( "Artifact: " + artifact.getDependencyConflictId() + " " + artifact.getVersion() + + " Optional=" + ( artifact.isOptional() ? "true" : "false" ) ); + assertTrue( "Incorrect version for " + artifact.getDependencyConflictId(), + artifact.getVersion().equals( "1.0" ) ); } } Modified: maven/maven-2/branches/maven-2.2.x/maven-project/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-project/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java?rev=813685&r1=813684&r2=813685&view=diff ============================================================================== --- maven/maven-2/branches/maven-2.2.x/maven-project/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java (original) +++ maven/maven-2/branches/maven-2.2.x/maven-project/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java Fri Sep 11 06:57:01 2009 @@ -63,16 +63,17 @@ assertEquals( pom0Basedir, project1.getParent().getBasedir() ); Set set = project1.getArtifacts(); - assertNotNull("No artifacts", set); - assertTrue("No Artifacts", set.size() > 0); + assertNotNull( "No artifacts", set ); + assertTrue( "No Artifacts", set.size() > 0 ); Iterator iter = set.iterator(); - while (iter.hasNext()) + while ( iter.hasNext() ) { - Artifact artifact = (Artifact)iter.next(); - System.out.println("Artifact: " + artifact.getDependencyConflictId() + " " + - artifact.getVersion() + " Scope: " + artifact.getScope()); - assertTrue("Incorrect version for " + artifact.getDependencyConflictId(), artifact.getVersion().equals("1.0")); + Artifact artifact = (Artifact) iter.next(); + System.out.println( "Artifact: " + artifact.getDependencyConflictId() + " " + artifact.getVersion() + + " Scope: " + artifact.getScope() ); + assertTrue( "Incorrect version for " + artifact.getDependencyConflictId(), + artifact.getVersion().equals( "1.0" ) ); } } Modified: maven/maven-2/branches/maven-2.2.x/maven-project/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-project/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java?rev=813685&r1=813684&r2=813685&view=diff ============================================================================== --- maven/maven-2/branches/maven-2.2.x/maven-project/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java (original) +++ maven/maven-2/branches/maven-2.2.x/maven-project/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java Fri Sep 11 06:57:01 2009 @@ -62,19 +62,20 @@ MavenProject project1 = getProjectWithDependencies( pom1 ); assertEquals( pom0Basedir, project1.getParent().getBasedir() ); - System.out.println("Project " + project1.getId() + " " + project1); + System.out.println( "Project " + project1.getId() + " " + project1 ); Set set = project1.getArtifacts(); - assertNotNull("No artifacts", set); - assertTrue("No Artifacts", set.size() > 0); + assertNotNull( "No artifacts", set ); + assertTrue( "No Artifacts", set.size() > 0 ); Iterator iter = set.iterator(); - assertTrue("Set size should be 4, is " + set.size(), set.size() == 4); + assertTrue( "Set size should be 4, is " + set.size(), set.size() == 4 ); - while (iter.hasNext()) + while ( iter.hasNext() ) { - Artifact artifact = (Artifact)iter.next(); - System.out.println("Artifact: " + artifact.getDependencyConflictId() + " " + artifact.getVersion() + - " Optional=" + (artifact.isOptional() ? "true" : "false")); - assertTrue("Incorrect version for " + artifact.getDependencyConflictId(), artifact.getVersion().equals("1.0")); + Artifact artifact = (Artifact) iter.next(); + System.out.println( "Artifact: " + artifact.getDependencyConflictId() + " " + artifact.getVersion() + + " Optional=" + ( artifact.isOptional() ? "true" : "false" ) ); + assertTrue( "Incorrect version for " + artifact.getDependencyConflictId(), + artifact.getVersion().equals( "1.0" ) ); } }
