fix pom formats as parsing is now stricter

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191392 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 04:29:46 +00:00 · 2005-06-20 04:29:46 +00:00 · 86e4a5647c
parent d617a0480e
commit 86e4a5647c
32 changed files with 64 additions and 65 deletions
--- a/maven-project/src/test/resources/canonical-pom.xml
+++ b/maven-project/src/test/resources/canonical-pom.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>

-<model>
+<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>maven</groupId>
  <artifactId>maven-core</artifactId>
@ -27,4 +27,4 @@
      </plugin>
    </plugins>
  </build>
-</model>
+</project>
--- a/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p0-1.0.pom
+++ b/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p0-1.0.pom
@ -1,4 +1,4 @@
-<model>
+<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>maven</groupId>
  <artifactId>p0</artifactId>
@ -8,4 +8,4 @@
  <organization>
    <name>Codehaus</name>
  </organization>
-</model>
+</project>
--- a/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p1-1.0.pom
+++ b/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p1-1.0.pom
@ -1,4 +1,4 @@
-<model>
+<project>
  <parent>
    <artifactId>p0</artifactId>
    <groupId>maven</groupId>
@ -13,4 +13,4 @@
  <scm>
    <url>scm-url</url>
  </scm>
-</model>
+</project>
--- a/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p2-1.0.pom
+++ b/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p2-1.0.pom
@ -1,4 +1,4 @@
-<model>
+<project>
  <parent>
    <artifactId>p1</artifactId>
    <groupId>maven</groupId>
@ -15,4 +15,4 @@
      <name>mailing-list</name>
    </mailingList>
  </mailingLists>
-</model>
+</project>
--- a/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p3-1.0.pom
+++ b/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p3-1.0.pom
@ -1,4 +1,4 @@
-<model>
+<project>
  <parent>
    <artifactId>p2</artifactId>
    <groupId>maven</groupId>
@ -11,4 +11,4 @@
  <name>p3</name>
  <version>1.0</version>
  <inceptionYear>2000</inceptionYear>
-</model>
+</project>
--- a/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p4-1.0.pom
+++ b/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p4-1.0.pom
@ -1,4 +1,4 @@
-<model>
+<project>
  <parent>
    <artifactId>p3</artifactId>
    <groupId>maven</groupId>
@ -10,4 +10,4 @@
  <packaging>jar</packaging>
  <name>p4</name>
  <version>1.0</version>
-</model>
+</project>
--- a/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p0-1.0.pom
+++ b/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p0-1.0.pom
@ -1,4 +1,4 @@
-<model>
+<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>maven</groupId>
  <artifactId>p0</artifactId>
@ -8,4 +8,4 @@
  <organization>
    <name>p0-org</name>
  </organization>
-</model>
+</project>
--- a/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p1-1.0.pom
+++ b/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p1-1.0.pom
@ -1,4 +1,4 @@
-<model>
+<project>
  <parent>
    <artifactId>p0</artifactId>
    <groupId>maven</groupId>
@ -13,4 +13,4 @@
  <organization>
    <name>p1-org</name>
  </organization>
-</model>
+</project>
--- a/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p2-1.0.pom
+++ b/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p2-1.0.pom
@ -1,4 +1,4 @@
-<model>
+<project>
  <parent>
    <artifactId>p1</artifactId>
    <groupId>maven</groupId>
@ -13,4 +13,4 @@
  <organization>
    <name>p2-org</name>
  </organization>
-</model>
+</project>
--- a/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p3-1.0.pom
+++ b/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p3-1.0.pom
@ -1,4 +1,4 @@
-<model>
+<project>
  <parent>
    <artifactId>p2</artifactId>
    <groupId>maven</groupId>
@ -13,4 +13,4 @@
  <organization>
    <name>p3-org</name>
  </organization>
-</model>
+</project>
--- a/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p4-1.0.pom
+++ b/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/p4-1.0.pom
@ -1,4 +1,4 @@
-<model>
+<project>
  <parent>
    <artifactId>p3</artifactId>
    <groupId>maven</groupId>
@ -13,4 +13,4 @@
  <organization>
    <name>p4-org</name>
  </organization>
-</model>
+</project>
--- a/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-a-1.0.pom
+++ b/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-a-1.0.pom
@ -1,4 +1,4 @@
-<model>
+<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>maven-test</groupId>
  <artifactId>maven-test-a</artifactId>
@ -20,4 +20,4 @@
      <scope>compile</scope>
    </dependency>
  </dependencies>
-</model>
+</project>
--- a/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-b-1.0.pom
+++ b/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-b-1.0.pom
@ -1,4 +1,4 @@
-<model>
+<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>maven-test</groupId>
  <artifactId>maven-test-b</artifactId>
@ -20,4 +20,4 @@
      <scope>compile</scope>
    </dependency>
  </dependencies>
-</model>
+</project>
--- a/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-c-1.0.pom
+++ b/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-c-1.0.pom
@ -1,4 +1,4 @@
-<model>
+<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>maven-test</groupId>
  <artifactId>maven-test-c</artifactId>
@ -13,4 +13,4 @@
      <scope>compile</scope>
    </dependency>
  </dependencies>
-</model>
+</project>
--- a/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.1.pom
+++ b/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.1.pom
@ -1,7 +1,7 @@
-<model>
+<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>maven-test</groupId>
  <artifactId>maven-test-d</artifactId>
  <packaging>jar</packaging>
  <version>1.1</version>
-</model>
+</project>
--- a/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.2.pom
+++ b/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.2.pom
@ -1,7 +1,7 @@
-<model>
+<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>maven-test</groupId>
  <artifactId>maven-test-d</artifactId>
  <packaging>jar</packaging>
  <version>1.1</version>
-</model>
+</project>
--- a/maven-project/src/test/resources/local-repo/snapshot-test/poms/maven-test-snapshot-resolving-1.0.pom
+++ b/maven-project/src/test/resources/local-repo/snapshot-test/poms/maven-test-snapshot-resolving-1.0.pom
@ -1,4 +1,4 @@
-<model>
+<project>
  <groupId>snapshot-test</groupId>
  <artifactId>maven-test-snapshot-resolving</artifactId>
  <packaging>jar</packaging>
@ -46,4 +46,4 @@
      <scope>compile</scope>
    </dependency>
  </dependencies>
-</model>
+</project>
--- a/maven-project/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment-child.xml
+++ b/maven-project/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment-child.xml
@ -1,4 +1,4 @@
-<model>
+<project>

  <extend>project-which-needs-directory-alignment.xml</extend>

@ -11,4 +11,4 @@
  <groupId>maven</groupId>
  <artifactId>maven-foo</artifactId>
  <version>1.0</version>
-</model>
+</project>
--- a/maven-project/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment.xml
+++ b/maven-project/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<model>
+<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>maven</groupId>
  <artifactId>project-which-needs-directory-alignment</artifactId>
@ -9,7 +9,6 @@
  <inceptionYear>2001</inceptionYear>
  <description>Description</description>
  <url>http://maven.apache.org/</url>
-  <issueTrackingUrl>issueTrackingUrl</issueTrackingUrl>

  <organization>
    <name>Apache Software Foundation</name>
@ -127,4 +126,4 @@
    </plugins>
  </reports>

-</model>
+</project>
--- a/maven-project/src/test/resources/projects/base-directory-alignment/subproject/project-which-needs-directory-alignment-child.xml
+++ b/maven-project/src/test/resources/projects/base-directory-alignment/subproject/project-which-needs-directory-alignment-child.xml
@ -1,4 +1,4 @@
-<model>
+<project>

  <extend>../project-which-needs-directory-alignment.xml</extend>

@ -7,4 +7,4 @@
    <artifactId>project-which-needs-directory-alignment</artifactId>
    <version>1.0-beta-9</version>
  </parent>
-</model>
+</project>
--- a/maven-project/src/test/resources/projects/scope/project-with-scoped-dependencies.xml
+++ b/maven-project/src/test/resources/projects/scope/project-with-scoped-dependencies.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<model>
+<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>maven</groupId>
  <artifactId>maven-project-test</artifactId>
@ -77,4 +77,4 @@
    </dependency>
  </dependencies>

