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 19:48:22 UTC
svn commit: r956257 - in
/maven/plugins/branches/maven-site-plugin-3.x/src/it: MSITE-265/ MSITE-304/
MSITE-304/child/ emma-plugin-it/ emma-plugin-it/a/ emma-plugin-it/b/
empty-report-set/ full-reporting/ it-plugin-test/ no-version/
report-changes-gener...
Author: hboutemy
Date: Sat Jun 19 17:48:21 2010
New Revision: 956257
URL: http://svn.apache.org/viewvc?rev=956257&view=rev
Log:
updated ITs pom format, groupId, artifactId, xsd url
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-265/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/child/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/a/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/b/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/empty-report-set/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/it-plugin-test/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/no-version/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/report-changes-generation/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/pom.xml
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-265/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-265/pom.xml?rev=956257&r1=956256&r2=956257&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-265/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-265/pom.xml Sat Jun 19 17:48:21 2010
@@ -19,17 +19,21 @@ 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">
+ 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>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/branches/maven-site-plugin-3.x/src/it/MSITE-304/child/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/child/pom.xml?rev=956257&r1=956256&r2=956257&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/child/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/child/pom.xml Sat Jun 19 17:48:21 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>
+ <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/branches/maven-site-plugin-3.x/src/it/MSITE-304/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/pom.xml?rev=956257&r1=956256&r2=956257&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/pom.xml Sat Jun 19 17:48:21 2010
@@ -16,14 +16,17 @@ 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>
+
<groupId>test</groupId>
- <artifactId>parent</artifactId>
- <packaging>pom</packaging>
+ <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/branches/maven-site-plugin-3.x/src/it/MSITE-304/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/verify.bsh?rev=956257&r1=956256&r2=956257&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/verify.bsh (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/verify.bsh Sat Jun 19 17:48:21 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/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/a/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/a/pom.xml?rev=956257&r1=956256&r2=956257&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/a/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/a/pom.xml Sat Jun 19 17:48:21 2010
@@ -1,13 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>
<groupId>org.apache.maven.plugins.site.its</groupId>
- <artifactId>it03</artifactId>
+ <artifactId>emma-plugin-it</artifactId>
<version>1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>it03-a</artifactId>
+
<name>EMMA plugin :: Integration test 03 :: A</name>
</project>
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/b/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/b/pom.xml?rev=956257&r1=956256&r2=956257&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/b/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/b/pom.xml Sat Jun 19 17:48:21 2010
@@ -1,13 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>
<groupId>org.apache.maven.plugins.site.its</groupId>
- <artifactId>it03</artifactId>
+ <artifactId>emma-plugin-it</artifactId>
<version>1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>it03-b</artifactId>
+
<name>EMMA plugin :: Integration test 03 :: B</name>
</project>
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/pom.xml?rev=956257&r1=956256&r2=956257&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/pom.xml Sat Jun 19 17:48:21 2010
@@ -1,13 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<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.plugins.site.its</groupId>
- <artifactId>it03</artifactId>
+ <artifactId>emma-plugin-it</artifactId>
<version>1.0-SNAPSHOT</version>
- <name>EMMA plugin :: Integration test 03</name>
<packaging>pom</packaging>
+
+ <name>EMMA plugin :: Integration test 03</name>
+
<dependencies>
<dependency>
<groupId>commons-lang</groupId>
@@ -26,6 +29,7 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -34,6 +38,7 @@
</plugin>
</plugins>
</build>
+
<reporting>
<excludeDefaults>true</excludeDefaults>
<plugins>
@@ -50,6 +55,7 @@
</plugin>
</plugins>
</reporting>
+
<modules>
<module>a</module>
<module>b</module>
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/empty-report-set/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/empty-report-set/pom.xml?rev=956257&r1=956256&r2=956257&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/empty-report-set/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/empty-report-set/pom.xml Sat Jun 19 17:48:21 2010
@@ -23,7 +23,7 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.its.site</groupId>
- <artifactId>test</artifactId>
+ <artifactId>empty-report-set</artifactId>
<version>0.1</version>
<packaging>jar</packaging>
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/pom.xml?rev=956257&r1=956256&r2=956257&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/pom.xml Sat Jun 19 17:48:21 2010
@@ -1,22 +1,26 @@
<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">
- <parent>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-parent</artifactId>
- <version>15</version>
- </parent>
+ 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>15</version>
+ </parent>
+
<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>
+
<properties>
<javadocPluginVersion>@javadocPluginVersion@</javadocPluginVersion>
<checkstylePluginVersion>@checkstylePluginVersion@</checkstylePluginVersion>
<projectInfoReportsPluginVersion>@projectInfoReportsPluginVersion@</projectInfoReportsPluginVersion>
</properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -25,6 +29,7 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -35,8 +40,8 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadocPluginVersion}</version>
- </plugin>
+ <version>${javadocPluginVersion}</version>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
@@ -46,9 +51,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>@projectInfoReportsPluginVersion@</version>
- </plugin>
+ </plugin>
</plugins>
- </build>
+ </build>
+
<reporting>
<plugins>
<plugin>
@@ -63,13 +69,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadocPluginVersion}</version>
- </plugin>
+ <version>${javadocPluginVersion}</version>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${checkstylePluginVersion}</version>
- </plugin>
+ </plugin>
</plugins>
</reporting>
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/it-plugin-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/it-plugin-test/pom.xml?rev=956257&r1=956256&r2=956257&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/it-plugin-test/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/it-plugin-test/pom.xml Sat Jun 19 17:48:21 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/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.plugins.it</groupId>
<artifactId>it-plugin-test</artifactId>
- <packaging>maven-plugin</packaging>
<version>1.0-SNAPSHOT</version>
+ <packaging>maven-plugin</packaging>
+
<name>it-plugin-test Maven Mojo</name>
<url>http://maven.apache.org</url>
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -20,6 +23,7 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<reporting>
<excludeDefaults>true</excludeDefaults>
<plugins>
@@ -27,7 +31,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>2.5.1</version>
- </plugin>
+ </plugin>
</plugins>
</reporting>
</project>
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/no-version/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/no-version/pom.xml?rev=956257&r1=956256&r2=956257&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/no-version/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/no-version/pom.xml Sat Jun 19 17:48:21 2010
@@ -1,12 +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>
+
<groupId>org.apache.maven.plugins.site.its</groupId>
- <artifactId>surefire-report</artifactId>
- <packaging>jar</packaging>
+ <artifactId>no-version</artifactId>
<version>1.0-SNAPSHOT</version>
- <name>surefire-report</name>
+ <packaging>jar</packaging>
+
+ <name>maven-site-plugin IT: no version</name>
+ <description>no version defined in report plugin configuration</description>
<url>http://maven.apache.org</url>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -15,6 +19,7 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -26,9 +31,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>2.4.3</version>
- </plugin>
+ </plugin>
</plugins>
- </build>
+ </build>
+
<reporting>
<excludeDefaults>true</excludeDefaults>
<plugins>
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/report-changes-generation/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/report-changes-generation/pom.xml?rev=956257&r1=956256&r2=956257&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/report-changes-generation/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/report-changes-generation/pom.xml Sat Jun 19 17:48:21 2010
@@ -20,14 +20,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">
+ 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</groupId>
- <artifactId>maven-changes-plugin-test</artifactId>
+
+ <groupId>org.apache.maven.plugins.site.its</groupId>
+ <artifactId>report-changes-generation</artifactId>
<version>99.0</version>
- <name>Maven</name>
<packaging>jar</packaging>
- <description>Test report.</description>
+
+ <name>maven-site-plugin IT: maven-changes-plugin</name>
+ <description>Test maven-changes-plugin report generation.</description>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -36,13 +39,16 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<issueManagement>
<system>jira</system>
<url>http://localhost/bla</url>
</issueManagement>
+
<properties>
<changesPluginVersion>2.1</changesPluginVersion>
</properties>
+
<build>
<pluginManagement>
<plugins>
@@ -52,15 +58,15 @@
<version>${changesPluginVersion}</version>
<configuration>
<issueLinkTemplate>http://myjira/browse/%ISSUE%</issueLinkTemplate>
- </configuration>
+ </configuration>
</plugin>
</plugins>
- </pluginManagement>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
- <version>${changesPluginVersion}</version>
+ <version>${changesPluginVersion}</version>
<executions>
<execution>
<id>validate-changes</id>
@@ -72,15 +78,16 @@
<failOnError>true</failOnError>
</configuration>
</execution>
- </executions>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>@pom.version@</version>
- </plugin>
+ </plugin>
</plugins>
- </build>
+ </build>
+
<reporting>
<excludeDefaults>true</excludeDefaults>
<plugins>
@@ -101,5 +108,5 @@
</plugin>
</plugins>
</reporting>
-
+
</project>
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/pom.xml?rev=956257&r1=956256&r2=956257&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/pom.xml Sat Jun 19 17:48:21 2010
@@ -19,25 +19,30 @@ 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">
+ 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>
<id>site-deploy</id>
<name>Example company web server</name>
- <url>file://@project.build.directory@/it/site-attach-descriptor/target/snapshot-repo/</url>
+ <url>file://@project.build.directory@/it/site-attach-descriptor/target/snapshot-repo/</url>
</snapshotRepository>
- </distributionManagement>
+ </distributionManagement>
+
<build>
<pluginManagement>
<plugins>
@@ -45,7 +50,7 @@ under the License.
<artifactId>maven-site-plugin</artifactId>
<version>@project.version@</version>
</plugin>
- </plugins>
+ </plugins>
</pluginManagement>
<plugins>
<plugin>
@@ -57,6 +62,7 @@ under the License.
</plugin>
</plugins>
</build>
+
<reporting>
<plugins>
<plugin>
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/verify.bsh?rev=956257&r1=956256&r2=956257&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/verify.bsh (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/verify.bsh Sat Jun 19 17:48:21 2010
@@ -37,7 +37,7 @@ try
{
System.err.println( "siteDescriptor file is missing from target or is a directory." );
return false;
- }
+ }
File siteDescriptorSwedish = new File ( target, "site-attach-descriptor-1.0-SNAPSHOT-site_sv.xml" );
if ( !siteDescriptorSwedish.exists() || siteDescriptorSwedish.isDirectory() )
@@ -45,9 +45,9 @@ try
System.err.println( "siteDescriptorSwedish file is missing from target or is a directory." );
return false;
}
-
-
- File artifactsDirectory = new File ( target, "snapshot-repo/test/site-attach-descriptor/1.0-SNAPSHOT");
+
+
+ File artifactsDirectory = new File ( target, "snapshot-repo/org/apache/maven/plugins/site/its/site-attach-descriptor/1.0-SNAPSHOT");
File[] files = artifactsDirectory.listFiles();
for (int i = 0; i < files.length; i++)
{
@@ -58,8 +58,8 @@ try
}
}
System.err.println( "site descriptor not deployed." );
- return false;
-
+ return false;
+
}
catch( IOException e )
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/pom.xml?rev=956257&r1=956256&r2=956257&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/pom.xml Sat Jun 19 17:48:21 2010
@@ -19,24 +19,29 @@ 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">
+ 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>
<name>Example company web server</name>
<url>file://@project.build.directory@/it/site-deploy/target/site-deployed/</url>
</site>
- </distributionManagement>
+ </distributionManagement>
+
<build>
<plugins>
<plugin>
@@ -45,6 +50,7 @@ under the License.
</plugin>
</plugins>
</build>
+
<reporting>
<plugins>
<plugin>
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/pom.xml?rev=956257&r1=956256&r2=956257&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/pom.xml Sat Jun 19 17:48:21 2010
@@ -19,24 +19,29 @@ 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">
+ 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>
<name>Example company web server</name>
<url>file://@project.build.directory@/it/site-deploy/target/site-deployed/</url>
</site>
- </distributionManagement>
+ </distributionManagement>
+
<build>
<plugins>
<plugin>
@@ -45,6 +50,7 @@ under the License.
</plugin>
</plugins>
</build>
+
<reporting>
<plugins>
<plugin>
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/pom.xml?rev=956257&r1=956256&r2=956257&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/pom.xml Sat Jun 19 17:48:21 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/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.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>
@@ -23,7 +27,8 @@
<version>@project.version@</version>
</plugin>
</plugins>
- </build>
+ </build>
+
<reporting>
<excludeDefaults>true</excludeDefaults>
<plugins>