Author: rgoers
Date: Sat Sep 22 23:46:25 2007
New Revision: 578552
URL: http://svn.apache.org/viewvc?rev=578552&view=rev
Log:
Remove Windows line feeds.
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/imports/AbstractProjectImportsTestCase.java
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/imports/t01/ProjectImportsTest.java
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/p0/p1/pom.xml
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/p0/pom.xml
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/imports/AbstractProjectImportsTestCase.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/imports/AbstractProjectImportsTestCase.java?rev=578552&r1=578551&r2=578552&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/imports/AbstractProjectImportsTestCase.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/imports/AbstractProjectImportsTestCase.java
Sat Sep 22 23:46:25 2007
@@ -1,53 +1,53 @@
-package org.apache.maven.project.imports;
-
-/*
- * 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 org.apache.maven.project.AbstractMavenProjectTestCase;
-
-import java.io.File;
-
-/**
- * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: AbstractProjectInheritanceTestCase.java 495147 2007-01-11
07:47:53Z jvanzyl $
- */
-public abstract class AbstractProjectImportsTestCase
- extends AbstractMavenProjectTestCase
-{
- protected String getTestSeries()
- {
- String className = getClass().getPackage().getName();
-
- return className.substring( className.lastIndexOf( "." ) + 1 );
- }
-
- protected File projectFile( String name )
- {
- return new File( getLocalRepositoryPath(), "/maven/poms/" + name +
"-1.0.pom" );
- }
-
- // ----------------------------------------------------------------------
- // The local repository for this category of tests
- // ----------------------------------------------------------------------
-
- protected File getLocalRepositoryPath()
- {
- return getTestFile( "src/test/resources/imports-repo/" +
getTestSeries() );
- }
-}
+package org.apache.maven.project.imports;
+
+/*
+ * 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 org.apache.maven.project.AbstractMavenProjectTestCase;
+
+import java.io.File;
+
+/**
+ * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
+ * @version $Id: AbstractProjectInheritanceTestCase.java 495147 2007-01-11
07:47:53Z jvanzyl $
+ */
+public abstract class AbstractProjectImportsTestCase
+ extends AbstractMavenProjectTestCase
+{
+ protected String getTestSeries()
+ {
+ String className = getClass().getPackage().getName();
+
+ return className.substring( className.lastIndexOf( "." ) + 1 );
+ }
+
+ protected File projectFile( String name )
+ {
+ return new File( getLocalRepositoryPath(), "/maven/poms/" + name +
"-1.0.pom" );
+ }
+
+ // ----------------------------------------------------------------------
+ // The local repository for this category of tests
+ // ----------------------------------------------------------------------
+
+ protected File getLocalRepositoryPath()
+ {
+ return getTestFile( "src/test/resources/imports-repo/" +
getTestSeries() );
+ }
+}
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/imports/t01/ProjectImportsTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/imports/t01/ProjectImportsTest.java?rev=578552&r1=578551&r2=578552&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/imports/t01/ProjectImportsTest.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/imports/t01/ProjectImportsTest.java
Sat Sep 22 23:46:25 2007
@@ -1,131 +1,131 @@
-package org.apache.maven.project.imports.t01;
-
-/*
- * 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.Map;
-
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.imports.AbstractProjectImportsTestCase;
-import org.apache.maven.artifact.Artifact;
-
-
-/**
- * Verifies managed dependencies are imported into other projects correctly.
- *
- * @version $Id: $
- */
-public class ProjectImportsTest extends AbstractProjectImportsTestCase
-{
- // ----------------------------------------------------------------------
- //
- // p1 inherits from p0
- // p0 inhertis from super model
- //
- // or we can show it graphically as:
- //
- // p1 ---> p0 --> super model
- //
- // ----------------------------------------------------------------------
-
- public void testDependencyManagementImportsVersions() throws Exception
- {
- File localRepo = getLocalRepositoryPath();
-
- File pom0 = new File( localRepo, "p0/pom.xml" );
- File pom0Basedir = pom0.getParentFile();
- System.out.println("basedir " + pom0Basedir.getAbsolutePath());
- File pom1 = new File( pom0Basedir, "p1/pom.xml" );
- File pom2 = new File( pom0Basedir, "p2/pom.xml" );
- File pom3 = new File( pom0Basedir, "p3/pom.xml" );
- File pom4 = new File( pom0Basedir, "p4/pom.xml" );
-
- getProjectWithDependencies( pom0 );
- // load the child project, which inherits from p0...
- // MavenProject project0 = getProjectWithDependencies( pom0 );
- MavenProject project1 = getProjectWithDependencies( pom1 );
-
- assertEquals( pom0Basedir, project1.getParent().getBasedir() );
-
- Map map = project1.getArtifactMap();
- assertNotNull("No artifacts", map);
- assertTrue("No Artifacts", map.size() > 0);
- assertTrue("Set size should be 2, is " + map.size(), map.size() == 2);
-
- Artifact a = (Artifact) map.get("maven-test:maven-test-a");
- Artifact b = (Artifact) map.get("maven-test:maven-test-b");
-
- assertTrue("Incorrect version for " + a.getDependencyConflictId(),
a.getVersion().equals("1.0"));
- assertTrue("Incorrect version for " + b.getDependencyConflictId(),
b.getVersion().equals("1.0"));
-
- // load the child project, which inherits from p0...
- // MavenProject project0 = getProjectWithDependencies( pom0 );
- MavenProject project2 = getProjectWithDependencies( pom2 );
-
- map = project2.getArtifactMap();
- assertNotNull("No artifacts", map);
- assertTrue("No Artifacts", map.size() > 0);
- assertTrue("Set size should be 3, is " + map.size(), map.size() == 3);
-
- a = (Artifact) map.get("maven-test:maven-test-a");
- b = (Artifact) map.get("maven-test:maven-test-b");
- Artifact c = (Artifact) map.get("maven-test:maven-test-c");
-
- assertTrue("Incorrect version for " + a.getDependencyConflictId(),
a.getVersion().equals("1.0"));
- assertTrue("Incorrect version for " + b.getDependencyConflictId(),
b.getVersion().equals("1.0"));
- assertTrue("Incorrect version for " + c.getDependencyConflictId(),
c.getVersion().equals("1.0"));
-
- // load the child project, which inherits from p0...
- // MavenProject project0 = getProjectWithDependencies( pom0 );
- MavenProject project3 = getProjectWithDependencies( pom3 );
-
- map = project3.getArtifactMap();
- assertNotNull("No artifacts", map);
- assertTrue("No Artifacts", map.size() > 0);
- assertTrue("Set size should be 3, is " + map.size(), map.size() == 3);
-
- a = (Artifact) map.get("maven-test:maven-test-a");
- c = (Artifact) map.get("maven-test:maven-test-c");
- Artifact d = (Artifact) map.get("maven-test:maven-test-d");
-
- assertTrue("Incorrect version for " + a.getDependencyConflictId(),
a.getVersion().equals("1.1"));
- assertTrue("Incorrect version for " + c.getDependencyConflictId(),
c.getVersion().equals("1.1"));
- assertTrue("Incorrect version for " + d.getDependencyConflictId(),
d.getVersion().equals("1.0"));
-
- // load the child project, which inherits from p0...
- // MavenProject project0 = getProjectWithDependencies( pom0 );
- MavenProject project4 = getProjectWithDependencies( pom4 );
-
- map = project4.getArtifactMap();
- assertNotNull("No artifacts", map);
- assertTrue("No Artifacts", map.size() > 0);
- assertTrue("Set size should be 4, is " + map.size(), map.size() == 4);
-
- a = (Artifact) map.get("maven-test:maven-test-a");
- b = (Artifact) map.get("maven-test:maven-test-b");
- c = (Artifact) map.get("maven-test:maven-test-c");
- d = (Artifact) map.get("maven-test:maven-test-d");
-
- assertTrue("Incorrect version for " + a.getDependencyConflictId(),
a.getVersion().equals("1.0"));
- assertTrue("Incorrect version for " + b.getDependencyConflictId(),
b.getVersion().equals("1.1"));
- assertTrue("Incorrect version for " + c.getDependencyConflictId(),
c.getVersion().equals("1.0"));
- assertTrue("Incorrect version for " + d.getDependencyConflictId(),
d.getVersion().equals("1.0"));
- }
+package org.apache.maven.project.imports.t01;
+
+/*
+ * 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.Map;
+
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.imports.AbstractProjectImportsTestCase;
+import org.apache.maven.artifact.Artifact;
+
+
+/**
+ * Verifies managed dependencies are imported into other projects correctly.
+ *
+ * @version $Id: $
+ */
+public class ProjectImportsTest extends AbstractProjectImportsTestCase
+{
+ // ----------------------------------------------------------------------
+ //
+ // p1 inherits from p0
+ // p0 inhertis from super model
+ //
+ // or we can show it graphically as:
+ //
+ // p1 ---> p0 --> super model
+ //
+ // ----------------------------------------------------------------------
+
+ public void testDependencyManagementImportsVersions() throws Exception
+ {
+ File localRepo = getLocalRepositoryPath();
+
+ File pom0 = new File( localRepo, "p0/pom.xml" );
+ File pom0Basedir = pom0.getParentFile();
+ System.out.println("basedir " + pom0Basedir.getAbsolutePath());
+ File pom1 = new File( pom0Basedir, "p1/pom.xml" );
+ File pom2 = new File( pom0Basedir, "p2/pom.xml" );
+ File pom3 = new File( pom0Basedir, "p3/pom.xml" );
+ File pom4 = new File( pom0Basedir, "p4/pom.xml" );
+
+ getProjectWithDependencies( pom0 );
+ // load the child project, which inherits from p0...
+ // MavenProject project0 = getProjectWithDependencies( pom0 );
+ MavenProject project1 = getProjectWithDependencies( pom1 );
+
+ assertEquals( pom0Basedir, project1.getParent().getBasedir() );
+
+ Map map = project1.getArtifactMap();
+ assertNotNull("No artifacts", map);
+ assertTrue("No Artifacts", map.size() > 0);
+ assertTrue("Set size should be 2, is " + map.size(), map.size() == 2);
+
+ Artifact a = (Artifact) map.get("maven-test:maven-test-a");
+ Artifact b = (Artifact) map.get("maven-test:maven-test-b");
+
+ assertTrue("Incorrect version for " + a.getDependencyConflictId(),
a.getVersion().equals("1.0"));
+ assertTrue("Incorrect version for " + b.getDependencyConflictId(),
b.getVersion().equals("1.0"));
+
+ // load the child project, which inherits from p0...
+ // MavenProject project0 = getProjectWithDependencies( pom0 );
+ MavenProject project2 = getProjectWithDependencies( pom2 );
+
+ map = project2.getArtifactMap();
+ assertNotNull("No artifacts", map);
+ assertTrue("No Artifacts", map.size() > 0);
+ assertTrue("Set size should be 3, is " + map.size(), map.size() == 3);
+
+ a = (Artifact) map.get("maven-test:maven-test-a");
+ b = (Artifact) map.get("maven-test:maven-test-b");
+ Artifact c = (Artifact) map.get("maven-test:maven-test-c");
+
+ assertTrue("Incorrect version for " + a.getDependencyConflictId(),
a.getVersion().equals("1.0"));
+ assertTrue("Incorrect version for " + b.getDependencyConflictId(),
b.getVersion().equals("1.0"));
+ assertTrue("Incorrect version for " + c.getDependencyConflictId(),
c.getVersion().equals("1.0"));
+
+ // load the child project, which inherits from p0...
+ // MavenProject project0 = getProjectWithDependencies( pom0 );
+ MavenProject project3 = getProjectWithDependencies( pom3 );
+
+ map = project3.getArtifactMap();
+ assertNotNull("No artifacts", map);
+ assertTrue("No Artifacts", map.size() > 0);
+ assertTrue("Set size should be 3, is " + map.size(), map.size() == 3);
+
+ a = (Artifact) map.get("maven-test:maven-test-a");
+ c = (Artifact) map.get("maven-test:maven-test-c");
+ Artifact d = (Artifact) map.get("maven-test:maven-test-d");
+
+ assertTrue("Incorrect version for " + a.getDependencyConflictId(),
a.getVersion().equals("1.1"));
+ assertTrue("Incorrect version for " + c.getDependencyConflictId(),
c.getVersion().equals("1.1"));
+ assertTrue("Incorrect version for " + d.getDependencyConflictId(),
d.getVersion().equals("1.0"));
+
+ // load the child project, which inherits from p0...
+ // MavenProject project0 = getProjectWithDependencies( pom0 );
+ MavenProject project4 = getProjectWithDependencies( pom4 );
+
+ map = project4.getArtifactMap();
+ assertNotNull("No artifacts", map);
+ assertTrue("No Artifacts", map.size() > 0);
+ assertTrue("Set size should be 4, is " + map.size(), map.size() == 4);
+
+ a = (Artifact) map.get("maven-test:maven-test-a");
+ b = (Artifact) map.get("maven-test:maven-test-b");
+ c = (Artifact) map.get("maven-test:maven-test-c");
+ d = (Artifact) map.get("maven-test:maven-test-d");
+
+ assertTrue("Incorrect version for " + a.getDependencyConflictId(),
a.getVersion().equals("1.0"));
+ assertTrue("Incorrect version for " + b.getDependencyConflictId(),
b.getVersion().equals("1.1"));
+ assertTrue("Incorrect version for " + c.getDependencyConflictId(),
c.getVersion().equals("1.0"));
+ assertTrue("Incorrect version for " + d.getDependencyConflictId(),
d.getVersion().equals("1.0"));
+ }
}
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/p0/p1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/p0/p1/pom.xml?rev=578552&r1=578551&r2=578552&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/p0/p1/pom.xml
(original)
+++
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/p0/p1/pom.xml
Sat Sep 22 23:46:25 2007
@@ -1,45 +1,45 @@
-<project>
- <parent>
- <artifactId>p0</artifactId>
- <groupId>maven</groupId>
- <version>1.0</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>maven</groupId>
- <artifactId>p1</artifactId>
- <packaging>pom</packaging>
- <name>p1</name>
- <version>1.0</version>
- <scm>
- <url>scm-url</url>
- </scm>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>maven-test</groupId>
- <artifactId>maven-test-b</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>maven-test</groupId>
- <artifactId>maven-test-a</artifactId>
- </dependency>
- <dependency>
- <groupId>maven-test</groupId>
- <artifactId>maven-test-b</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <configuration>
- <tasks><echo>${project.parent.basedir}</echo></tasks>
- </configuration>
- </plugin>
- </plugins>
- </build>
+<project>
+ <parent>
+ <artifactId>p0</artifactId>
+ <groupId>maven</groupId>
+ <version>1.0</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>maven</groupId>
+ <artifactId>p1</artifactId>
+ <packaging>pom</packaging>
+ <name>p1</name>
+ <version>1.0</version>
+ <scm>
+ <url>scm-url</url>
+ </scm>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>maven-test</groupId>
+ <artifactId>maven-test-b</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>maven-test</groupId>
+ <artifactId>maven-test-a</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>maven-test</groupId>
+ <artifactId>maven-test-b</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <configuration>
+ <tasks><echo>${project.parent.basedir}</echo></tasks>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/p0/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/p0/pom.xml?rev=578552&r1=578551&r2=578552&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/p0/pom.xml
(original)
+++
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/p0/pom.xml
Sat Sep 22 23:46:25 2007
@@ -1,26 +1,26 @@
-<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>maven</groupId>
- <artifactId>p0</artifactId>
- <packaging>pom</packaging>
- <name>p0</name>
- <version>1.0</version>
- <organization>
- <name>Codehaus</name>
- </organization>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>maven-test</groupId>
- <artifactId>maven-test-a</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <modules>
- <module>p1</module>
- <module>p2</module>
- <module>p3</module>
- <module>p4</module>
- </modules>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>maven</groupId>
+ <artifactId>p0</artifactId>
+ <packaging>pom</packaging>
+ <name>p0</name>
+ <version>1.0</version>
+ <organization>
+ <name>Codehaus</name>
+ </organization>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>maven-test</groupId>
+ <artifactId>maven-test-a</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <modules>
+ <module>p1</module>
+ <module>p2</module>
+ <module>p3</module>
+ <module>p4</module>
+ </modules>
</project>
