You are viewing a plain text version of this content. The canonical link for it is here.
Posted to surefire-commits@maven.apache.org by vs...@apache.org on 2008/12/23 15:34:23 UTC
svn commit: r728968 - in /maven/surefire/trunk: ./ maven-surefire-plugin/
maven-surefire-report-plugin/ surefire-api/ surefire-booter/
surefire-integration-tests/ surefire-providers/
surefire-providers/surefire-junit/ surefire-providers/surefire-junit4...
Author: vsiveton
Date: Tue Dec 23 06:34:23 2008
New Revision: 728968
URL: http://svn.apache.org/viewvc?rev=728968&view=rev
Log:
o ordering pom
Modified:
maven/surefire/trunk/maven-surefire-plugin/pom.xml
maven/surefire/trunk/maven-surefire-report-plugin/pom.xml
maven/surefire/trunk/pom.xml
maven/surefire/trunk/surefire-api/pom.xml
maven/surefire/trunk/surefire-booter/pom.xml
maven/surefire/trunk/surefire-integration-tests/pom.xml
maven/surefire/trunk/surefire-providers/pom.xml
maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml
maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml
maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml
Modified: maven/surefire/trunk/maven-surefire-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/pom.xml?rev=728968&r1=728967&r2=728968&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/pom.xml (original)
+++ maven/surefire/trunk/maven-surefire-plugin/pom.xml Tue Dec 23 06:34:23 2008
@@ -19,19 +19,24 @@
-->
<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>
<artifactId>surefire</artifactId>
<groupId>org.apache.maven.surefire</groupId>
<version>2.5-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>maven-surefire-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<packaging>maven-plugin</packaging>
+
<name>Maven Surefire Plugin</name>
+
<prerequisites>
<maven>2.0.6</maven>
</prerequisites>
+
<mailingLists>
<!-- duplication from maven-plugins pom - temporary until they inherit properly -->
<mailingList>
@@ -82,12 +87,21 @@
<archive>http://mail-archives.apache.org/mod_mbox/maven-notifications/</archive>
</mailingList>
</mailingLists>
+
<contributors>
<contributor>
<name>Joakim Erdfelt</name>
<email>joakim@erdfelt.com</email>
</contributor>
</contributors>
+
+ <distributionManagement>
+ <site>
+ <id>apache.website</id>
+ <url>scp://people.apache.org/www/maven.apache.org/plugins/maven-surefire-plugin</url>
+ </site>
+ </distributionManagement>
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -122,7 +136,7 @@
<artifactId>maven-toolchain</artifactId>
<version>1.0</version>
</dependency>
-</dependencies>
+ </dependencies>
<build>
<plugins>
@@ -135,6 +149,15 @@
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+
<profiles>
<!-- Force JDK 1.4 for this one, plugins can never be built on 1.3 -->
<profile>
@@ -178,18 +201,4 @@
</build>
</profile>
</profiles>
- <distributionManagement>
- <site>
- <id>apache.website</id>
- <url>scp://people.apache.org/www/maven.apache.org/plugins/maven-surefire-plugin</url>
- </site>
- </distributionManagement>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
</project>
Modified: maven/surefire/trunk/maven-surefire-report-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/pom.xml?rev=728968&r1=728967&r2=728968&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/pom.xml (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/pom.xml Tue Dec 23 06:34:23 2008
@@ -19,19 +19,24 @@
-->
<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>
<artifactId>surefire</artifactId>
<groupId>org.apache.maven.surefire</groupId>
<version>2.5-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>maven-surefire-report-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<packaging>maven-plugin</packaging>
+
<name>Maven Surefire Report Plugin</name>
+
<prerequisites>
<maven>2.0.3</maven>
</prerequisites>
+
<developers>
<developer>
<id>jruiz</id>
@@ -39,6 +44,14 @@
<email>jruiz@exist.com</email>
</developer>
</developers>
+
+ <distributionManagement>
+ <site>
+ <id>apache.website</id>
+ <url>scp://people.apache.org/www/maven.apache.org/plugins/maven-surefire-report-plugin</url>
+ </site>
+ </distributionManagement>
+
<dependencies>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
@@ -120,12 +133,7 @@
</build>
</profile>
</profiles>
- <distributionManagement>
- <site>
- <id>apache.website</id>
- <url>scp://people.apache.org/www/maven.apache.org/plugins/maven-surefire-report-plugin</url>
- </site>
- </distributionManagement>
+
<reporting>
<plugins>
<plugin>
Modified: maven/surefire/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/pom.xml?rev=728968&r1=728967&r2=728968&view=diff
==============================================================================
--- maven/surefire/trunk/pom.xml (original)
+++ maven/surefire/trunk/pom.xml Tue Dec 23 06:34:23 2008
@@ -19,24 +19,24 @@
<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>
<artifactId>maven-parent</artifactId>
<groupId>org.apache.maven</groupId>
<version>10</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>
+
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire</artifactId>
+ <version>2.5-SNAPSHOT</version>
<packaging>pom</packaging>
+
<name>SureFire</name>
- <version>2.5-SNAPSHOT</version>
<description>Surefire is a test framework project.</description>
<url>http://maven.apache.org/surefire</url>
- <issueManagement>
- <system>jira</system>
- <url>http://jira.codehaus.org/browse/SUREFIRE</url>
- </issueManagement>
<inceptionYear>2004</inceptionYear>
+
<mailingLists>
<mailingList>
<name>Surefire User List</name>
@@ -71,6 +71,7 @@
</otherArchives>
</mailingList>
</mailingLists>
+
<contributors>
<contributor>
<name>Jesse Kuhnert</name>
@@ -84,11 +85,26 @@
</roles>
</contributor>
</contributors>
+
+ <modules>
+ <module>surefire-api</module>
+ <module>surefire-booter</module>
+ <module>surefire-providers</module>
+ <module>maven-surefire-plugin</module>
+ <module>maven-surefire-report-plugin</module>
+ <module>surefire-integration-tests</module>
+ </modules>
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/surefire/trunk/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/surefire/trunk/</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/maven/surefire/trunk</url>
</scm>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://jira.codehaus.org/browse/SUREFIRE</url>
+ </issueManagement>
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -122,6 +138,7 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -155,14 +172,6 @@
</plugins>
</pluginManagement>
</build>
- <modules>
- <module>surefire-api</module>
- <module>surefire-booter</module>
- <module>surefire-providers</module>
- <module>maven-surefire-plugin</module>
- <module>maven-surefire-report-plugin</module>
- <module>surefire-integration-tests</module>
- </modules>
<profiles>
<!-- use preinstalled JDK 1.3 to build and test -->
Modified: maven/surefire/trunk/surefire-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/pom.xml?rev=728968&r1=728967&r2=728968&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/pom.xml (original)
+++ maven/surefire/trunk/surefire-api/pom.xml Tue Dec 23 06:34:23 2008
@@ -18,14 +18,29 @@
-->
<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>
<artifactId>surefire</artifactId>
<groupId>org.apache.maven.surefire</groupId>
<version>2.5-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>surefire-api</artifactId>
<name>SureFire API</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.1</version>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
@@ -61,15 +76,4 @@
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.1</version>
- </dependency>
- </dependencies>
</project>
Modified: maven/surefire/trunk/surefire-booter/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/pom.xml?rev=728968&r1=728967&r2=728968&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/pom.xml (original)
+++ maven/surefire/trunk/surefire-booter/pom.xml Tue Dec 23 06:34:23 2008
@@ -18,14 +18,28 @@
~ 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>
<artifactId>surefire</artifactId>
<groupId>org.apache.maven.surefire</groupId>
<version>2.5-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>surefire-booter</artifactId>
<name>SureFire Booter</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
@@ -56,14 +70,4 @@
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </dependency>
- </dependencies>
</project>
\ No newline at end of file
Modified: maven/surefire/trunk/surefire-integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/pom.xml?rev=728968&r1=728967&r2=728968&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/pom.xml (original)
+++ maven/surefire/trunk/surefire-integration-tests/pom.xml Tue Dec 23 06:34:23 2008
@@ -19,15 +19,39 @@
-->
<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>
<artifactId>surefire</artifactId>
<groupId>org.apache.maven.surefire</groupId>
<version>2.5-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-integration-tests</artifactId>
+
<name>Maven Surefire Integration Tests</name>
+
+ <dependencies>
+ <!-- DGF Depend on the SurefireReportParser -->
+ <dependency>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-verifier</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
@@ -54,23 +78,4 @@
</plugin>
</plugins>
</build>
- <dependencies>
- <!-- DGF Depend on the SurefireReportParser -->
- <dependency>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <groupId>org.apache.maven.plugins</groupId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-verifier</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
</project>
Modified: maven/surefire/trunk/surefire-providers/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/pom.xml?rev=728968&r1=728967&r2=728968&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/pom.xml Tue Dec 23 06:34:23 2008
@@ -19,20 +19,25 @@
-->
<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>
<artifactId>surefire</artifactId>
<groupId>org.apache.maven.surefire</groupId>
<version>2.5-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>surefire-providers</artifactId>
<packaging>pom</packaging>
+
<name>SureFire Providers</name>
+
<modules>
<module>surefire-junit</module>
<module>surefire-junit4</module>
<module>surefire-testng</module>
</modules>
+
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
Modified: maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml?rev=728968&r1=728967&r2=728968&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml Tue Dec 23 06:34:23 2008
@@ -19,13 +19,17 @@
<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.surefire</groupId>
<artifactId>surefire-providers</artifactId>
<version>2.5-SNAPSHOT</version>
</parent>
+
<artifactId>surefire-junit</artifactId>
+
<name>SureFire JUnit Runner</name>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
Modified: maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml?rev=728968&r1=728967&r2=728968&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml Tue Dec 23 06:34:23 2008
@@ -19,13 +19,17 @@
<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.surefire</groupId>
<artifactId>surefire-providers</artifactId>
<version>2.5-SNAPSHOT</version>
</parent>
+
<artifactId>surefire-junit4</artifactId>
+
<name>SureFire JUnit4 Runner</name>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -33,6 +37,7 @@
<version>4.0</version>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
Modified: maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml?rev=728968&r1=728967&r2=728968&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml Tue Dec 23 06:34:23 2008
@@ -19,13 +19,17 @@
<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.surefire</groupId>
<artifactId>surefire-providers</artifactId>
<version>2.5-SNAPSHOT</version>
</parent>
+
<artifactId>surefire-testng</artifactId>
+
<name>SureFire TestNG Runner</name>
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -38,6 +42,27 @@
<version>3.8.1</version>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <fork>false</fork>
+ <compilerVersion>1.4</compilerVersion>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- DGF There are no tests in this project currently, and this
+ resolves SUREFIRE-414 -->
+ <skipExec>true</skipExec>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<!-- TODO: do we include both? Or just 1.5? No need for profile -->
<profiles>
<profile>
@@ -69,23 +94,4 @@
</dependencies>
</profile>
</profiles>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <fork>false</fork>
- <compilerVersion>1.4</compilerVersion>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- DGF There are no tests in this project currently, and this
- resolves SUREFIRE-414 -->
- <skipExec>true</skipExec>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>