Author: stephenc
Date: Mon Jun 27 11:10:57 2011
New Revision: 1140108
URL: http://svn.apache.org/viewvc?rev=1140108&view=rev
Log:
align with the canonical pom layout
Modified:
maven/surefire/trunk/maven-failsafe-plugin/pom.xml
maven/surefire/trunk/maven-surefire-common/pom.xml
maven/surefire/trunk/maven-surefire-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/common-junit3/pom.xml
maven/surefire/trunk/surefire-providers/pom.xml
maven/surefire/trunk/surefire-providers/surefire-junit3/pom.xml
maven/surefire/trunk/surefire-providers/surefire-testng-utils/pom.xml
maven/surefire/trunk/surefire-setup-integration-tests/pom.xml
maven/surefire/trunk/surefire-shadefire/pom.xml
Modified: maven/surefire/trunk/maven-failsafe-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/pom.xml?rev=1140108&r1=1140107&r2=1140108&view=diff
==============================================================================
--- maven/surefire/trunk/maven-failsafe-plugin/pom.xml (original)
+++ maven/surefire/trunk/maven-failsafe-plugin/pom.xml Mon Jun 27 11:10:57 2011
@@ -28,16 +28,12 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>maven-failsafe-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>Maven Failsafe Plugin</name>
- <prerequisites>
- <maven>2.0.9</maven>
- </prerequisites>
-
<mailingLists>
<!-- duplication from maven-plugins pom - temporary until they inherit
properly -->
<mailingList>
@@ -112,6 +108,10 @@
</mailingList>
</mailingLists>
+ <prerequisites>
+ <maven>2.0.9</maven>
+ </prerequisites>
+
<distributionManagement>
<site>
<id>apache.website</id>
Modified: maven/surefire/trunk/maven-surefire-common/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/pom.xml?rev=1140108&r1=1140107&r2=1140108&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/pom.xml (original)
+++ maven/surefire/trunk/maven-surefire-common/pom.xml Mon Jun 27 11:10:57 2011
@@ -28,8 +28,8 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>maven-surefire-common</artifactId>
<groupId>org.apache.maven.surefire</groupId>
+ <artifactId>maven-surefire-common</artifactId>
<name>Maven Surefire Common</name>
Modified: maven/surefire/trunk/maven-surefire-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/pom.xml?rev=1140108&r1=1140107&r2=1140108&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/pom.xml (original)
+++ maven/surefire/trunk/maven-surefire-plugin/pom.xml Mon Jun 27 11:10:57 2011
@@ -28,15 +28,18 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>maven-surefire-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>Maven Surefire Plugin</name>
- <prerequisites>
- <maven>2.0.9</maven>
- </prerequisites>
+ <contributors>
+ <contributor>
+ <name>Joakim Erdfelt</name>
+ <email>joa...@erdfelt.com</email>
+ </contributor>
+ </contributors>
<mailingLists>
<!-- duplication from maven-plugins pom - temporary until they inherit
properly -->
@@ -112,12 +115,9 @@
</mailingList>
</mailingLists>
- <contributors>
- <contributor>
- <name>Joakim Erdfelt</name>
- <email>joa...@erdfelt.com</email>
- </contributor>
- </contributors>
+ <prerequisites>
+ <maven>2.0.9</maven>
+ </prerequisites>
<distributionManagement>
<site>
Modified: maven/surefire/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/pom.xml?rev=1140108&r1=1140107&r2=1140108&view=diff
==============================================================================
--- maven/surefire/trunk/pom.xml (original)
+++ maven/surefire/trunk/pom.xml Mon Jun 27 11:10:57 2011
@@ -37,6 +37,20 @@
<url>http://maven.apache.org/surefire</url>
<inceptionYear>2004</inceptionYear>
+ <contributors>
+ <contributor>
+ <name>Jesse Kuhnert</name>
+ </contributor>
+ <contributor>
+ <name>Vincent Siveton</name>
+ <email>vincent.sive...@gmail.com</email>
+ <organization>ASF</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </contributor>
+ </contributors>
+
<mailingLists>
<mailingList>
<name>Surefire User List</name>
@@ -72,20 +86,6 @@
</mailingList>
</mailingLists>
- <contributors>
- <contributor>
- <name>Jesse Kuhnert</name>
- </contributor>
- <contributor>
- <name>Vincent Siveton</name>
- <email>vincent.sive...@gmail.com</email>
- <organization>ASF</organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- </contributor>
- </contributors>
-
<modules>
<module>surefire-shadefire</module>
<module>surefire-api</module>
@@ -112,7 +112,7 @@
<system>Jenkins</system>
<url>https://builds.apache.org/hudson/job/maven-surefire/</url>
</ciManagement>
-
+
<properties>
<mavenVersion>2.0.9</mavenVersion>
<shadedVersion>2.8</shadedVersion>
Modified: maven/surefire/trunk/surefire-api/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/pom.xml?rev=1140108&r1=1140107&r2=1140108&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/pom.xml (original)
+++ maven/surefire/trunk/surefire-api/pom.xml Mon Jun 27 11:10:57 2011
@@ -28,6 +28,7 @@
</parent>
<artifactId>surefire-api</artifactId>
+
<name>SureFire API</name>
<dependencies>
@@ -36,6 +37,7 @@
<artifactId>plexus-utils</artifactId>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
Modified: maven/surefire/trunk/surefire-booter/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/pom.xml?rev=1140108&r1=1140107&r2=1140108&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/pom.xml (original)
+++ maven/surefire/trunk/surefire-booter/pom.xml Mon Jun 27 11:10:57 2011
@@ -28,6 +28,7 @@
</parent>
<artifactId>surefire-booter</artifactId>
+
<name>SureFire Booter</name>
<dependencies>
Modified: maven/surefire/trunk/surefire-integration-tests/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/pom.xml?rev=1140108&r1=1140107&r2=1140108&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/pom.xml (original)
+++ maven/surefire/trunk/surefire-integration-tests/pom.xml Mon Jun 27 11:10:57
2011
@@ -33,6 +33,14 @@
<name>Maven Surefire Integration Tests</name>
+ <properties>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <it.settings.showPasswords>false</it.settings.showPasswords>
+ <testng.version>5.7</testng.version>
+ <surefire.threadcount>2</surefire.threadcount>
+ <surefire.build.version>2.8</surefire.build.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.maven.shared</groupId>
@@ -68,40 +76,6 @@
</dependencies>
- <profiles>
- <profile>
- <id>parallel</id>
- <!-- Experimental profile to try out parallel building of surefire
itself -->
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>${surefire.build.version}</version>
- <configuration>
- <parallel>classes</parallel>
- <threadCount>${surefire.threadcount}</threadCount>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
-
- </build>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <surefire.build.version>${project.version}</surefire.build.version>
- <!-- Until we release 2.7.3 -->
- </properties>
- </profile>
-
- </profiles>
<build>
<plugins>
<plugin>
@@ -188,11 +162,38 @@
</plugins>
</build>
- <properties>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <it.settings.showPasswords>false</it.settings.showPasswords>
- <testng.version>5.7</testng.version>
- <surefire.threadcount>2</surefire.threadcount>
- <surefire.build.version>2.8</surefire.build.version>
- </properties>
+ <profiles>
+ <profile>
+ <id>parallel</id>
+ <!-- Experimental profile to try out parallel building of surefire
itself -->
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>${surefire.build.version}</version>
+ <configuration>
+ <parallel>classes</parallel>
+ <threadCount>${surefire.threadcount}</threadCount>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <properties>
+ <surefire.build.version>${project.version}</surefire.build.version>
+ <!-- Until we release 2.7.3 -->
+ </properties>
+ </profile>
+
+ </profiles>
</project>
Modified: maven/surefire/trunk/surefire-providers/common-junit3/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/common-junit3/pom.xml?rev=1140108&r1=1140107&r2=1140108&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/common-junit3/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/common-junit3/pom.xml Mon Jun 27
11:10:57 2011
@@ -28,6 +28,7 @@
</parent>
<artifactId>common-junit3</artifactId>
+
<name>Shared JUnit3 provider code</name>
<dependencies>
@@ -38,4 +39,5 @@
<scope>provided</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=1140108&r1=1140107&r2=1140108&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/pom.xml Mon Jun 27 11:10:57 2011
@@ -49,6 +49,7 @@
<artifactId>surefire-api</artifactId>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
Modified: maven/surefire/trunk/surefire-providers/surefire-junit3/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit3/pom.xml?rev=1140108&r1=1140107&r2=1140108&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit3/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit3/pom.xml Mon Jun 27
11:10:57 2011
@@ -31,7 +31,21 @@
<name>SureFire JUnit Runner</name>
- <build>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>common-junit3</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
<resources>
<resource>
<directory>src/main/resources/META-INF</directory>
@@ -61,17 +75,5 @@
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>common-junit3</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
+
</project>
Modified: maven/surefire/trunk/surefire-providers/surefire-testng-utils/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng-utils/pom.xml?rev=1140108&r1=1140107&r2=1140108&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng-utils/pom.xml
(original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng-utils/pom.xml Mon
Jun 27 11:10:57 2011
@@ -1,6 +1,7 @@
<?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/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-providers</artifactId>
@@ -25,6 +26,37 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <minimizeJar>true</minimizeJar>
+ <artifactSet>
+ <includes>
+ <include>org.codehaus.plexus:plexus-utils</include>
+ </includes>
+ </artifactSet>
+ <relocations>
+ <relocation>
+ <pattern>org.codehaus.plexus.util</pattern>
+
<shadedPattern>org.apache.maven.surefire.shade.org.codehaus.plexus.util</shadedPattern>
+ </relocation>
+ </relocations>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<!-- TODO: do we include both? Or just 1.5? No need for profile -->
<profiles>
<profile>
@@ -56,35 +88,4 @@
</dependencies>
</profile>
</profiles>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <minimizeJar>true</minimizeJar>
- <artifactSet>
- <includes>
- <include>org.codehaus.plexus:plexus-utils</include>
- </includes>
- </artifactSet>
- <relocations>
- <relocation>
- <pattern>org.codehaus.plexus.util</pattern>
-
<shadedPattern>org.apache.maven.surefire.shade.org.codehaus.plexus.util</shadedPattern>
- </relocation>
- </relocations>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
Modified: maven/surefire/trunk/surefire-setup-integration-tests/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-setup-integration-tests/pom.xml?rev=1140108&r1=1140107&r2=1140108&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-setup-integration-tests/pom.xml (original)
+++ maven/surefire/trunk/surefire-setup-integration-tests/pom.xml Mon Jun 27
11:10:57 2011
@@ -33,6 +33,14 @@
<name>Maven Surefire Integration Test Setup</name>
+ <properties>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <it.settings.showPasswords>false</it.settings.showPasswords>
+ <testng.version>5.7</testng.version>
+ <surefire.threadcount>2</surefire.threadcount>
+ <surefire.build.version>2.8</surefire.build.version>
+ </properties>
+
<dependencies>
<dependency>
<artifactId>maven-surefire-report-plugin</artifactId>
@@ -102,7 +110,7 @@
</dependency>
</dependencies>
- <build>
+ <build>
<plugins>
<plugin>
<artifactId>maven-help-plugin</artifactId>
@@ -207,11 +215,4 @@
</plugins>
</build>
- <properties>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <it.settings.showPasswords>false</it.settings.showPasswords>
- <testng.version>5.7</testng.version>
- <surefire.threadcount>2</surefire.threadcount>
- <surefire.build.version>2.8</surefire.build.version>
- </properties>
</project>
Modified: maven/surefire/trunk/surefire-shadefire/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-shadefire/pom.xml?rev=1140108&r1=1140107&r2=1140108&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-shadefire/pom.xml (original)
+++ maven/surefire/trunk/surefire-shadefire/pom.xml Mon Jun 27 11:10:57 2011
@@ -20,20 +20,15 @@
<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/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
-
<groupId>org.apache.maven.surefire</groupId>
- <version>2.10-SNAPSHOT</version>
<artifactId>surefire-shadefire</artifactId>
+ <version>2.10-SNAPSHOT</version>
+
+ <name>surefire-shadefire</name>
<description>A super-shaded junit3 provider that is used by surefire to
build itself,
that basically has ALL classes relocated to facilitate no API-conflict
whatsover with ourself.
The only remaining point of conflict is around the booter properties file
format
</description>
- <name>surefire-shadefire</name>
-
- <properties>
- <shadedVersion>2.8</shadedVersion>
- </properties>
-
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
@@ -42,6 +37,10 @@
</license>
</licenses>
+ <properties>
+ <shadedVersion>2.8</shadedVersion>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -117,4 +116,5 @@
</plugin>
</plugins>
</build>
+
</project>
