You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2010/09/11 23:05:42 UTC
svn commit: r996209 - in
/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497: ./ apps/
apps/app/ apps/app/src/ apps/app/src/main/ apps/app/src/main/java/
apps/app/src/main/java/org/ apps/app/src/main/java/org/apache/
apps/app/src/main/java/o...
Author: olamy
Date: Sat Sep 11 21:05:41 2010
New Revision: 996209
URL: http://svn.apache.org/viewvc?rev=996209&view=rev
Log:
[MSITE-497] Dependencies not included classpath for multi-level projects when forking reporting.
add it test.
Added:
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/app/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/app/pom.xml (with props)
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/app/src/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/app/src/main/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/app/src/main/java/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/app/src/main/java/org/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/app/src/main/java/org/apache/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/app/src/main/java/org/apache/maven/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/app/src/main/java/org/apache/maven/App.java (with props)
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/app/src/test/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/app/src/test/java/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/app/src/test/java/org/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/app/src/test/java/org/apache/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/app/src/test/java/org/apache/maven/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/app/src/test/java/org/apache/maven/AppTest.java (with props)
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/pom.xml (with props)
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/invoker.properties (with props)
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/pom.xml (with props)
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/src/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/src/site/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/src/site/apt/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/src/site/apt/index.apt (with props)
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/src/site/site.xml (with props)
Added: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/app/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/app/pom.xml?rev=996209&view=auto
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/app/pom.xml (added)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/app/pom.xml Sat Sep 11 21:05:41 2010
@@ -0,0 +1,26 @@
+<?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">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>foo.site</groupId>
+ <artifactId>apps</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>app</artifactId>
+ <name>app</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.16</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/app/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/app/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/app/src/main/java/org/apache/maven/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/app/src/main/java/org/apache/maven/App.java?rev=996209&view=auto
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/app/src/main/java/org/apache/maven/App.java (added)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/app/src/main/java/org/apache/maven/App.java Sat Sep 11 21:05:41 2010
@@ -0,0 +1,12 @@
+package org.apache.maven;
+
+import org.apache.log4j.Logger;
+
+public class App
+{
+ public static void main( String[] args )
+ {
+ Logger mylogger = Logger.getLogger("MyLogger");
+ mylogger.info( "Hello World!" );
+ }
+}
Propchange: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/app/src/main/java/org/apache/maven/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/app/src/main/java/org/apache/maven/App.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/app/src/test/java/org/apache/maven/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/app/src/test/java/org/apache/maven/AppTest.java?rev=996209&view=auto
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/app/src/test/java/org/apache/maven/AppTest.java (added)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/app/src/test/java/org/apache/maven/AppTest.java Sat Sep 11 21:05:41 2010
@@ -0,0 +1,38 @@
+package org.apache.maven;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/app/src/test/java/org/apache/maven/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/app/src/test/java/org/apache/maven/AppTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/pom.xml?rev=996209&view=auto
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/pom.xml (added)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/pom.xml Sat Sep 11 21:05:41 2010
@@ -0,0 +1,17 @@
+<?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">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>foo.site</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>apps</artifactId>
+ <packaging>pom</packaging>
+ <name>apps</name>
+
+ <modules>
+ <module>app</module>
+ </modules>
+</project>
\ No newline at end of file
Propchange: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/apps/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/invoker.properties
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/invoker.properties?rev=996209&view=auto
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/invoker.properties (added)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/invoker.properties Sat Sep 11 21:05:41 2010
@@ -0,0 +1 @@
+invoker.goals=test-compile site
\ No newline at end of file
Propchange: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/invoker.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/invoker.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/pom.xml?rev=996209&view=auto
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/pom.xml (added)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/pom.xml Sat Sep 11 21:05:41 2010
@@ -0,0 +1,76 @@
+<?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">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>foo.site</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>parent</name>
+
+ <modules>
+ <module>apps</module>
+ </modules>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.7</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <!-- version used by maven 2.x, maven 3 handled by profile -->
+ <version>2.1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>@projectInfoReportsPluginVersion@</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.7</version>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <profiles>
+ <profile>
+ <id>maven-3</id>
+ <activation>
+ <file>
+ <!-- This employs that the basedir expression is only recognized
+ by Maven 3.x (see MNG-2363) -->
+ <exists>${basedir}</exists>
+ </file>
+ </activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>@project.version@</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ </profiles>
+</project>
\ No newline at end of file
Propchange: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/src/site/apt/index.apt?rev=996209&view=auto
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/src/site/apt/index.apt (added)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/src/site/apt/index.apt Sat Sep 11 21:05:41 2010
@@ -0,0 +1,18 @@
+ -----
+ Title Here
+ -----
+ Author Here
+ -----
+ Date Here
+ -----
+
+Maven Site for your project
+
+ Congratulations! If you are looking at this page then you have successfully generated a
+ template site employing the site archetype and you have run:
+
++-----+
+
+mvn site
+
++-----+
Propchange: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/src/site/apt/index.apt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/src/site/apt/index.apt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/src/site/site.xml?rev=996209&view=auto
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/src/site/site.xml (added)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/src/site/site.xml Sat Sep 11 21:05:41 2010
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<project name="Maven" xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+ <body>
+ <links>
+ <item name="Maven" href="http://maven.apache.org/"/>
+ </links>
+
+ <menu name="Documentation">
+ <!--<item name="Xdoc Example" href="xdoc.html"/>-->
+ </menu>
+ </body>
+</project>
Propchange: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/src/site/site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/src/site/site.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision