You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/09/18 00:08:02 UTC
svn commit: r696491 - in /maven/core-integration-testing/trunk:
core-integration-tests/pom.xml pom.xml
Author: bentmann
Date: Wed Sep 17 15:08:01 2008
New Revision: 696491
URL: http://svn.apache.org/viewvc?rev=696491&view=rev
Log:
o Reordered POM
Modified:
maven/core-integration-testing/trunk/core-integration-tests/pom.xml
maven/core-integration-testing/trunk/pom.xml
Modified: maven/core-integration-testing/trunk/core-integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/pom.xml?rev=696491&r1=696490&r2=696491&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/pom.xml Wed Sep 17 15:08:01 2008
@@ -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>
Modified: maven/core-integration-testing/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/pom.xml?rev=696491&r1=696490&r2=696491&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/pom.xml (original)
+++ maven/core-integration-testing/trunk/pom.xml Wed Sep 17 15:08:01 2008
@@ -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>