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/06/19 22:23:58 UTC
svn commit: r956287 - in /maven/plugins/trunk/maven-site-plugin: ./
src/it/MSITE-265/ src/it/MSITE-304/ src/it/MSITE-304/child/
src/it/full-reporting/ src/it/site-attach-descriptor/ src/it/site-deploy/
src/it/site-jar/ src/it/surefire-report/
Author: hboutemy
Date: Sat Jun 19 20:23:57 2010
New Revision: 956287
URL: http://svn.apache.org/viewvc?rev=956287&view=rev
Log:
updated ITs pom format, groupId, artifactId, xsd url (merged from 3.0.x branch r956257 & r956281)
Modified:
maven/plugins/trunk/maven-site-plugin/ (props changed)
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/verify.bsh
maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/site-jar/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/surefire-report/pom.xml
Propchange: maven/plugins/trunk/maven-site-plugin/
------------------------------------------------------------------------------
svn:mergeinfo = /maven/plugins/branches/maven-site-plugin-3.x:956257
Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml?rev=956287&r1=956286&r2=956287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml Sat Jun 19 20:23:57 2010
@@ -21,15 +21,19 @@ under the License.
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>test</groupId>
+
+ <groupId>org.apache.maven.plugins.site.its</groupId>
<artifactId>MSITE-265</artifactId>
- <packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
<name>MSITE-265 It</name>
+
<properties>
<currentVersion>2.0.7</currentVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
+
<build>
<plugins>
<plugin>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/pom.xml?rev=956287&r1=956286&r2=956287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/pom.xml Sat Jun 19 20:23:57 2010
@@ -16,16 +16,18 @@ KIND, either express or implied. See th
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">
+<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>test</groupId>
- <artifactId>parent</artifactId>
+ <groupId>org.apache.maven.plugins.site.its</groupId>
+ <artifactId>MSITE-304-parent</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child</artifactId>
- <packaging>pom</packaging>
+
+ <artifactId>MSITE-304-child</artifactId>
<version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
<name>MSITE-304 IT child</name>
<url>http://www.example.com/parent/child/</url>
</project>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/pom.xml?rev=956287&r1=956286&r2=956287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/pom.xml Sat Jun 19 20:23:57 2010
@@ -18,12 +18,15 @@ 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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>test</groupId>
- <artifactId>parent</artifactId>
- <packaging>pom</packaging>
+
+ <groupId>org.apache.maven.plugins.site.its</groupId>
+ <artifactId>MSITE-304-parent</artifactId>
<version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
<name>MSITE-304 IT parent</name>
<url>http://www.example.com/parent/</url>
+
<distributionManagement>
<site>
<id>msite-304</id>
@@ -31,6 +34,7 @@ under the License.
<url>file://${java.io.tmpdir}/www.example.com/parent</url>
</site>
</distributionManagement>
+
<modules>
<module>child</module>
</modules>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh?rev=956287&r1=956286&r2=956287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh Sat Jun 19 20:23:57 2010
@@ -48,7 +48,7 @@ try
return false;
}
- File childDirectory = new File ( stagingDirectory, "localhost/" + strippedTmpDir + "/www.example.com/parent/child" );
+ File childDirectory = new File ( stagingDirectory, "localhost/" + strippedTmpDir + "/www.example.com/parent/MSITE-304-child" );
if ( !childDirectory.exists() || !childDirectory.isDirectory() )
{
System.err.println( "Staging directory for child '" + childDirectory + "' is missing or not a directory." );
@@ -62,14 +62,14 @@ try
return false;
}
- File validChildStageDeployDirectory = new File ( stageDeployDirectory, "staging/child" );
+ File validChildStageDeployDirectory = new File ( stageDeployDirectory, "staging/MSITE-304-child" );
if ( !validChildStageDeployDirectory.exists() || !validChildStageDeployDirectory.isDirectory() )
{
System.err.println( "Valid stage deploy directory for child '" + validChildStageDeployDirectory + "' is missing or not a directory." );
return false;
}
- File invalidChildStageDeployDirectory = new File ( stageDeployDirectory, "child/staging" );
+ File invalidChildStageDeployDirectory = new File ( stageDeployDirectory, "MSITE-304-child/staging" );
if ( invalidChildStageDeployDirectory.exists() && invalidChildStageDeployDirectory.isDirectory() )
{
System.err.println( "Invalid stage deploy directory for child '" + invalidChildStageDeployDirectory + "' is present." );
Modified: maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/pom.xml?rev=956287&r1=956286&r2=956287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/pom.xml Sat Jun 19 20:23:57 2010
@@ -1,17 +1,20 @@
<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</groupId>
<artifactId>maven-parent</artifactId>
<version>11</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.maven.plugins.site.its</groupId>
- <artifactId>surefire-report</artifactId>
- <packaging>jar</packaging>
+ <artifactId>full-reporting</artifactId>
<version>1.0-SNAPSHOT</version>
- <name>surefire-report</name>
+ <packaging>jar</packaging>
+
+ <name>maven-site-plugin IT: full reporting</name>
<url>http://maven.apache.org</url>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -20,6 +23,7 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -29,6 +33,7 @@
</plugin>
</plugins>
</build>
+
<reporting>
<plugins>
<plugin>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/pom.xml?rev=956287&r1=956286&r2=956287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/pom.xml Sat Jun 19 20:23:57 2010
@@ -21,15 +21,19 @@ under the License.
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>test</groupId>
+
+ <groupId>org.apache.maven.plugins.site.its</groupId>
<artifactId>site-attach-descriptor</artifactId>
- <packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
- <name>site-attach-descriptor It</name>
+ <packaging>pom</packaging>
+
+ <name>site-attach-descriptor IT</name>
+
<properties>
<currentVersion>2.0.7</currentVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
+
<distributionManagement>
<snapshotRepository>
<uniqueVersion>false</uniqueVersion>
@@ -38,6 +42,7 @@ under the License.
<url>file://@project.build.directory@/it/site-attach-descriptor/target/snapshot-repo/</url>
</snapshotRepository>
</distributionManagement>
+
<build>
<pluginManagement>
<plugins>
@@ -57,6 +62,7 @@ under the License.
</plugin>
</plugins>
</build>
+
<reporting>
<plugins>
<plugin>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/verify.bsh?rev=956287&r1=956286&r2=956287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/verify.bsh (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/verify.bsh Sat Jun 19 20:23:57 2010
@@ -37,9 +37,9 @@ try
{
System.err.println( "siteDescriptor file is missing from target or is a directory." );
return false;
- }
-
- File siteDescriptor = new File ( target, "snapshot-repo/test/site-attach-descriptor/1.0-SNAPSHOT/site-attach-descriptor-1.0-SNAPSHOT-site.xml" );
+ }
+
+ File siteDescriptor = new File ( target, "snapshot-repo/org/apache/maven/plugins/site/its/site-attach-descriptor/1.0-SNAPSHOT/site-attach-descriptor-1.0-SNAPSHOT-site.xml" );
if ( !siteDescriptor.exists() || siteDescriptor.isDirectory() )
{
System.err.println( "siteDescriptor file is missing from local repository or is a directory." );
Modified: maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/pom.xml?rev=956287&r1=956286&r2=956287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/pom.xml Sat Jun 19 20:23:57 2010
@@ -21,15 +21,19 @@ under the License.
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>test</groupId>
+
+ <groupId>org.apache.maven.plugins.site.its</groupId>
<artifactId>site-deploy</artifactId>
- <packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
- <name>site-deploy It</name>
+ <packaging>pom</packaging>
+
+ <name>site-deploy IT</name>
+
<properties>
<currentVersion>2.0.7</currentVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
+
<distributionManagement>
<site>
<id>site-deploy</id>
@@ -37,6 +41,7 @@ under the License.
<url>file://@project.build.directory@/it/site-deploy/target/site-deployed/</url>
</site>
</distributionManagement>
+
<build>
<plugins>
<plugin>
@@ -45,6 +50,7 @@ under the License.
</plugin>
</plugins>
</build>
+
<reporting>
<plugins>
<plugin>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/site-jar/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-jar/pom.xml?rev=956287&r1=956286&r2=956287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-jar/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-jar/pom.xml Sat Jun 19 20:23:57 2010
@@ -21,15 +21,19 @@ under the License.
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>test</groupId>
+
+ <groupId>org.apache.maven.plugins.site.its</groupId>
<artifactId>site-jar</artifactId>
- <packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
- <name>site-jar It</name>
+ <packaging>pom</packaging>
+
+ <name>site-jar IT</name>
+
<properties>
<currentVersion>2.0.7</currentVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
+
<distributionManagement>
<site>
<id>site-deploy</id>
@@ -37,6 +41,7 @@ under the License.
<url>file://@project.build.directory@/it/site-deploy/target/site-deployed/</url>
</site>
</distributionManagement>
+
<build>
<plugins>
<plugin>
@@ -45,6 +50,7 @@ under the License.
</plugin>
</plugins>
</build>
+
<reporting>
<plugins>
<plugin>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/surefire-report/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/surefire-report/pom.xml?rev=956287&r1=956286&r2=956287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/surefire-report/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/surefire-report/pom.xml Sat Jun 19 20:23:57 2010
@@ -1,12 +1,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.plugins.site.its</groupId>
<artifactId>surefire-report</artifactId>
- <packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
- <name>surefire-report</name>
+ <packaging>jar</packaging>
+
+ <name>surefire-report IT</name>
<url>http://maven.apache.org</url>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -15,6 +18,7 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -24,6 +28,7 @@
</plugin>
</plugins>
</build>
+
<reporting>
<excludeDefaults>true</excludeDefaults>
<plugins>