Author: ltheussl
Date: Sat Apr 2 15:44:28 2011
New Revision: 1088050
URL: http://svn.apache.org/viewvc?rev=1088050&view=rev
Log:
re-add IT inheritedMenus with m3-style plugin configuration, this passes on
both m2 and m3
Added:
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus-m3/
- copied from r1088048,
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/
Removed:
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus-m3/invoker.properties
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus-m3/README
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus-m3/parentNotAsRef/childNotAsRef/grandChildNotAsRef/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus-m3/parentNotAsRef/childNotAsRef/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus-m3/parentNotAsRef/pom.xml
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus-m3/README
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus-m3/README?rev=1088050&r1=1088048&r2=1088050&view=diff
==============================================================================
---
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus-m3/README
(original)
+++
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus-m3/README
Sat Apr 2 15:44:28 2011
@@ -4,4 +4,5 @@ except for the inheritAsRef parameter in
No tests are run for parentAsRef/, it is only built for comparison.
-FIXME: the IT currently fails with m3, see MSITE-560
\ No newline at end of file
+This is identical to IT inheritedMenus (which currently fails with m3, see
MSITE-560),
+apart from m3-style plugin configuration.
\ No newline at end of file
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus-m3/parentNotAsRef/childNotAsRef/grandChildNotAsRef/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus-m3/parentNotAsRef/childNotAsRef/grandChildNotAsRef/pom.xml?rev=1088050&r1=1088048&r2=1088050&view=diff
==============================================================================
---
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus-m3/parentNotAsRef/childNotAsRef/grandChildNotAsRef/pom.xml
(original)
+++
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus-m3/parentNotAsRef/childNotAsRef/grandChildNotAsRef/pom.xml
Sat Apr 2 15:44:28 2011
@@ -14,20 +14,26 @@
<name>GrandChild Not As Ref</name>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.3.1</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>scm</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- </plugins>
- </reporting>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <reportPlugins>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <reports>
+ <report>index</report>
+ <report>summary</report>
+ <report>scm</report>
+ </reports>
+ </plugin>
+ </reportPlugins>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus-m3/parentNotAsRef/childNotAsRef/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus-m3/parentNotAsRef/childNotAsRef/pom.xml?rev=1088050&r1=1088048&r2=1088050&view=diff
==============================================================================
---
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus-m3/parentNotAsRef/childNotAsRef/pom.xml
(original)
+++
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus-m3/parentNotAsRef/childNotAsRef/pom.xml
Sat Apr 2 15:44:28 2011
@@ -14,21 +14,26 @@
<name>Child Not As Ref</name>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.3.1</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>summary</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- </plugins>
- </reporting>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <reportPlugins>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <reports>
+ <report>index</report>
+ <report>summary</report>
+ </reports>
+ </plugin>
+ </reportPlugins>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
<modules>
<module>grandChildNotAsRef</module>
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus-m3/parentNotAsRef/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus-m3/parentNotAsRef/pom.xml?rev=1088050&r1=1088048&r2=1088050&view=diff
==============================================================================
---
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus-m3/parentNotAsRef/pom.xml
(original)
+++
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus-m3/parentNotAsRef/pom.xml
Sat Apr 2 15:44:28 2011
@@ -26,27 +26,22 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>@project.version@</version>
+ <configuration>
+ <reportPlugins>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.3.1</version>
+ <reports>
+ <report>index</report>
+ </reports>
+ </plugin>
+ </reportPlugins>
+ </configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.3.1</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>index</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- </plugins>
- </reporting>
-
<modules>
<module>childNotAsRef</module>
</modules>
