From f31be70def207c003f755a0ce42e5a26360f9b4b Mon Sep 17 00:00:00 2001
From: Benjamin Bentmann <bentmann@apache.org>
Date: Wed, 17 Sep 2008 22:08:01 +0000
Subject: [PATCH] o Reordered POM

git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@696491 13f79535-47bb-0310-9956-ffa450edef68
---
 its/core-integration-tests/pom.xml | 111 +++++++++++++++--------------
 its/pom.xml                        |  43 ++++++-----
 2 files changed, 79 insertions(+), 75 deletions(-)

diff --git a/its/core-integration-tests/pom.xml b/its/core-integration-tests/pom.xml
index 4d94306792..c3c81b6404 100644
--- a/its/core-integration-tests/pom.xml
+++ b/its/core-integration-tests/pom.xml
@@ -1,41 +1,75 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ 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/maven-v4_0_0.xsd">
+<!--
+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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.maven.its</groupId>
     <artifactId>core-integration-testing</artifactId>
     <version>2.1-SNAPSHOT</version>
     <relativePath>../core-integration-tests-support/pom.xml</relativePath>
   </parent>
+
   <artifactId>core-integration-tests</artifactId>
+
   <name>Maven Integration Tests</name>
+
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/maven/core-integration-testing/trunk/core-integration-tests</connection>
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk/core-integration-tests</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/maven/core-integration-testing/trunk/core-integration-tests</url>
+    <url>http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests</url>
   </scm>     
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.its</groupId>
+      <artifactId>maven-integration-test-helper</artifactId>
+      <version>2.1-SNAPSHOT</version>
+<!-- TODO: not transitive in tests artifact, so must be left in main scope
+      <scope>test</scope>
+-->
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.shared</groupId>
+      <artifactId>maven-verifier</artifactId>
+      <version>1.2-SNAPSHOT</version>
+<!-- TODO: not transitive in tests artifact, so must be left in main scope
+      <scope>test</scope>
+-->
+    </dependency>
+    <!--
+      Should be fine to introduce this here, even if we use the embedder as it should be using an isolated classloader 
+      Used to simplify tests that provide a test HTTP server.
+      -->
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty</artifactId>
+      <version>6.1.11</version>
+<!-- TODO: not transitive in tests artifact, so must be left in main scope
+      <scope>test</scope>
+-->
+    </dependency>
+  </dependencies>
+
   <build>
     <plugins>
       <plugin>
@@ -68,6 +102,7 @@
       </plugin>
     </plugins>
   </build>
+
   <profiles>
     <profile>
       <id>run-its</id>
@@ -84,34 +119,4 @@
       </build>
     </profile>
   </profiles>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven.its</groupId>
-      <artifactId>maven-integration-test-helper</artifactId>
-      <version>2.1-SNAPSHOT</version>
-<!-- TODO: not transitive in tests artifact, so must be left in main scope
-      <scope>test</scope>
--->
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.shared</groupId>
-      <artifactId>maven-verifier</artifactId>
-      <version>1.2-SNAPSHOT</version>
-<!-- TODO: not transitive in tests artifact, so must be left in main scope
-      <scope>test</scope>
--->
-    </dependency>
-    <!--
-      Should be fine to introduce this here, even if we use the embedder as it should be using an isolated classloader 
-      Used to simplify tests that provide a test HTTP server.
-      -->
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
-      <version>6.1.11</version>
-<!-- TODO: not transitive in tests artifact, so must be left in main scope
-      <scope>test</scope>
--->
-    </dependency>
-  </dependencies>
 </project>
diff --git a/its/pom.xml b/its/pom.xml
index e0db0edecf..d0e843d122 100644
--- a/its/pom.xml
+++ b/its/pom.xml
@@ -1,28 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ 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/maven-v4_0_0.xsd">
+<!--
+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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-parent</artifactId>