-</model>
+</project>
--- a/maven-project/src/test/resources/projects/scope/transitive-compile-dep.xml
+++ b/maven-project/src/test/resources/projects/scope/transitive-compile-dep.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<model>
+<project>
  <groupId>maven-test</groupId>
  <artifactId>scope-compile</artifactId>
  <version>1.0</version>
@ -34,4 +34,4 @@
    </dependency>
  </dependencies>

-</model>
+</project>
--- a/maven-project/src/test/resources/projects/scope/transitive-default-dep.xml
+++ b/maven-project/src/test/resources/projects/scope/transitive-default-dep.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<model>
+<project>
  <groupId>maven-test</groupId>
  <artifactId>scope-default</artifactId>
  <version>1.0</version>
@ -35,4 +35,4 @@

  </dependencies>

-</model>
+</project>
--- a/maven-project/src/test/resources/projects/scope/transitive-provided-dep.xml
+++ b/maven-project/src/test/resources/projects/scope/transitive-provided-dep.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<model>
+<project>
  <groupId>maven-test</groupId>
  <artifactId>scope-provided</artifactId>
  <version>1.0</version>
@ -34,4 +34,4 @@
    </dependency>
  </dependencies>

-</model>
+</project>
--- a/maven-project/src/test/resources/projects/scope/transitive-runtime-dep.xml
+++ b/maven-project/src/test/resources/projects/scope/transitive-runtime-dep.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<model>
+<project>
  <groupId>maven-test</groupId>
  <artifactId>scope-runtime</artifactId>
  <version>1.0</version>
@ -35,4 +35,4 @@

  </dependencies>

-</model>
+</project>
--- a/maven-project/src/test/resources/projects/scope/transitive-test-dep.xml
+++ b/maven-project/src/test/resources/projects/scope/transitive-test-dep.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<model>
+<project>
  <groupId>maven-test</groupId>
  <artifactId>scope-test</artifactId>
  <version>1.0</version>
@ -35,4 +35,4 @@

  </dependencies>

-</model>
+</project>
--- a/maven-project/src/test/resources/validation/missing-1-pom.xml
+++ b/maven-project/src/test/resources/validation/missing-1-pom.xml
@ -1,2 +1,2 @@
-<model>
-</model>
+<project>
+</project>
--- a/maven-project/src/test/resources/validation/missing-artifactId-pom.xml
+++ b/maven-project/src/test/resources/validation/missing-artifactId-pom.xml
@ -1,6 +1,6 @@
-<model>
+<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>foo</groupId>
  <version>99.44</version>
  <packaging>bleh</packaging>
-</model>
+</project>
--- a/maven-project/src/test/resources/validation/missing-groupId-pom.xml
+++ b/maven-project/src/test/resources/validation/missing-groupId-pom.xml
@ -1,6 +1,6 @@
-<model>
+<project>
  <modelVersion>4.0.0</modelVersion>
  <artifactId>bar</artifactId>
  <version>99.44</version>
  <packaging>bleh</packaging>
-</model>
+</project>
--- a/maven-project/src/test/resources/validation/missing-modelVersion-pom.xml
+++ b/maven-project/src/test/resources/validation/missing-modelVersion-pom.xml
@ -1,6 +1,6 @@
-<model>
+<project>
  <groupId>foo</groupId>
  <artifactId>foo</artifactId>
  <version>99.44</version>
  <packaging>bleh</packaging>
-</model>
+</project>
--- a/maven-project/src/test/resources/validation/missing-type-pom.xml
+++ b/maven-project/src/test/resources/validation/missing-type-pom.xml
@ -1,7 +1,7 @@
-<model>
+<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>foo</groupId>
  <artifactId>bar</artifactId>
  <version>99.44</version>
  <packaging></packaging>
-</model>
+</project>
--- a/maven-project/src/test/resources/validation/missing-version-pom.xml
+++ b/maven-project/src/test/resources/validation/missing-version-pom.xml
@ -1,6 +1,6 @@
-<model>
+<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>foo</groupId>
  <artifactId>bar</artifactId>
  <packaging>bleh</packaging>
-</model>
+</project>