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 2010/07/18 13:15:13 UTC
svn commit: r965210 - in /maven/ant-tasks/trunk/src/test: pom-order.xml
pom-with-parent.xml pom-with-parent2.xml pom-with-profiles.xml
pom-with-scopes.xml pom-with-system-scope.xml pom.xml simple-pom.xml
Author: hboutemy
Date: Sun Jul 18 11:15:12 2010
New Revision: 965210
URL: http://svn.apache.org/viewvc?rev=965210&view=rev
Log:
improved test poms format
Modified:
maven/ant-tasks/trunk/src/test/pom-order.xml
maven/ant-tasks/trunk/src/test/pom-with-parent.xml
maven/ant-tasks/trunk/src/test/pom-with-parent2.xml
maven/ant-tasks/trunk/src/test/pom-with-profiles.xml
maven/ant-tasks/trunk/src/test/pom-with-scopes.xml
maven/ant-tasks/trunk/src/test/pom-with-system-scope.xml
maven/ant-tasks/trunk/src/test/pom.xml
maven/ant-tasks/trunk/src/test/simple-pom.xml
Modified: maven/ant-tasks/trunk/src/test/pom-order.xml
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/test/pom-order.xml?rev=965210&r1=965209&r2=965210&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/test/pom-order.xml (original)
+++ maven/ant-tasks/trunk/src/test/pom-order.xml Sun Jul 18 11:15:12 2010
@@ -2,17 +2,19 @@
<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">
+ 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>it.ant-tasks</groupId>
<artifactId>order</artifactId>
+ <version>0.10-SNAPSHOT</version>
<packaging>jar</packaging>
<name>order</name>
- <version>0.10-SNAPSHOT</version>
<description>
Check dependencies order after resolution.
</description>
+
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
Modified: maven/ant-tasks/trunk/src/test/pom-with-parent.xml
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/test/pom-with-parent.xml?rev=965210&r1=965209&r2=965210&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/test/pom-with-parent.xml (original)
+++ maven/ant-tasks/trunk/src/test/pom-with-parent.xml Sun Jul 18 11:15:12 2010
@@ -1,11 +1,13 @@
<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">
+ 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>
+
<parent>
- <artifactId>pom</artifactId>
<groupId>it.ant-tasks</groupId>
+ <artifactId>pom</artifactId>
<version>1.0</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>project-with-parent-pom</artifactId>
<version>2.0-beta-4-SNAPSHOT</version>
</project>
Modified: maven/ant-tasks/trunk/src/test/pom-with-parent2.xml
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/test/pom-with-parent2.xml?rev=965210&r1=965209&r2=965210&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/test/pom-with-parent2.xml (original)
+++ maven/ant-tasks/trunk/src/test/pom-with-parent2.xml Sun Jul 18 11:15:12 2010
@@ -1,13 +1,16 @@
<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">
+ 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>
+
<parent>
- <artifactId>pom</artifactId>
<groupId>it.ant-tasks</groupId>
+ <artifactId>pom</artifactId>
<version>1.1</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>project-with-parent-pom</artifactId>
<version>2.0-beta-4-SNAPSHOT</version>
+
<repositories>
<repository>
<id>test.repo</id>
Modified: maven/ant-tasks/trunk/src/test/pom-with-profiles.xml
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/test/pom-with-profiles.xml?rev=965210&r1=965209&r2=965210&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/test/pom-with-profiles.xml (original)
+++ maven/ant-tasks/trunk/src/test/pom-with-profiles.xml Sun Jul 18 11:15:12 2010
@@ -2,22 +2,23 @@
<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">
+ 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>it.ant-tasks</groupId>
<artifactId>profiles</artifactId>
+ <version>0.10-SNAPSHOT</version>
<packaging>jar</packaging>
<name>profiles</name>
- <version>0.10-SNAPSHOT</version>
<description>
Check that the profiles work corretly.
</description>
-
+
<build>
<finalName>noprofile</finalName>
</build>
-
+
<profiles>
<profile>
<id>default</id>
Modified: maven/ant-tasks/trunk/src/test/pom-with-scopes.xml
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/test/pom-with-scopes.xml?rev=965210&r1=965209&r2=965210&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/test/pom-with-scopes.xml (original)
+++ maven/ant-tasks/trunk/src/test/pom-with-scopes.xml Sun Jul 18 11:15:12 2010
@@ -2,17 +2,19 @@
<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">
+ 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>it.ant-tasks</groupId>
<artifactId>scope-filtering</artifactId>
+ <version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Filter deps by scope</name>
- <version>1.0-SNAPSHOT</version>
<description>
Check dependencies order after resolution.
</description>
+
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
Modified: maven/ant-tasks/trunk/src/test/pom-with-system-scope.xml
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/test/pom-with-system-scope.xml?rev=965210&r1=965209&r2=965210&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/test/pom-with-system-scope.xml (original)
+++ maven/ant-tasks/trunk/src/test/pom-with-system-scope.xml Sun Jul 18 11:15:12 2010
@@ -1,13 +1,14 @@
<?xml version="1.0"?>
<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">
-
+ 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.ant-tasks.test</groupId>
<artifactId>pom-system-scope</artifactId>
<version>1.0-SNAPSHOT</version>
+
<name>Test system scope</name>
<dependencies>
@@ -19,5 +20,5 @@
<systemPath>${basedir}/lib/empty.jar</systemPath>
</dependency>
</dependencies>
-
+
</project>
Modified: maven/ant-tasks/trunk/src/test/pom.xml
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/test/pom.xml?rev=965210&r1=965209&r2=965210&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/test/pom.xml (original)
+++ maven/ant-tasks/trunk/src/test/pom.xml Sun Jul 18 11:15:12 2010
@@ -1,11 +1,13 @@
<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">
+ 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>it.ant-tasks</groupId>
<artifactId>simple-pom</artifactId>
<version>1.0</version>
- <name>Basic Test Pom</name>
<packaging>pom</packaging>
-
+
+ <name>Basic Test Pom</name>
+
</project>
Modified: maven/ant-tasks/trunk/src/test/simple-pom.xml
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/test/simple-pom.xml?rev=965210&r1=965209&r2=965210&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/test/simple-pom.xml (original)
+++ maven/ant-tasks/trunk/src/test/simple-pom.xml Sun Jul 18 11:15:12 2010
@@ -1,5 +1,6 @@
<project>
<modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.maven.test</groupId>
<artifactId>sample-build-test</artifactId>
<version>2.0-beta-4-SNAPSHOT</version>