You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2011/09/18 10:52:12 UTC
svn commit: r1172225 - in /maven/maven-3/trunk/maven-core/src/test:
java/org/apache/maven/project/ resources/
Author: hboutemy
Date: Sun Sep 18 08:52:12 2011
New Revision: 1172225
URL: http://svn.apache.org/viewvc?rev=1172225&view=rev
Log:
code formatting
Modified:
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java
maven/maven-3/trunk/maven-core/src/test/resources/canonical-pom.xml
maven/maven-3/trunk/maven-core/src/test/resources/dependencyManagement-pom.xml
maven/maven-3/trunk/maven-core/src/test/resources/distributionManagement-pom.xml
maven/maven-3/trunk/maven-core/src/test/resources/pom.xml
maven/maven-3/trunk/maven-core/src/test/resources/withActiveByDefaultProfile-pom.xml
Modified: maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java?rev=1172225&r1=1172224&r2=1172225&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java (original)
+++ maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java Sun Sep 18 08:52:12 2011
@@ -140,16 +140,19 @@ public class DefaultMavenProjectBuilderT
throws Exception
{
ArtifactRepositoryLayout repoLayout = lookup( ArtifactRepositoryLayout.class, "default" );
- ArtifactRepository r = repositorySystem.createArtifactRepository( "local", "file://" + localRepoDir.getAbsolutePath(), repoLayout, null, null );
+ ArtifactRepository r =
+ repositorySystem.createArtifactRepository( "local", "file://" + localRepoDir.getAbsolutePath(), repoLayout,
+ null, null );
return r;
}
- public void xtestLoop() throws Exception
+ public void xtestLoop()
+ throws Exception
{
- while( true )
+ while ( true )
{
- File f1 = getTestFile( "src/test/resources/projects/duplicate-plugins-merged-pom.xml" );
- getProject( f1 );
+ File f1 = getTestFile( "src/test/resources/projects/duplicate-plugins-merged-pom.xml" );
+ getProject( f1 );
}
}
Modified: maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java?rev=1172225&r1=1172224&r2=1172225&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java (original)
+++ maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java Sun Sep 18 08:52:12 2011
@@ -46,7 +46,9 @@ public class MavenProjectTest
MavenProject childProject = new MavenProject( childModel );
- File childFile = new File( System.getProperty( "java.io.tmpdir" ), "maven-project-tests" + System.currentTimeMillis() + "/child/pom.xml" );
+ File childFile =
+ new File( System.getProperty( "java.io.tmpdir" ), "maven-project-tests" + System.currentTimeMillis()
+ + "/child/pom.xml" );
childProject.setFile( childFile );
@@ -169,7 +171,7 @@ public class MavenProjectTest
assertEquals( "Expecting 1 active profile", 1, activeProfilesClone.size() );
- assertNotSame( "The list of active profiles should have been cloned too but is same",
- activeProfilesOrig, activeProfilesClone);
+ assertNotSame( "The list of active profiles should have been cloned too but is same", activeProfilesOrig,
+ activeProfilesClone );
}
}
Modified: maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java?rev=1172225&r1=1172224&r2=1172225&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java (original)
+++ maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java Sun Sep 18 08:52:12 2011
@@ -131,8 +131,8 @@ public class PomConstructionTest
throws Exception
{
PomTestWrapper pom = buildPom( "profile-properties-interpolation", "interpolation-profile" );
- assertEquals("PASSED", pom.getValue("properties[1]/test"));
- assertEquals("PASSED", pom.getValue("properties[1]/property"));
+ assertEquals( "PASSED", pom.getValue( "properties[1]/test" ) );
+ assertEquals( "PASSED", pom.getValue( "properties[1]/property" ) );
}
@@ -145,8 +145,8 @@ public class PomConstructionTest
public void testThatExecutionsWithoutIdsAreMergedAndTheChildWins()
throws Exception
{
- PomTestWrapper tester = buildPom("micromailer");
- assertModelEquals( tester, "child-descriptor", "build/plugins[1]/executions[1]/goals[1]" );
+ PomTestWrapper tester = buildPom( "micromailer" );
+ assertModelEquals( tester, "child-descriptor", "build/plugins[1]/executions[1]/goals[1]" );
}
/*MNG-
@@ -246,7 +246,7 @@ public class PomConstructionTest
throws Exception
{
PomTestWrapper pom = buildPom( "parent-interpolation/sub" );
- pom = new PomTestWrapper(pom.getMavenProject().getParent());
+ pom = new PomTestWrapper( pom.getMavenProject().getParent() );
assertEquals( "1.3.0-SNAPSHOT", pom.getValue( "build/plugins[1]/version" ) );
}
@@ -256,8 +256,9 @@ public class PomConstructionTest
{
PomTestWrapper pom = buildPomFromMavenProject( "maven-build/sub/pom.xml", null );
- for(String s: pom.getMavenProject().getTestClasspathElements()){
- System.out.println(s);
+ for( String s: pom.getMavenProject().getTestClasspathElements() )
+ {
+ System.out.println( s );
}
}
@@ -286,9 +287,9 @@ public class PomConstructionTest
throws Exception
{
PomTestWrapper pom = buildPom( "reporting-interpolation" );
- assertEquals( createPath(Arrays.asList(System.getProperty("user.dir"),
- "src", "test", "resources-project-builder", "reporting-interpolation", "target", "site")),
- pom.getValue( "reporting/outputDirectory" ) );
+ assertEquals( createPath( Arrays.asList( System.getProperty( "user.dir" ), "src", "test",
+ "resources-project-builder", "reporting-interpolation", "target",
+ "site" ) ), pom.getValue( "reporting/outputDirectory" ) );
}
@@ -331,8 +332,10 @@ public class PomConstructionTest
{
PomTestWrapper pom = buildPom( "execution-configuration" );
assertEquals( 2, ( (List<?>) pom.getValue( "build/plugins[1]/executions" ) ).size() );
- assertEquals( "src/main/mdo/nexus.xml", ( pom.getValue( "build/plugins[1]/executions[1]/configuration[1]/model" ) ));
- assertEquals( "src/main/mdo/security.xml", ( pom.getValue( "build/plugins[1]/executions[2]/configuration[1]/model" ) ));
+ assertEquals( "src/main/mdo/nexus.xml",
+ ( pom.getValue( "build/plugins[1]/executions[1]/configuration[1]/model" ) ) );
+ assertEquals( "src/main/mdo/security.xml",
+ ( pom.getValue( "build/plugins[1]/executions[2]/configuration[1]/model" ) ) );
}
/*
@@ -350,8 +353,10 @@ public class PomConstructionTest
PomTestWrapper pom = buildPom( "single-configuration-inheritance" );
assertEquals( 2, ( (List<?>) pom.getValue( "build/plugins[1]/executions[1]/configuration[1]/rules" ) ).size() );
- assertEquals("2.0.6", pom.getValue( "build/plugins[1]/executions[1]/configuration[1]/rules[1]/requireMavenVersion[1]/version" ) );
- assertEquals("[1.4,)", pom.getValue( "build/plugins[1]/executions[1]/configuration[1]/rules[1]/requireJavaVersion[1]/version" ) );
+ assertEquals( "2.0.6",
+ pom.getValue( "build/plugins[1]/executions[1]/configuration[1]/rules[1]/requireMavenVersion[1]/version" ) );
+ assertEquals( "[1.4,)",
+ pom.getValue( "build/plugins[1]/executions[1]/configuration[1]/rules[1]/requireJavaVersion[1]/version" ) );
}
public void testConfigWithPluginManagement()
@@ -555,7 +560,7 @@ public class PomConstructionTest
PomTestWrapper pom = buildPom( "merged-plugin-class-path-order/wo-plugin-mngt/sub" );
assertEquals( 5, ( (List<?>) pom.getValue( "build/plugins[1]/dependencies" ) ).size() );
- assertNotNull( pom.getValue( "build/plugins[1]/dependencies[1]" ));
+ assertNotNull( pom.getValue( "build/plugins[1]/dependencies[1]" ) );
assertEquals( "c", pom.getValue( "build/plugins[1]/dependencies[1]/artifactId" ) );
assertEquals( "1", pom.getValue( "build/plugins[1]/dependencies[1]/version" ) );
assertEquals( "a", pom.getValue( "build/plugins[1]/dependencies[2]/artifactId" ) );
@@ -951,8 +956,8 @@ public class PomConstructionTest
throws Exception
{
PomTestWrapper pom = buildPom( "dependency-inheritance/sub" );
- assertEquals(1, ( (List<?>) pom.getValue( "dependencies" ) ).size() );
- assertEquals("4.4", pom.getValue("dependencies[1]/version") );
+ assertEquals( 1, ( (List<?>) pom.getValue( "dependencies" ) ).size() );
+ assertEquals( "4.4", pom.getValue( "dependencies[1]/version" ) );
}
/** MNG-4034 */
@@ -974,7 +979,7 @@ public class PomConstructionTest
throws Exception
{
PomTestWrapper pom = this.buildPom( "profile-module-inheritance/sub", "dist" );
- assertEquals(0, ( (List<?>) pom.getValue( "modules" ) ).size());
+ assertEquals( 0, ( (List<?>) pom.getValue( "modules" ) ).size() );
}
/** MNG-3621 */
@@ -982,7 +987,7 @@ public class PomConstructionTest
throws Exception
{
PomTestWrapper pom = this.buildPom( "unc-path/sub" );
- assertEquals("file:////host/site/test-child", pom.getValue( "distributionManagement/site/url" ));
+ assertEquals( "file:////host/site/test-child", pom.getValue( "distributionManagement/site/url" ) );
}
/** MNG-2006 */
@@ -990,11 +995,11 @@ public class PomConstructionTest
throws Exception
{
PomTestWrapper pom = this.buildPom( "url-append/child" );
- assertEquals("http://project.url/child", pom.getValue( "url" ));
- assertEquals("http://viewvc.project.url/child", pom.getValue( "scm/url" ));
- assertEquals("http://scm.project.url/child", pom.getValue( "scm/connection" ));
- assertEquals("https://scm.project.url/child", pom.getValue( "scm/developerConnection" ));
- assertEquals("http://site.project.url/child", pom.getValue( "distributionManagement/site/url" ));
+ assertEquals( "http://project.url/child", pom.getValue( "url" ) );
+ assertEquals( "http://viewvc.project.url/child", pom.getValue( "scm/url" ) );
+ assertEquals( "http://scm.project.url/child", pom.getValue( "scm/connection" ) );
+ assertEquals( "https://scm.project.url/child", pom.getValue( "scm/developerConnection" ) );
+ assertEquals( "http://site.project.url/child", pom.getValue( "distributionManagement/site/url" ) );
}
/** MNG-0479 */
@@ -1002,7 +1007,7 @@ public class PomConstructionTest
throws Exception
{
PomTestWrapper pom = this.buildPom( "repo-inheritance" );
- assertEquals(1, ( (List<?>) pom.getValue( "repositories" ) ).size());
+ assertEquals( 1, ( (List<?>) pom.getValue( "repositories" ) ).size() );
assertEquals( "it0043", pom.getValue( "repositories[1]/name" ) );
}
@@ -1010,7 +1015,7 @@ public class PomConstructionTest
throws Exception
{
PomTestWrapper pom = this.buildPom( "empty-scm" );
- assertNull(pom.getValue( "scm" ));
+ assertNull( pom.getValue( "scm" ) );
}
public void testPluginConfigurationUsingAttributesWithoutPluginManagement()
@@ -1078,18 +1083,18 @@ public class PomConstructionTest
{
PomTestWrapper pom = buildPom( "reporting-plugin-config/sub" );
- assertEquals(2, ( (List<?>) pom.getValue( "reporting/plugins[1]/configuration/stringParams" ) ).size());
- assertEquals("parentParam", pom.getValue( "reporting/plugins[1]/configuration/stringParams[1]/stringParam[1]"));
- assertEquals("childParam", pom.getValue( "reporting/plugins[1]/configuration/stringParams[1]/stringParam[2]"));
- assertEquals("true", pom.getValue( "reporting/plugins[1]/configuration/booleanParam"));
+ assertEquals( 2, ( (List<?>) pom.getValue( "reporting/plugins[1]/configuration/stringParams" ) ).size() );
+ assertEquals( "parentParam", pom.getValue( "reporting/plugins[1]/configuration/stringParams[1]/stringParam[1]" ) );
+ assertEquals( "childParam", pom.getValue( "reporting/plugins[1]/configuration/stringParams[1]/stringParam[2]" ) );
+ assertEquals( "true", pom.getValue( "reporting/plugins[1]/configuration/booleanParam" ) );
}
public void testPropertiesNoDuplication()
throws Exception
{
PomTestWrapper pom = buildPom( "properties-no-duplication/sub" );
- assertEquals(1, ( (Properties) pom.getValue( "properties" ) ).size());
- assertEquals("child", pom.getValue( "properties/pomProfile" ) );
+ assertEquals( 1, ( (Properties) pom.getValue( "properties" ) ).size() );
+ assertEquals( "child", pom.getValue( "properties/pomProfile" ) );
}
public void testPomInheritance()
@@ -1350,7 +1355,7 @@ public class PomConstructionTest
{
PomTestWrapper pom = buildPom( "inherited-properties-interpolation/active-profile/sub" );
- assertEquals(1, pom.getMavenProject().getModel().getProfiles().size());
+ assertEquals( 1, pom.getMavenProject().getModel().getProfiles().size() );
buildPom( "inherited-properties-interpolation/active-profile/sub", "it-parent", "it-child" );
assertEquals( "CHILD", pom.getValue( "properties/overridden" ) );
@@ -1361,10 +1366,10 @@ public class PomConstructionTest
public void testProfileDefaultActivation()
throws Exception
{
- PomTestWrapper pom = buildPom( "profile-default-deactivation" , "profile4");
- assertEquals(1, pom.getMavenProject().getActiveProfiles().size() );
- assertEquals(1, ( (List<?>) pom.getValue( "build/plugins" )).size() );
- assertEquals("2.1", pom.getValue( "build/plugins[1]/version" ));
+ PomTestWrapper pom = buildPom( "profile-default-deactivation", "profile4" );
+ assertEquals( 1, pom.getMavenProject().getActiveProfiles().size() );
+ assertEquals( 1, ( (List<?>) pom.getValue( "build/plugins" ) ).size() );
+ assertEquals( "2.1", pom.getValue( "build/plugins[1]/version" ) );
}
/* MNG-1995 */
@@ -1382,11 +1387,11 @@ public class PomConstructionTest
throws Exception
{
PomTestWrapper pom = buildPom( "build-extension-inheritance/sub" );
- assertEquals(3, ( (List<?>) pom.getValue( "build/extensions" )).size() );
- assertEquals("b", pom.getValue( "build/extensions[1]/artifactId" ) );
- assertEquals("a", pom.getValue( "build/extensions[2]/artifactId" ) );
- assertEquals("0.2", pom.getValue( "build/extensions[2]/version" ) );
- assertEquals("c", pom.getValue( "build/extensions[3]/artifactId" ) );
+ assertEquals( 3, ( (List<?>) pom.getValue( "build/extensions" ) ).size() );
+ assertEquals( "b", pom.getValue( "build/extensions[1]/artifactId" ) );
+ assertEquals( "a", pom.getValue( "build/extensions[2]/artifactId" ) );
+ assertEquals( "0.2", pom.getValue( "build/extensions[2]/version" ) );
+ assertEquals( "c", pom.getValue( "build/extensions[3]/artifactId" ) );
}
/*MNG-1957*/
@@ -1394,21 +1399,21 @@ public class PomConstructionTest
throws Exception
{
Properties props = new Properties();
- props.put("java.version", "1.5.0_15");
-
- PomTestWrapper pom = buildPom( "jdk-activation", props );
- assertEquals(3, pom.getMavenProject().getActiveProfiles().size());
- assertEquals("PASSED", pom.getValue("properties/jdkProperty3"));
- assertEquals("PASSED", pom.getValue("properties/jdkProperty2"));
- assertEquals("PASSED", pom.getValue("properties/jdkProperty1"));
+ props.put( "java.version", "1.5.0_15" );
+
+ PomTestWrapper pom = buildPom( "jdk-activation", props );
+ assertEquals( 3, pom.getMavenProject().getActiveProfiles().size() );
+ assertEquals( "PASSED", pom.getValue( "properties/jdkProperty3" ) );
+ assertEquals( "PASSED", pom.getValue( "properties/jdkProperty2" ) );
+ assertEquals( "PASSED", pom.getValue( "properties/jdkProperty1" ) );
}
/* MNG-2174 */
public void testProfilePluginMngDependencies()
throws Exception
{
- PomTestWrapper pom = buildPom( "profile-plugin-mng-dependencies/sub" , "maven-core-it");
- assertEquals("a", pom.getValue( "build/plugins[1]/dependencies[1]/artifactId" ) );
+ PomTestWrapper pom = buildPom( "profile-plugin-mng-dependencies/sub", "maven-core-it" );
+ assertEquals( "a", pom.getValue( "build/plugins[1]/dependencies[1]/artifactId" ) );
}
/** MNG-4116 */
@@ -1433,45 +1438,46 @@ public class PomConstructionTest
public void testPluginManagementInheritance()
throws Exception
{
- PomTestWrapper pom = this.buildPom( "plugin-management-inheritance");
- assertEquals("0.1-stub-SNAPSHOT", pom.getValue( "build/pluginManagement/plugins[@artifactId='maven-compiler-plugin']/version" ) );
+ PomTestWrapper pom = this.buildPom( "plugin-management-inheritance" );
+ assertEquals( "0.1-stub-SNAPSHOT",
+ pom.getValue( "build/pluginManagement/plugins[@artifactId='maven-compiler-plugin']/version" ) );
}
public void testProfilePlugins()
throws Exception
{
- PomTestWrapper pom = this.buildPom( "profile-plugins", "standard");
- assertEquals( 2, ( (List<?>) pom.getValue( "build/plugins" ) ).size() );
- assertEquals("maven-assembly2-plugin", pom.getValue( "build/plugins[2]/artifactId" ) );
+ PomTestWrapper pom = this.buildPom( "profile-plugins", "standard" );
+ assertEquals( 2, ( (List<?>) pom.getValue( "build/plugins" ) ).size() );
+ assertEquals( "maven-assembly2-plugin", pom.getValue( "build/plugins[2]/artifactId" ) );
}
public void testPluginInheritanceSimple()
throws Exception
{
- PomTestWrapper pom = this.buildPom( "plugin-inheritance-simple/sub");
+ PomTestWrapper pom = this.buildPom( "plugin-inheritance-simple/sub" );
assertEquals( 2, ( (List<?>) pom.getValue( "build/plugins" ) ).size() );
}
public void testPluginManagementDuplicate()
throws Exception
{
- PomTestWrapper pom = this.buildPom( "plugin-management-duplicate/sub");
- assertEquals( 12, ( (List<?>) pom.getValue( "build/pluginManagement/plugins" ) ).size() );
+ PomTestWrapper pom = this.buildPom( "plugin-management-duplicate/sub" );
+ assertEquals( 12, ( (List<?>) pom.getValue( "build/pluginManagement/plugins" ) ).size() );
}
public void testDistributionManagement()
throws Exception
{
- PomTestWrapper pom = this.buildPom( "distribution-management");
- assertEquals("legacy", pom.getValue( "distributionManagement/repository/layout" ));
+ PomTestWrapper pom = this.buildPom( "distribution-management" );
+ assertEquals( "legacy", pom.getValue( "distributionManagement/repository/layout" ) );
}
public void testDependencyScopeInheritance()
throws Exception
{
- PomTestWrapper pom = buildPom( "dependency-scope-inheritance/sub" );
- String scope = (String) pom.getValue("dependencies[1]/scope");
- assertEquals( "compile", scope );
+ PomTestWrapper pom = buildPom( "dependency-scope-inheritance/sub" );
+ String scope = (String) pom.getValue( "dependencies[1]/scope" );
+ assertEquals( "compile", scope );
}
public void testDependencyScope()
Modified: maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java?rev=1172225&r1=1172224&r2=1172225&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java (original)
+++ maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java Sun Sep 18 08:52:12 2011
@@ -1,5 +1,24 @@
package org.apache.maven.project;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.io.File;
import java.util.List;
import java.util.Properties;
Modified: maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java?rev=1172225&r1=1172224&r2=1172225&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java (original)
+++ maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java Sun Sep 18 08:52:12 2011
@@ -1,8 +1,24 @@
-/**
- *
- */
package org.apache.maven.project;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.List;
import org.apache.maven.artifact.Artifact;
Modified: maven/maven-3/trunk/maven-core/src/test/resources/canonical-pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/resources/canonical-pom.xml?rev=1172225&r1=1172224&r2=1172225&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/test/resources/canonical-pom.xml (original)
+++ maven/maven-3/trunk/maven-core/src/test/resources/canonical-pom.xml Sun Sep 18 08:52:12 2011
@@ -19,12 +19,16 @@ specific language governing permissions
under the License.
-->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<groupId>maven</groupId>
<artifactId>maven-core</artifactId>
- <name>Maven</name>
<version>2.0-SNAPSHOT</version>
+
+ <name>Maven</name>
+
<build>
<plugins>
<plugin>
Modified: maven/maven-3/trunk/maven-core/src/test/resources/dependencyManagement-pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/resources/dependencyManagement-pom.xml?rev=1172225&r1=1172224&r2=1172225&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/test/resources/dependencyManagement-pom.xml (original)
+++ maven/maven-3/trunk/maven-core/src/test/resources/dependencyManagement-pom.xml Sun Sep 18 08:52:12 2011
@@ -1,11 +1,34 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<project>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<groupId>maven</groupId>
<artifactId>maven-core</artifactId>
- <name>Maven</name>
<version>2.0-SNAPSHOT</version>
+
+ <name>Maven</name>
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -15,6 +38,7 @@
</dependency>
</dependencies>
</dependencyManagement>
+
<build>
<plugins>
<plugin>
Modified: maven/maven-3/trunk/maven-core/src/test/resources/distributionManagement-pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/resources/distributionManagement-pom.xml?rev=1172225&r1=1172224&r2=1172225&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/test/resources/distributionManagement-pom.xml (original)
+++ maven/maven-3/trunk/maven-core/src/test/resources/distributionManagement-pom.xml Sun Sep 18 08:52:12 2011
@@ -19,12 +19,16 @@
under the License.
-->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<groupId>maven</groupId>
<artifactId>maven-core</artifactId>
- <name>Maven</name>
<version>2.0-SNAPSHOT</version>
+
+ <name>Maven</name>
+
<distributionManagement>
<snapshotRepository>
<id>repo-id</id>
Modified: maven/maven-3/trunk/maven-core/src/test/resources/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/resources/pom.xml?rev=1172225&r1=1172224&r2=1172225&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/test/resources/pom.xml (original)
+++ maven/maven-3/trunk/maven-core/src/test/resources/pom.xml Sun Sep 18 08:52:12 2011
@@ -17,15 +17,18 @@ specific language governing permissions
under the License.
-->
-<model xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
+ <version>2.0-SNAPSHOT</version>
<packaging>jar</packaging>
+
<name>Maven</name>
- <version>2.0-SNAPSHOT</version>
<inceptionYear>2001</inceptionYear>
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -42,7 +45,8 @@ under the License.
<scope>compile</scope>
</dependency>
</dependencies>
+
<scm>
<connection>scm-connection</connection>
</scm>
-</model>
+</project>
Modified: maven/maven-3/trunk/maven-core/src/test/resources/withActiveByDefaultProfile-pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/resources/withActiveByDefaultProfile-pom.xml?rev=1172225&r1=1172224&r2=1172225&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/test/resources/withActiveByDefaultProfile-pom.xml (original)
+++ maven/maven-3/trunk/maven-core/src/test/resources/withActiveByDefaultProfile-pom.xml Sun Sep 18 08:52:12 2011
@@ -19,14 +19,16 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<groupId>maven</groupId>
<artifactId>maven-core</artifactId>
- <name>Maven</name>
<version>2.0-SNAPSHOT</version>
+ <name>Maven</name>
+
<profiles>
<profile>
<activation>