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 2011/07/19 22:59:10 UTC
svn commit: r1148527 - in /maven/plugins/trunk/maven-site-plugin/src/it:
inheritedMenus-m3/ inheritedMenus/ inheritedMenus/parentAsRef/childAsRef/
inheritedMenus/parentAsRef/childAsRef/grandChildAsRef/
inheritedMenus/parentNotAsRef/childNotAsRef/ inher...
Author: hboutemy
Date: Tue Jul 19 20:59:10 2011
New Revision: 1148527
URL: http://svn.apache.org/viewvc?rev=1148527&view=rev
Log:
[MSITE-595] decoupled menu inheritance test from report inheritance (notice that both are actually failing) (merged from 3.x branch)
Removed:
maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus-m3/
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/invoker.properties
maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/grandChildAsRef/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/grandChildNotAsRef/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/verify.bsh
Modified: maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/invoker.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/invoker.properties?rev=1148527&r1=1148526&r2=1148527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/invoker.properties (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/invoker.properties Tue Jul 19 20:59:10 2011
@@ -1 +1,2 @@
+# Maven 3 has wrong menu items
invoker.maven.version = 3.0-
Modified: maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/grandChildAsRef/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/grandChildAsRef/pom.xml?rev=1148527&r1=1148526&r2=1148527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/grandChildAsRef/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/grandChildAsRef/pom.xml Tue Jul 19 20:59:10 2011
@@ -14,20 +14,4 @@
<name>Grand Child 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>
-
</project>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/pom.xml?rev=1148527&r1=1148526&r2=1148527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/pom.xml Tue Jul 19 20:59:10 2011
@@ -14,22 +14,6 @@
<name>Child 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>
-
<modules>
<module>grandChildAsRef</module>
</modules>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/grandChildNotAsRef/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/grandChildNotAsRef/pom.xml?rev=1148527&r1=1148526&r2=1148527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/grandChildNotAsRef/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/grandChildNotAsRef/pom.xml Tue Jul 19 20:59:10 2011
@@ -14,20 +14,4 @@
<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>
-
</project>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/pom.xml?rev=1148527&r1=1148526&r2=1148527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/pom.xml Tue Jul 19 20:59:10 2011
@@ -14,22 +14,6 @@
<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>
-
<modules>
<module>grandChildNotAsRef</module>
</modules>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/verify.bsh?rev=1148527&r1=1148526&r2=1148527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/verify.bsh (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/verify.bsh Tue Jul 19 20:59:10 2011
@@ -137,13 +137,6 @@ try
result = false;
}
- File childSummary = new File( childSiteDirectory, "project-summary.html" );
- if ( !childSummary.exists() || childSummary.isDirectory() )
- {
- System.err.println( "no summary file in child or is a directory." );
- result = false;
- }
-
// GRANDCHILD
@@ -202,13 +195,6 @@ try
result = false;
}
- File grandChildScm = new File( grandChildSiteDirectory, "source-repository.html" );
- if ( !grandChildScm.exists() || grandChildScm.isDirectory() )
- {
- System.err.println( "no source-repository file in grandchild or is a directory." );
- result = false;
- }
-
}
catch ( IOException e )
{