This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-jxr.git


The following commit(s) were added to refs/heads/master by this push:
     new fb8790d  [JXR-110] Use equivalent css/images of javadoc
fb8790d is described below

commit fb8790d53e86c2acd601e41398ae4bb8e38443d4
Author: Jesper Udby <[email protected]>
AuthorDate: Fri Sep 21 14:06:30 2018 +0200

    [JXR-110] Use equivalent css/images of javadoc
---
 maven-jxr-plugin/pom.xml                           |   4 +
 .../src/it/JXR-100_parameterlink/pom.xml           |   3 +
 .../src/it/JXR-135_innerclasses/pom.xml            |   3 +
 maven-jxr-plugin/src/it/aggregate/pom.xml          |   5 +-
 .../src/it/mixed-plugin-report/pom.xml             |   8 +-
 .../src/it/mixed-plugin-report/verify.groovy       |   2 +-
 maven-jxr-plugin/src/it/new-site-config/pom.xml    |   3 +
 maven-jxr-plugin/src/it/simple-project/pom.xml     |   5 +-
 .../apache/maven/plugin/jxr/AbstractJxrReport.java | 152 ++++-
 .../src/main/resources/jdk4/stylesheet.css         |  79 +++
 .../src/main/resources/jdk6/stylesheet.css         |  80 +++
 .../main/resources/jdk7/resources/background.gif   | Bin 0 -> 2313 bytes
 .../src/main/resources/jdk7/resources/tab.gif      | Bin 0 -> 291 bytes
 .../src/main/resources/jdk7/resources/titlebar.gif | Bin 0 -> 10701 bytes
 .../main/resources/jdk7/resources/titlebar_end.gif | Bin 0 -> 849 bytes
 .../src/main/resources/jdk7/stylesheet.css         | 526 +++++++++++++++++
 .../src/main/resources/jdk8/stylesheet.css         | 626 +++++++++++++++++++++
 .../org/apache/maven/plugin/jxr/JxrReportTest.java | 174 +++++-
 .../aggregate-test-plugin-config.xml               |   2 +-
 ...l => default-configuration-plugin-config-4.xml} |   9 +-
 ...l => default-configuration-plugin-config-6.xml} |   9 +-
 ...l => default-configuration-plugin-config-7.xml} |   9 +-
 ...l => default-configuration-plugin-config-8.xml} |   9 +-
 .../default-configuration-plugin-config.xml        |   1 +
 .../exclude-configuration-plugin-config.xml        |   2 +-
 .../include-configuration-plugin-config.xml        |   2 +-
 .../nojavadocdir-test-plugin-config.xml            |   2 +-
 .../nojavadoclink-configuration-plugin-config.xml  |   2 +-
 .../testsourcedir-test-plugin-config.xml           |   2 +-
 maven-jxr/pom.xml                                  |   4 +
 .../resources/templates/jdk4/allclasses-frame.vm   |  45 ++
 .../src/main/resources/templates/jdk4/index.vm     |  42 ++
 .../resources/templates/jdk4/overview-frame.vm     |  53 ++
 .../resources/templates/jdk4/overview-summary.vm   | 144 +++++
 .../main/resources/templates/jdk4/package-frame.vm |  48 ++
 .../resources/templates/jdk4/package-summary.vm    | 142 +++++
 .../resources/templates/jdk7/allclasses-frame.vm   |  39 ++
 .../src/main/resources/templates/jdk7/index.vm     |  94 ++++
 .../resources/templates/jdk7/overview-frame.vm     |  45 ++
 .../resources/templates/jdk7/overview-summary.vm   | 131 +++++
 .../main/resources/templates/jdk7/package-frame.vm |  42 ++
 .../resources/templates/jdk7/package-summary.vm    | 140 +++++
 .../resources/templates/jdk8/allclasses-frame.vm   |  39 ++
 .../src/main/resources/templates/jdk8/index.vm     |  94 ++++
 .../resources/templates/jdk8/overview-frame.vm     |  45 ++
 .../resources/templates/jdk8/overview-summary.vm   | 125 ++++
 .../main/resources/templates/jdk8/package-frame.vm |  42 ++
 .../resources/templates/jdk8/package-summary.vm    | 140 +++++
 .../org/apache/maven/jxr/IncludeExcludeTest.java   |   2 +-
 .../java/org/apache/maven/jxr/JxrBeanTest.java     |   2 +-
 pom.xml                                            |  32 ++
 51 files changed, 3161 insertions(+), 48 deletions(-)

diff --git a/maven-jxr-plugin/pom.xml b/maven-jxr-plugin/pom.xml
index 7535bb5..6ee4292 100644
--- a/maven-jxr-plugin/pom.xml
+++ b/maven-jxr-plugin/pom.xml
@@ -139,6 +139,10 @@ under the License.
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-java</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
     </dependency>
     <dependency>
diff --git a/maven-jxr-plugin/src/it/JXR-100_parameterlink/pom.xml 
b/maven-jxr-plugin/src/it/JXR-100_parameterlink/pom.xml
index 2a856d1..a610413 100644
--- a/maven-jxr-plugin/src/it/JXR-100_parameterlink/pom.xml
+++ b/maven-jxr-plugin/src/it/JXR-100_parameterlink/pom.xml
@@ -30,6 +30,9 @@ under the License.
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jxr-plugin</artifactId>
                 <version>@project.version@</version>
+                <configuration>
+                    <javadocVersion>1.4</javadocVersion>
+                </configuration>
             </plugin>
         </plugins>
       </pluginManagement>
diff --git a/maven-jxr-plugin/src/it/JXR-135_innerclasses/pom.xml 
b/maven-jxr-plugin/src/it/JXR-135_innerclasses/pom.xml
index 460d365..ae61f1e 100644
--- a/maven-jxr-plugin/src/it/JXR-135_innerclasses/pom.xml
+++ b/maven-jxr-plugin/src/it/JXR-135_innerclasses/pom.xml
@@ -30,6 +30,9 @@ under the License.
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jxr-plugin</artifactId>
                 <version>@project.version@</version>
+                <configuration>
+                    <javadocVersion>1.4</javadocVersion>
+                </configuration>
             </plugin>
         </plugins>
       </pluginManagement>
diff --git a/maven-jxr-plugin/src/it/aggregate/pom.xml 
b/maven-jxr-plugin/src/it/aggregate/pom.xml
index abfd3b0..c1ccbee 100644
--- a/maven-jxr-plugin/src/it/aggregate/pom.xml
+++ b/maven-jxr-plugin/src/it/aggregate/pom.xml
@@ -56,12 +56,15 @@ under the License.
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jxr-plugin</artifactId>
                 <version>@project.version@</version>
+                <configuration>
+                    <javadocVersion>1.4</javadocVersion>
+                </configuration>
                 <reportSets>
                     <reportSet>
                         <id>aggregate</id>
                         <reports>
                             <report>aggregate</report>
-                           <report>test-aggregate</report>
+                            <report>test-aggregate</report>
                         </reports>
                     </reportSet>
                 </reportSets>
diff --git a/maven-jxr-plugin/src/it/mixed-plugin-report/pom.xml 
b/maven-jxr-plugin/src/it/mixed-plugin-report/pom.xml
index b810f0c..0d211a7 100644
--- a/maven-jxr-plugin/src/it/mixed-plugin-report/pom.xml
+++ b/maven-jxr-plugin/src/it/mixed-plugin-report/pom.xml
@@ -57,7 +57,10 @@ under the License.
             <phase>site</phase>
           </execution>
         </executions>
-      </plugin> 
+        <configuration>
+          <javadocVersion>1.4</javadocVersion>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
@@ -93,6 +96,9 @@ under the License.
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jxr-plugin</artifactId>
         <version>@project.version@</version>
+        <configuration>
+          <javadocVersion>1.4</javadocVersion>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/maven-jxr-plugin/src/it/mixed-plugin-report/verify.groovy 
b/maven-jxr-plugin/src/it/mixed-plugin-report/verify.groovy
index 5a2d553..f56bdcd 100644
--- a/maven-jxr-plugin/src/it/mixed-plugin-report/verify.groovy
+++ b/maven-jxr-plugin/src/it/mixed-plugin-report/verify.groovy
@@ -40,5 +40,5 @@ assert content.contains( 'App2.html' );
 content = new File( basedir, 
'target/site/xref/org/apache/maven/jxr/it2/App.html' ).text;
 assert content.contains( 'App2.html' );
 content = new File( basedir, 'target/site/xref/index.html' ).text;
-assert content.contains( '<!-- this is a JXR report set -->' );
+assert content.contains( '<!-- this is a JXR report set (jdk4) -->' );
 return true;
\ No newline at end of file
diff --git a/maven-jxr-plugin/src/it/new-site-config/pom.xml 
b/maven-jxr-plugin/src/it/new-site-config/pom.xml
index 8f4572b..7074d28 100644
--- a/maven-jxr-plugin/src/it/new-site-config/pom.xml
+++ b/maven-jxr-plugin/src/it/new-site-config/pom.xml
@@ -51,6 +51,9 @@ under the License.
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-jxr-plugin</artifactId>
               <version>@project.version@</version>
+              <configuration>
+                <javadocVersion>1.4</javadocVersion>
+              </configuration>
             </plugin>
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
diff --git a/maven-jxr-plugin/src/it/simple-project/pom.xml 
b/maven-jxr-plugin/src/it/simple-project/pom.xml
index 3c410d7..59daa6b 100644
--- a/maven-jxr-plugin/src/it/simple-project/pom.xml
+++ b/maven-jxr-plugin/src/it/simple-project/pom.xml
@@ -45,7 +45,7 @@ under the License.
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jxr-plugin</artifactId>
         <version>@project.version@</version>
-      </plugin>    
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
@@ -61,6 +61,9 @@ under the License.
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jxr-plugin</artifactId>
         <version>@project.version@</version>
+        <configuration>
+          <javadocVersion>1.4</javadocVersion>
+        </configuration>
       </plugin>
     </plugins>
   </reporting>
diff --git 
a/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java
 
b/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java
index 0e0f1bc..fa2085c 100644
--- 
a/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java
+++ 
b/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java
@@ -41,6 +41,7 @@ import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.reporting.AbstractMavenReport;
 import org.apache.maven.reporting.MavenReportException;
+import org.codehaus.plexus.languages.java.version.JavaVersion;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.StringUtils;
@@ -107,14 +108,14 @@ public abstract class AbstractJxrReport
      * Directory where Velocity templates can be found to generate overviews, 
frames and summaries. Should not be used.
      * If used, should be an absolute path, like 
<code>"${basedir}/myTemplates"</code>.
      */
-    @Parameter( defaultValue = "templates" )
+    @Parameter
     private String templateDir;
 
     /**
      * Style sheet used for the Xref HTML files. Should not be used. If used, 
should be an absolute path, like
      * <code>"${basedir}/myStyles.css"</code>.
      */
-    @Parameter( defaultValue = "stylesheet.css" )
+    @Parameter
     private String stylesheet;
 
     /**
@@ -155,6 +156,19 @@ public abstract class AbstractJxrReport
     private boolean linkJavadoc;
 
     /**
+     * Version of the Javadoc templates to use.
+     * The value should reflect `java.specification.version`, "1.4", "1.8", 
"9", "10",
+     * by default this system property is used.
+     */
+    @Parameter( property = "javadocVersion" )
+    private String javadocVersion;
+
+    /**
+     * Version of the Javadoc templates to use.
+     */
+    private JavaVersion javadocTemplatesVersion;
+
+    /**
      * Gets the effective reporting output files encoding.
      *
      * @return The effective reporting output file encoding, never 
<code>null</code>: defaults to <code>UTF-8</code>
@@ -248,7 +262,7 @@ public abstract class AbstractJxrReport
      * @throws org.apache.maven.jxr.JxrException
      */
     private void createXref( Locale locale, String destinationDirectory, 
List<String> sourceDirs )
-        throws IOException, JxrException
+        throws IOException, JxrException, MavenReportException
     {
         JXR jxr = new JXR();
         jxr.setDest( Paths.get( destinationDirectory ) );
@@ -279,7 +293,7 @@ public abstract class AbstractJxrReport
         try
         {
             Thread.currentThread().setContextClassLoader( 
getClass().getClassLoader() );
-            jxr.xref( sourceDirs, templateDir, windowTitle, docTitle, 
getBottomText() );
+            jxr.xref( sourceDirs, getTemplateDir(), windowTitle, docTitle, 
getBottomText() );
         }
         finally
         {
@@ -356,26 +370,84 @@ public abstract class AbstractJxrReport
      */
     private void copyRequiredResources( String dir )
     {
-        File stylesheetFile = new File( stylesheet );
-        File destStylesheetFile = new File( dir, "stylesheet.css" );
+        if ( StringUtils.isNotEmpty( stylesheet ) )
+        {
+            File stylesheetFile = new File( stylesheet );
+            File destStylesheetFile = new File( dir, "stylesheet.css" );
 
-        try
+            try
+            {
+                if ( stylesheetFile.isAbsolute() )
+                {
+                    FileUtils.copyFile( stylesheetFile, destStylesheetFile );
+                }
+                else
+                {
+                    URL stylesheetUrl = 
this.getClass().getClassLoader().getResource( stylesheet );
+                    FileUtils.copyURLToFile( stylesheetUrl, destStylesheetFile 
);
+                }
+            }
+            catch ( IOException e )
+            {
+                getLog().warn( "An error occured while copying the stylesheet 
to the target directory", e );
+            }
+        }
+        else
         {
-            if ( stylesheetFile.isAbsolute() )
+            if ( javadocTemplatesVersion.isAtLeast( "1.8" ) )
+            {
+                copyResources( dir, "jdk8/", "stylesheet.css" );
+            }
+            else if ( javadocTemplatesVersion.isAtLeast( "1.7" ) )
+            {
+                String[] jdk7Resources =
+                {
+                    "stylesheet.css",
+                    "resources/background.gif",
+                    "resources/tab.gif",
+                    "resources/titlebar.gif",
+                    "resources/titlebar_end.gif"
+                };
+                copyResources( dir, "jdk7/", jdk7Resources );
+            }
+            else if ( javadocTemplatesVersion.isAtLeast( "1.6" ) )
             {
-                FileUtils.copyFile( stylesheetFile, destStylesheetFile );
+                copyResources( dir, "jdk6/", "stylesheet.css" );
+            }
+            else if ( javadocTemplatesVersion.isAtLeast( "1.4" ) )
+            {
+                copyResources( dir, "jdk4/", "stylesheet.css" );
             }
             else
             {
-                URL stylesheetUrl = 
this.getClass().getClassLoader().getResource( stylesheet );
-                FileUtils.copyURLToFile( stylesheetUrl, destStylesheetFile );
+                // Fallback to the original stylesheet
+                copyResources( dir, "", "stylesheet.css" );
+            }
+        }
+    }
+
+    /**
+     * Copy styles and related resources to the given directory
+     *
+     * @param dir the directory to copy the resources to
+     * @param sourceFolder resources subfolder to copy from
+     * @param files names of files to copy
+     */
+    private void copyResources( String dir, String sourceFolder, String... 
files )
+    {
+        try
+        {
+            for ( String file : files )
+            {
+                URL resourceUrl = 
this.getClass().getClassLoader().getResource( sourceFolder + file );
+                File destResourceFile = new File( dir, file );
+                FileUtils.copyURLToFile( resourceUrl, destResourceFile );
             }
         }
         catch ( IOException e )
         {
-            getLog().warn( "An error occured while copying the stylesheet to 
the target directory", e );
+            getLog().warn( "An error occured while copying the resource to the 
target directory", e );
         }
-
     }
 
     @Override
@@ -464,6 +536,9 @@ public abstract class AbstractJxrReport
             // init some attributes -- TODO (javadoc)
             init();
 
+            // determine version of templates to use
+            setJavadocTemplatesVersion();
+
             try
             {
                 createXref( locale, getDestinationDirectory(), sourceDirs );
@@ -479,6 +554,57 @@ public abstract class AbstractJxrReport
         }
     }
 
+
+    /**
+     * Determine the templateDir to use, given javadocTemplatesVersion
+     *
+     * @return
+     * @throws org.apache.maven.reporting.MavenReportException if 
javadocTemplatesVersion cannot be parsed
+     */
+    private String getTemplateDir()
+    {
+        // Check if overridden
+        if ( StringUtils.isEmpty( templateDir ) )
+        {
+            if ( javadocTemplatesVersion.isAtLeast( "1.8" ) )
+            {
+                return "templates/jdk8";
+            }
+            else if ( javadocTemplatesVersion.isAtLeast( "1.7" ) )
+            {
+                return "templates/jdk7";
+            }
+            else if ( javadocTemplatesVersion.isAtLeast( "1.4" ) )
+            {
+                return "templates/jdk4";
+            }
+            else
+            {
+                getLog().warn( "Unsupported javadocVersion: " + 
javadocTemplatesVersion + ". Fallback to original" );
+                return "templates";
+            }
+        }
+        // use value specified by user
+        return templateDir;
+    }
+
+    /**
+     * Set a new value for <code>javadocTemplatesVersion</code>
+     */
+    private void setJavadocTemplatesVersion()
+    {
+        JavaVersion javaVersion = JavaVersion.JAVA_SPECIFICATION_VERSION;
+
+        if ( StringUtils.isNotEmpty( javadocVersion ) )
+        {
+            javadocTemplatesVersion = JavaVersion.parse( javadocVersion );
+        }
+        else
+        {
+            javadocTemplatesVersion = javaVersion;
+        }
+    }
+
     /**
      * Gets the list of the source directories to be included in the JXR 
report generation
      *
diff --git a/maven-jxr-plugin/src/main/resources/jdk4/stylesheet.css 
b/maven-jxr-plugin/src/main/resources/jdk4/stylesheet.css
new file mode 100644
index 0000000..a736955
--- /dev/null
+++ b/maven-jxr-plugin/src/main/resources/jdk4/stylesheet.css
@@ -0,0 +1,79 @@
+/* Javadoc style sheet */
+
+/* Define colors, fonts and other style attributes here to override the 
defaults */
+
+/* Page background color */
+body { background-color: #FFFFFF }
+
+/* Headings */
+h1 { font-size: 145% }
+
+/* Table colors */
+.TableHeadingColor     { background: #CCCCFF } /* Dark mauve */
+.TableSubHeadingColor  { background: #EEEEFF } /* Light mauve */
+.TableRowColor         { background: #FFFFFF } /* White */
+
+/* Font used in left-hand frame lists */
+.FrameTitleFont   { font-size: 100%; font-family: Helvetica, Arial, sans-serif 
}
+.FrameHeadingFont { font-size:  90%; font-family: Helvetica, Arial, sans-serif 
}
+.FrameItemFont    { font-size:  90%; font-family: Helvetica, Arial, sans-serif 
}
+
+/* Navigation bar fonts and colors */
+.NavBarCell1    { background-color:#EEEEFF;} /* Light mauve */
+.NavBarCell1Rev { background-color:#00008B;} /* Dark Blue */
+.NavBarFont1    { font-family: Arial, Helvetica, sans-serif; color:#000000;}
+.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;}
+
+.NavBarCell2    { font-family: Arial, Helvetica, sans-serif; 
background-color:#FFFFFF;}
+.NavBarCell3    { font-family: Arial, Helvetica, sans-serif; 
background-color:#FFFFFF;}
+
+/* JXR style sheet */
+a.jxr_linenumber:link {
+    color: #00f;
+}
+
+a.jxr_linenumber:visited {
+    color: #00a;
+}
+
+a.jxr_linenumber:active, a.jxr_linenumber:hover {
+    color: #f30 !important;
+}
+
+em.comment {
+    color: #390;
+}
+
+.string {
+    color: #009;
+}
+
+#overview {
+    padding: 2px;
+    font-size: 90%;
+    font-family: Helvetica, Arial, sans-serif;
+}
+
+hr {
+    color: #000;
+}
+
+.jxr_comment
+{
+    color: #390;
+}
+
+.jxr_javadoccomment
+{
+    color: #A00;
+}
+
+.jxr_string
+{
+    color: #009;
+}
+
+.jxr_keyword
+{
+    color: #000;
+}
diff --git a/maven-jxr-plugin/src/main/resources/jdk6/stylesheet.css 
b/maven-jxr-plugin/src/main/resources/jdk6/stylesheet.css
new file mode 100644
index 0000000..468352b
--- /dev/null
+++ b/maven-jxr-plugin/src/main/resources/jdk6/stylesheet.css
@@ -0,0 +1,80 @@
+/* Javadoc style sheet */
+
+/* Define colors, fonts and other style attributes here to override the 
defaults */
+
+/* Page background color */
+body { background-color: #FFFFFF; color:#000000 }
+
+/* Headings */
+h1 { font-size: 145% }
+
+/* Table colors */
+.TableHeadingColor     { background: #CCCCFF; color:#000000 } /* Dark mauve */
+.TableSubHeadingColor  { background: #EEEEFF; color:#000000 } /* Light mauve */
+.TableRowColor         { background: #FFFFFF; color:#000000 } /* White */
+
+/* Font used in left-hand frame lists */
+.FrameTitleFont   { font-size: 100%; font-family: Helvetica, Arial, 
sans-serif; color:#000000 }
+.FrameHeadingFont { font-size:  90%; font-family: Helvetica, Arial, 
sans-serif; color:#000000 }
+.FrameItemFont    { font-size:  90%; font-family: Helvetica, Arial, 
sans-serif; color:#000000 }
+
+/* Navigation bar fonts and colors */
+.NavBarCell1    { background-color:#EEEEFF; color:#000000} /* Light mauve */
+.NavBarCell1Rev { background-color:#00008B; color:#FFFFFF} /* Dark Blue */
+.NavBarFont1    { font-family: Arial, Helvetica, sans-serif; 
color:#000000;color:#000000;}
+.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; 
color:#FFFFFF;color:#FFFFFF;}
+
+.NavBarCell2    { font-family: Arial, Helvetica, sans-serif; 
background-color:#FFFFFF; color:#000000}
+.NavBarCell3    { font-family: Arial, Helvetica, sans-serif; 
background-color:#FFFFFF; color:#000000}
+
+/* JXR style sheet */
+a.jxr_linenumber:link {
+    color: #00f;
+}
+
+a.jxr_linenumber:visited {
+    color: #00a;
+}
+
+a.jxr_linenumber:active, a.jxr_linenumber:hover {
+    color: #f30 !important;
+}
+
+em.comment {
+    color: #390;
+}
+
+.string {
+    color: #009;
+}
+
+#overview {
+    padding: 2px;
+    font-size: 90%;
+    font-family: Helvetica, Arial, sans-serif;
+}
+
+hr {
+    color: #000;
+}
+
+.jxr_comment
+{
+    color: #390;
+}
+
+.jxr_javadoccomment
+{
+    color: #A00;
+}
+
+.jxr_string
+{
+    color: #009;
+}
+
+.jxr_keyword
+{
+    color: #000;
+}
+
diff --git a/maven-jxr-plugin/src/main/resources/jdk7/resources/background.gif 
b/maven-jxr-plugin/src/main/resources/jdk7/resources/background.gif
new file mode 100644
index 0000000..f471940
Binary files /dev/null and 
b/maven-jxr-plugin/src/main/resources/jdk7/resources/background.gif differ
diff --git a/maven-jxr-plugin/src/main/resources/jdk7/resources/tab.gif 
b/maven-jxr-plugin/src/main/resources/jdk7/resources/tab.gif
new file mode 100644
index 0000000..1a73a83
Binary files /dev/null and 
b/maven-jxr-plugin/src/main/resources/jdk7/resources/tab.gif differ
diff --git a/maven-jxr-plugin/src/main/resources/jdk7/resources/titlebar.gif 
b/maven-jxr-plugin/src/main/resources/jdk7/resources/titlebar.gif
new file mode 100644
index 0000000..17443b3
Binary files /dev/null and 
b/maven-jxr-plugin/src/main/resources/jdk7/resources/titlebar.gif differ
diff --git 
a/maven-jxr-plugin/src/main/resources/jdk7/resources/titlebar_end.gif 
b/maven-jxr-plugin/src/main/resources/jdk7/resources/titlebar_end.gif
new file mode 100644
index 0000000..3ad78d4
Binary files /dev/null and 
b/maven-jxr-plugin/src/main/resources/jdk7/resources/titlebar_end.gif differ
diff --git a/maven-jxr-plugin/src/main/resources/jdk7/stylesheet.css 
b/maven-jxr-plugin/src/main/resources/jdk7/stylesheet.css
new file mode 100644
index 0000000..835fecd
--- /dev/null
+++ b/maven-jxr-plugin/src/main/resources/jdk7/stylesheet.css
@@ -0,0 +1,526 @@
+/* Javadoc style sheet */
+/*
+Overall document style
+*/
+body {
+    background-color:#ffffff;
+    color:#353833;
+    font-family:Arial, Helvetica, sans-serif;
+    font-size:76%;
+    margin:0;
+}
+a:link, a:visited {
+    text-decoration:none;
+    color:#4c6b87;
+}
+a:hover, a:focus {
+    text-decoration:none;
+    color:#bb7a2a;
+}
+a:active {
+    text-decoration:none;
+    color:#4c6b87;
+}
+a[name] {
+    color:#353833;
+}
+a[name]:hover {
+    text-decoration:none;
+    color:#353833;
+}
+pre {
+    font-size:1.3em;
+}
+h1 {
+    font-size:1.8em;
+}
+h2 {
+    font-size:1.5em;
+}
+h3 {
+    font-size:1.4em;
+}
+h4 {
+    font-size:1.3em;
+}
+h5 {
+    font-size:1.2em;
+}
+h6 {
+    font-size:1.1em;
+}
+ul {
+    list-style-type:disc;
+}
+code, tt {
+    font-size:1.2em;
+}
+dt code {
+    font-size:1.2em;
+}
+table tr td dt code {
+    font-size:1.2em;
+    vertical-align:top;
+}
+sup {
+    font-size:.6em;
+}
+/*
+Document title and Copyright styles
+*/
+.clear {
+    clear:both;
+    height:0px;
+    overflow:hidden;
+}
+.aboutLanguage {
+    float:right;
+    padding:0px 21px;
+    font-size:.8em;
+    z-index:200;
+    margin-top:-7px;
+}
+.legalCopy {
+    margin-left:.5em;
+}
+.bar a, .bar a:link, .bar a:visited, .bar a:active {
+    color:#FFFFFF;
+    text-decoration:none;
+}
+.bar a:hover, .bar a:focus {
+    color:#bb7a2a;
+}
+.tab {
+    background-color:#0066FF;
+    background-image:url(resources/titlebar.gif);
+    background-position:left top;
+    background-repeat:no-repeat;
+    color:#ffffff;
+    padding:8px;
+    width:5em;
+    font-weight:bold;
+}
+/*
+Navigation bar styles
+*/
+.bar {
+    background-image:url(resources/background.gif);
+    background-repeat:repeat-x;
+    color:#FFFFFF;
+    padding:.8em .5em .4em .8em;
+    height:auto;/*height:1.8em;*/
+    font-size:1em;
+    margin:0;
+}
+.topNav {
+    background-image:url(resources/background.gif);
+    background-repeat:repeat-x;
+    color:#FFFFFF;
+    float:left;
+    padding:0;
+    width:100%;
+    clear:right;
+    height:2.8em;
+    padding-top:10px;
+    overflow:hidden;
+}
+.bottomNav {
+    margin-top:10px;
+    background-image:url(resources/background.gif);
+    background-repeat:repeat-x;
+    color:#FFFFFF;
+    float:left;
+    padding:0;
+    width:100%;
+    clear:right;
+    height:2.8em;
+    padding-top:10px;
+    overflow:hidden;
+}
+.subNav {
+    background-color:#dee3e9;
+    border-bottom:1px solid #9eadc0;
+    float:left;
+    width:100%;
+    overflow:hidden;
+}
+.subNav div {
+    clear:left;
+    float:left;
+    padding:0 0 5px 6px;
+}
+ul.navList, ul.subNavList {
+    float:left;
+    margin:0 25px 0 0;
+    padding:0;
+}
+ul.navList li{
+    list-style:none;
+    float:left;
+    padding:3px 6px;
+}
+ul.subNavList li{
+    list-style:none;
+    float:left;
+    font-size:90%;
+}
+.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, 
.bottomNav a:active, .bottomNav a:visited {
+    color:#FFFFFF;
+    text-decoration:none;
+}
+.topNav a:hover, .bottomNav a:hover {
+    text-decoration:none;
+    color:#bb7a2a;
+}
+.navBarCell1Rev {
+    background-image:url(resources/tab.gif);
+    background-color:#a88834;
+    color:#FFFFFF;
+    margin: auto 5px;
+    border:1px solid #c9aa44;
+}
+/*
+Page header and footer styles
+*/
+.header, .footer {
+    clear:both;
+    margin:0 20px;
+    padding:5px 0 0 0;
+}
+.indexHeader {
+    margin:10px;
+    position:relative;
+}
+.indexHeader h1 {
+    font-size:1.3em;
+}
+.title {
+    color:#2c4557;
+    margin:10px 0;
+}
+.subTitle {
+    margin:5px 0 0 0;
+}
+.header ul {
+    margin:0 0 25px 0;
+    padding:0;
+}
+.footer ul {
+    margin:20px 0 5px 0;
+}
+.header ul li, .footer ul li {
+    list-style:none;
+    font-size:1.2em;
+}
+/*
+Heading styles
+*/
+div.details ul.blockList ul.blockList ul.blockList li.blockList h4, 
div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
+    background-color:#dee3e9;
+    border-top:1px solid #9eadc0;
+    border-bottom:1px solid #9eadc0;
+    margin:0 0 6px -8px;
+    padding:2px 5px;
+}
+ul.blockList ul.blockList ul.blockList li.blockList h3 {
+    background-color:#dee3e9;
+    border-top:1px solid #9eadc0;
+    border-bottom:1px solid #9eadc0;
+    margin:0 0 6px -8px;
+    padding:2px 5px;
+}
+ul.blockList ul.blockList li.blockList h3 {
+    padding:0;
+    margin:15px 0;
+}
+ul.blockList li.blockList h2 {
+    padding:0px 0 20px 0;
+}
+/*
+Page layout container styles
+*/
+.contentContainer, .sourceContainer, .classUseContainer, 
.serializedFormContainer, .constantValuesContainer {
+    clear:both;
+    padding:10px 20px;
+    position:relative;
+}
+.indexContainer {
+    margin:10px;
+    position:relative;
+    font-size:1.0em;
+}
+.indexContainer h2 {
+    font-size:1.1em;
+    padding:0 0 3px 0;
+}
+.indexContainer ul {
+    margin:0;
+    padding:0;
+}
+.indexContainer ul li {
+    list-style:none;
+}
+.contentContainer .description dl dt, .contentContainer .details dl dt, 
.serializedFormContainer dl dt {
+    font-size:1.1em;
+    font-weight:bold;
+    margin:10px 0 0 0;
+    color:#4E4E4E;
+}
+.contentContainer .description dl dd, .contentContainer .details dl dd, 
.serializedFormContainer dl dd {
+    margin:10px 0 10px 20px;
+}
+.serializedFormContainer dl.nameValue dt {
+    margin-left:1px;
+    font-size:1.1em;
+    display:inline;
+    font-weight:bold;
+}
+.serializedFormContainer dl.nameValue dd {
+    margin:0 0 0 1px;
+    font-size:1.1em;
+    display:inline;
+}
+/*
+List styles
+*/
+ul.horizontal li {
+    display:inline;
+    font-size:0.9em;
+}
+ul.inheritance {
+    margin:0;
+    padding:0;
+}
+ul.inheritance li {
+    display:inline;
+    list-style:none;
+}
+ul.inheritance li ul.inheritance {
+    margin-left:15px;
+    padding-left:15px;
+    padding-top:1px;
+}
+ul.blockList, ul.blockListLast {
+    margin:10px 0 10px 0;
+    padding:0;
+}
+ul.blockList li.blockList, ul.blockListLast li.blockList {
+    list-style:none;
+    margin-bottom:25px;
+}
+ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast 
li.blockList {
+    padding:0px 20px 5px 10px;
+    border:1px solid #9eadc0;
+    background-color:#f9f9f9;
+}
+ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList 
ul.blockListLast li.blockList {
+    padding:0 0 5px 8px;
+    background-color:#ffffff;
+    border:1px solid #9eadc0;
+    border-top:none;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockList {
+    margin-left:0;
+    padding-left:0;
+    padding-bottom:15px;
+    border:none;
+    border-bottom:1px solid #9eadc0;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast {
+    list-style:none;
+    border-bottom:none;
+    padding-bottom:0;
+}
+table tr td dl, table tr td dl dt, table tr td dl dd {
+    margin-top:0;
+    margin-bottom:1px;
+}
+/*
+Table styles
+*/
+.contentContainer table, .classUseContainer table, .constantValuesContainer 
table {
+    border-bottom:1px solid #9eadc0;
+    width:100%;
+}
+.contentContainer ul li table, .classUseContainer ul li table, 
.constantValuesContainer ul li table {
+    width:100%;
+}
+.contentContainer .description table, .contentContainer .details table {
+    border-bottom:none;
+}
+.contentContainer ul li table th.colOne, .contentContainer ul li table 
th.colFirst, .contentContainer ul li table th.colLast, .classUseContainer ul li 
table th, .constantValuesContainer ul li table th, .contentContainer ul li 
table td.colOne, .contentContainer ul li table td.colFirst, .contentContainer 
ul li table td.colLast, .classUseContainer ul li table td, 
.constantValuesContainer ul li table td{
+    vertical-align:top;
+    padding-right:20px;
+}
+.contentContainer ul li table th.colLast, .classUseContainer ul li table 
th.colLast,.constantValuesContainer ul li table th.colLast,
+.contentContainer ul li table td.colLast, .classUseContainer ul li table 
td.colLast,.constantValuesContainer ul li table td.colLast,
+.contentContainer ul li table th.colOne, .classUseContainer ul li table 
th.colOne,
+.contentContainer ul li table td.colOne, .classUseContainer ul li table 
td.colOne {
+    padding-right:3px;
+}
+.overviewSummary caption, .packageSummary caption, .contentContainer 
ul.blockList li.blockList caption, .summary caption, .classUseContainer 
caption, .constantValuesContainer caption {
+    position:relative;
+    text-align:left;
+    background-repeat:no-repeat;
+    color:#FFFFFF;
+    font-weight:bold;
+    clear:none;
+    overflow:hidden;
+    padding:0px;
+    margin:0px;
+}
+caption a:link, caption a:hover, caption a:active, caption a:visited {
+    color:#FFFFFF;
+}
+.overviewSummary caption span, .packageSummary caption span, .contentContainer 
ul.blockList li.blockList caption span, .summary caption span, 
.classUseContainer caption span, .constantValuesContainer caption span {
+    white-space:nowrap;
+    padding-top:8px;
+    padding-left:8px;
+    display:block;
+    float:left;
+    background-image:url(resources/titlebar.gif);
+    height:18px;
+}
+.overviewSummary .tabEnd, .packageSummary .tabEnd, .contentContainer 
ul.blockList li.blockList .tabEnd, .summary .tabEnd, .classUseContainer 
.tabEnd, .constantValuesContainer .tabEnd {
+    width:10px;
+    background-image:url(resources/titlebar_end.gif);
+    background-repeat:no-repeat;
+    background-position:top right;
+    position:relative;
+    float:left;
+}
+ul.blockList ul.blockList li.blockList table {
+    margin:0 0 12px 0px;
+    width:100%;
+}
+.tableSubHeadingColor {
+    background-color: #EEEEFF;
+}
+.altColor {
+    background-color:#eeeeef;
+}
+.rowColor {
+    background-color:#ffffff;
+}
+.overviewSummary td, .packageSummary td, .contentContainer ul.blockList 
li.blockList td, .summary td, .classUseContainer td, .constantValuesContainer 
td {
+    text-align:left;
+    padding:3px 3px 3px 7px;
+}
+th.colFirst, th.colLast, th.colOne, .constantValuesContainer th {
+    background:#dee3e9;
+    border-top:1px solid #9eadc0;
+    border-bottom:1px solid #9eadc0;
+    text-align:left;
+    padding:3px 3px 3px 7px;
+}
+td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, 
td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst 
a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, 
td.colLast a:hover, .constantValuesContainer td a:link, 
.constantValuesContainer td a:active, .constantValuesContainer td a:visited, 
.constantValuesContainer td a:hover {
+    font-weight:bold;
+}
+td.colFirst, th.colFirst {
+    border-left:1px solid #9eadc0;
+    white-space:nowrap;
+}
+td.colLast, th.colLast {
+    border-right:1px solid #9eadc0;
+}
+td.colOne, th.colOne {
+    border-right:1px solid #9eadc0;
+    border-left:1px solid #9eadc0;
+}
+table.overviewSummary  {
+    padding:0px;
+    margin-left:0px;
+}
+table.overviewSummary td.colFirst, table.overviewSummary th.colFirst,
+table.overviewSummary td.colOne, table.overviewSummary th.colOne {
+    width:25%;
+    vertical-align:middle;
+}
+table.packageSummary td.colFirst, table.overviewSummary th.colFirst {
+    width:25%;
+    vertical-align:middle;
+}
+/*
+Content styles
+*/
+.description pre {
+    margin-top:0;
+}
+.deprecatedContent {
+    margin:0;
+    padding:10px 0;
+}
+.docSummary {
+    padding:0;
+}
+/*
+Formatting effect styles
+*/
+.sourceLineNo {
+    color:green;
+    padding:0 30px 0 0;
+}
+h1.hidden {
+    visibility:hidden;
+    overflow:hidden;
+    font-size:.9em;
+}
+.block {
+    display:block;
+    margin:3px 0 0 0;
+}
+.strong {
+    font-weight:bold;
+}
+
+/* JXR style sheet */
+a.jxr_linenumber:link {
+    color: #00f;
+}
+
+a.jxr_linenumber:visited {
+    color: #00a;
+}
+
+a.jxr_linenumber:active, a.jxr_linenumber:hover {
+    color: #f30 !important;
+}
+
+em.comment {
+    color: #390;
+}
+
+.string {
+    color: #009;
+}
+
+#overview {
+    padding: 2px;
+    font-size: 90%;
+    font-family: Helvetica, Arial, sans-serif;
+}
+
+hr {
+    color: #000;
+}
+
+.jxr_comment
+{
+    color: #390;
+}
+
+.jxr_javadoccomment
+{
+    color: #A00;
+}
+
+.jxr_string
+{
+    color: #009;
+}
+
+.jxr_keyword
+{
+    color: #000;
+}
+
diff --git a/maven-jxr-plugin/src/main/resources/jdk8/stylesheet.css 
b/maven-jxr-plugin/src/main/resources/jdk8/stylesheet.css
new file mode 100644
index 0000000..84d4b28
--- /dev/null
+++ b/maven-jxr-plugin/src/main/resources/jdk8/stylesheet.css
@@ -0,0 +1,626 @@
+/* Javadoc style sheet */
+/*
+Overall document style
+*/
+
+@import url('resources/fonts/dejavu.css');
+
+body {
+    background-color:#ffffff;
+    color:#353833;
+    font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;
+    font-size:14px;
+    margin:0;
+}
+a:link, a:visited {
+    text-decoration:none;
+    color:#4A6782;
+}
+a:hover, a:focus {
+    text-decoration:none;
+    color:#bb7a2a;
+}
+a:active {
+    text-decoration:none;
+    color:#4A6782;
+}
+a[name] {
+    color:#353833;
+}
+a[name]:hover {
+    text-decoration:none;
+    color:#353833;
+}
+pre {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+}
+h1 {
+    font-size:20px;
+}
+h2 {
+    font-size:18px;
+}
+h3 {
+    font-size:16px;
+    font-style:italic;
+}
+h4 {
+    font-size:13px;
+}
+h5 {
+    font-size:12px;
+}
+h6 {
+    font-size:11px;
+}
+ul {
+    list-style-type:disc;
+}
+code, tt {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+    padding-top:4px;
+    margin-top:8px;
+    line-height:1.4em;
+}
+dt code {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+    padding-top:4px;
+}
+table tr td dt code {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+    vertical-align:top;
+    padding-top:4px;
+}
+sup {
+    font-size:8px;
+}
+/*
+Document title and Copyright styles
+*/
+.clear {
+    clear:both;
+    height:0px;
+    overflow:hidden;
+}
+.aboutLanguage {
+    float:right;
+    padding:0px 21px;
+    font-size:11px;
+    z-index:200;
+    margin-top:-9px;
+}
+.legalCopy {
+    margin-left:.5em;
+}
+.bar a, .bar a:link, .bar a:visited, .bar a:active {
+    color:#FFFFFF;
+    text-decoration:none;
+}
+.bar a:hover, .bar a:focus {
+    color:#bb7a2a;
+}
+.tab {
+    background-color:#0066FF;
+    color:#ffffff;
+    padding:8px;
+    width:5em;
+    font-weight:bold;
+}
+/*
+Navigation bar styles
+*/
+.bar {
+    background-color:#4D7A97;
+    color:#FFFFFF;
+    padding:.8em .5em .4em .8em;
+    height:auto;/*height:1.8em;*/
+    font-size:11px;
+    margin:0;
+}
+.topNav {
+    background-color:#4D7A97;
+    color:#FFFFFF;
+    float:left;
+    padding:0;
+    width:100%;
+    clear:right;
+    height:2.8em;
+    padding-top:10px;
+    overflow:hidden;
+    font-size:12px; 
+}
+.bottomNav {
+    margin-top:10px;
+    background-color:#4D7A97;
+    color:#FFFFFF;
+    float:left;
+    padding:0;
+    width:100%;
+    clear:right;
+    height:2.8em;
+    padding-top:10px;
+    overflow:hidden;
+    font-size:12px;
+}
+.subNav {
+    background-color:#dee3e9;
+    float:left;
+    width:100%;
+    overflow:hidden;
+    font-size:12px;
+}
+.subNav div {
+    clear:left;
+    float:left;
+    padding:0 0 5px 6px;
+    text-transform:uppercase;
+}
+ul.navList, ul.subNavList {
+    float:left;
+    margin:0 25px 0 0;
+    padding:0;
+}
+ul.navList li{
+    list-style:none;
+    float:left;
+    padding: 5px 6px;
+    text-transform:uppercase;
+}
+ul.subNavList li{
+    list-style:none;
+    float:left;
+}
+.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, 
.bottomNav a:active, .bottomNav a:visited {
+    color:#FFFFFF;
+    text-decoration:none;
+    text-transform:uppercase;
+}
+.topNav a:hover, .bottomNav a:hover {
+    text-decoration:none;
+    color:#bb7a2a;
+    text-transform:uppercase;
+}
+.navBarCell1Rev {
+    background-color:#F8981D;
+    color:#253441;
+    margin: auto 5px;
+}
+.skipNav {
+    position:absolute;
+    top:auto;
+    left:-9999px;
+    overflow:hidden;
+}
+/*
+Page header and footer styles
+*/
+.header, .footer {
+    clear:both;
+    margin:0 20px;
+    padding:5px 0 0 0;
+}
+.indexHeader {
+    margin:10px;
+    position:relative;
+}
+.indexHeader span{
+    margin-right:15px;
+}
+.indexHeader h1 {
+    font-size:13px;
+}
+.title {
+    color:#2c4557;
+    margin:10px 0;
+}
+.subTitle {
+    margin:5px 0 0 0;
+}
+.header ul {
+    margin:0 0 15px 0;
+    padding:0;
+}
+.footer ul {
+    margin:20px 0 5px 0;
+}
+.header ul li, .footer ul li {
+    list-style:none;
+    font-size:13px;
+}
+/*
+Heading styles
+*/
+div.details ul.blockList ul.blockList ul.blockList li.blockList h4, 
div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
+    background-color:#dee3e9;
+    border:1px solid #d0d9e0;
+    margin:0 0 6px -8px;
+    padding:7px 5px;
+}
+ul.blockList ul.blockList ul.blockList li.blockList h3 {
+    background-color:#dee3e9;
+    border:1px solid #d0d9e0;
+    margin:0 0 6px -8px;
+    padding:7px 5px;
+}
+ul.blockList ul.blockList li.blockList h3 {
+    padding:0;
+    margin:15px 0;
+}
+ul.blockList li.blockList h2 {
+    padding:0px 0 20px 0;
+}
+/*
+Page layout container styles
+*/
+.contentContainer, .sourceContainer, .classUseContainer, 
.serializedFormContainer, .constantValuesContainer {
+    clear:both;
+    padding:10px 20px;
+    position:relative;
+}
+.indexContainer {
+    margin:10px;
+    position:relative;
+    font-size:12px;
+}
+.indexContainer h2 {
+    font-size:13px;
+    padding:0 0 3px 0;
+}
+.indexContainer ul {
+    margin:0;
+    padding:0;
+}
+.indexContainer ul li {
+    list-style:none;
+    padding-top:2px;
+}
+.contentContainer .description dl dt, .contentContainer .details dl dt, 
.serializedFormContainer dl dt {
+    font-size:12px;
+    font-weight:bold;
+    margin:10px 0 0 0;
+    color:#4E4E4E;
+}
+.contentContainer .description dl dd, .contentContainer .details dl dd, 
.serializedFormContainer dl dd {
+    margin:5px 0 10px 0px;
+    font-size:14px;
+    font-family:'DejaVu Sans Mono',monospace;
+}
+.serializedFormContainer dl.nameValue dt {
+    margin-left:1px;
+    font-size:1.1em;
+    display:inline;
+    font-weight:bold;
+}
+.serializedFormContainer dl.nameValue dd {
+    margin:0 0 0 1px;
+    font-size:1.1em;
+    display:inline;
+}
+/*
+List styles
+*/
+ul.horizontal li {
+    display:inline;
+    font-size:0.9em;
+}
+ul.inheritance {
+    margin:0;
+    padding:0;
+}
+ul.inheritance li {
+    display:inline;
+    list-style:none;
+}
+ul.inheritance li ul.inheritance {
+    margin-left:15px;
+    padding-left:15px;
+    padding-top:1px;
+}
+ul.blockList, ul.blockListLast {
+    margin:10px 0 10px 0;
+    padding:0;
+}
+ul.blockList li.blockList, ul.blockListLast li.blockList {
+    list-style:none;
+    margin-bottom:15px;
+    line-height:1.4;
+}
+ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast 
li.blockList {
+    padding:0px 20px 5px 10px;
+    border:1px solid #ededed; 
+    background-color:#f8f8f8;
+}
+ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList 
ul.blockListLast li.blockList {
+    padding:0 0 5px 8px;
+    background-color:#ffffff;
+    border:none;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockList {
+    margin-left:0;
+    padding-left:0;
+    padding-bottom:15px;
+    border:none;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast {
+    list-style:none;
+    border-bottom:none;
+    padding-bottom:0;
+}
+table tr td dl, table tr td dl dt, table tr td dl dd {
+    margin-top:0;
+    margin-bottom:1px;
+}
+/*
+Table styles
+*/
+.overviewSummary, .memberSummary, .typeSummary, .useSummary, 
.constantsSummary, .deprecatedSummary {
+    width:100%;
+    border-left:1px solid #EEE; 
+    border-right:1px solid #EEE; 
+    border-bottom:1px solid #EEE; 
+}
+.overviewSummary, .memberSummary  {
+    padding:0px;
+}
+.overviewSummary caption, .memberSummary caption, .typeSummary caption,
+.useSummary caption, .constantsSummary caption, .deprecatedSummary caption {
+    position:relative;
+    text-align:left;
+    background-repeat:no-repeat;
+    color:#253441;
+    font-weight:bold;
+    clear:none;
+    overflow:hidden;
+    padding:0px;
+    padding-top:10px;
+    padding-left:1px;
+    margin:0px;
+    white-space:pre;
+}
+.overviewSummary caption a:link, .memberSummary caption a:link, .typeSummary 
caption a:link,
+.useSummary caption a:link, .constantsSummary caption a:link, 
.deprecatedSummary caption a:link,
+.overviewSummary caption a:hover, .memberSummary caption a:hover, .typeSummary 
caption a:hover,
+.useSummary caption a:hover, .constantsSummary caption a:hover, 
.deprecatedSummary caption a:hover,
+.overviewSummary caption a:active, .memberSummary caption a:active, 
.typeSummary caption a:active,
+.useSummary caption a:active, .constantsSummary caption a:active, 
.deprecatedSummary caption a:active,
+.overviewSummary caption a:visited, .memberSummary caption a:visited, 
.typeSummary caption a:visited,
+.useSummary caption a:visited, .constantsSummary caption a:visited, 
.deprecatedSummary caption a:visited {
+    color:#FFFFFF;
+}
+.overviewSummary caption span, .memberSummary caption span, .typeSummary 
caption span,
+.useSummary caption span, .constantsSummary caption span, .deprecatedSummary 
caption span {
+    white-space:nowrap;
+    padding-top:5px;
+    padding-left:12px;
+    padding-right:12px;
+    padding-bottom:7px;
+    display:inline-block;
+    float:left;
+    background-color:#F8981D;
+    border: none;
+    height:16px;
+}
+.memberSummary caption span.activeTableTab span {
+    white-space:nowrap;
+    padding-top:5px;
+    padding-left:12px;
+    padding-right:12px;
+    margin-right:3px;
+    display:inline-block;
+    float:left;
+    background-color:#F8981D;
+    height:16px;
+}
+.memberSummary caption span.tableTab span {
+    white-space:nowrap;
+    padding-top:5px;
+    padding-left:12px;
+    padding-right:12px;
+    margin-right:3px;
+    display:inline-block;
+    float:left;
+    background-color:#4D7A97;
+    height:16px;
+}
+.memberSummary caption span.tableTab, .memberSummary caption 
span.activeTableTab {
+    padding-top:0px;
+    padding-left:0px;
+    padding-right:0px;
+    background-image:none;
+    float:none;
+    display:inline;
+}
+.overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd,
+.useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd {
+    display:none;
+    width:5px;
+    position:relative;
+    float:left;
+    background-color:#F8981D;
+}
+.memberSummary .activeTableTab .tabEnd {
+    display:none;
+    width:5px;
+    margin-right:3px;
+    position:relative; 
+    float:left;
+    background-color:#F8981D;
+}
+.memberSummary .tableTab .tabEnd {
+    display:none;
+    width:5px;
+    margin-right:3px;
+    position:relative;
+    background-color:#4D7A97;
+    float:left;
+
+}
+.overviewSummary td, .memberSummary td, .typeSummary td,
+.useSummary td, .constantsSummary td, .deprecatedSummary td {
+    text-align:left;
+    padding:0px 0px 12px 10px;
+}
+th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th,
+td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{
+    vertical-align:top;
+    padding-right:0px;
+    padding-top:8px;
+    padding-bottom:3px;
+}
+th.colFirst, th.colLast, th.colOne, .constantsSummary th {
+    background:#dee3e9;
+    text-align:left;
+    padding:8px 3px 3px 7px;
+}
+td.colFirst, th.colFirst {
+    white-space:nowrap;
+    font-size:13px;
+}
+td.colLast, th.colLast {
+    font-size:13px;
+}
+td.colOne, th.colOne {
+    font-size:13px;
+}
+.overviewSummary td.colFirst, .overviewSummary th.colFirst,
+.useSummary td.colFirst, .useSummary th.colFirst,
+.overviewSummary td.colOne, .overviewSummary th.colOne,
+.memberSummary td.colFirst, .memberSummary th.colFirst,
+.memberSummary td.colOne, .memberSummary th.colOne,
+.typeSummary td.colFirst{
+    width:25%;
+    vertical-align:top;
+}
+td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, 
td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst 
a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, 
td.colLast a:hover, .constantValuesContainer td a:link, 
.constantValuesContainer td a:active, .constantValuesContainer td a:visited, 
.constantValuesContainer td a:hover {
+    font-weight:bold;
+}
+.tableSubHeadingColor {
+    background-color:#EEEEFF;
+}
+.altColor {
+    background-color:#FFFFFF;
+}
+.rowColor {
+    background-color:#EEEEEF;
+}
+/*
+Content styles
+*/
+.description pre {
+    margin-top:0;
+}
+.deprecatedContent {
+    margin:0;
+    padding:10px 0;
+}
+.docSummary {
+    padding:0;
+}
+
+ul.blockList ul.blockList ul.blockList li.blockList h3 {
+    font-style:normal;
+}
+
+div.block {
+    font-size:14px;
+    font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
+}
+
+td.colLast div {
+    padding-top:0px;
+}
+
+
+td.colLast a {
+    padding-bottom:3px;
+}
+/*
+Formatting effect styles
+*/
+.sourceLineNo {
+    color:green;
+    padding:0 30px 0 0;
+}
+h1.hidden {
+    visibility:hidden;
+    overflow:hidden;
+    font-size:10px;
+}
+.block {
+    display:block;
+    margin:3px 10px 2px 0px;
+    color:#474747;
+}
+.deprecatedLabel, .descfrmTypeLabel, .memberNameLabel, .memberNameLink,
+.overrideSpecifyLabel, .packageHierarchyLabel, .paramLabel, .returnLabel,
+.seeLabel, .simpleTagLabel, .throwsLabel, .typeNameLabel, .typeNameLink {
+    font-weight:bold;
+}
+.deprecationComment, .emphasizedPhrase, .interfaceName {
+    font-style:italic;
+}
+
+div.block div.block span.deprecationComment, div.block div.block 
span.emphasizedPhrase,
+div.block div.block span.interfaceName {
+    font-style:normal;
+}
+
+div.contentContainer ul.blockList li.blockList h2{
+    padding-bottom:0px;
+}
+
+/* JXR style sheet */
+a.jxr_linenumber:link {
+    color: #00f;
+}
+
+a.jxr_linenumber:visited {
+    color: #00a;
+}
+
+a.jxr_linenumber:active, a.jxr_linenumber:hover {
+    color: #f30 !important;
+}
+
+em.comment {
+    color: #390;
+}
+
+.string {
+    color: #009;
+}
+
+#overview {
+    padding: 2px;
+    font-size: 90%;
+    font-family: Helvetica, Arial, sans-serif;
+}
+
+hr {
+    color: #000;
+}
+
+.jxr_comment
+{
+    color: #390;
+}
+
+.jxr_javadoccomment
+{
+    color: #A00;
+}
+
+.jxr_string
+{
+    color: #009;
+}
+
+.jxr_keyword
+{
+    color: #000;
+}
+
diff --git 
a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/JxrReportTest.java 
b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/JxrReportTest.java
index 6b83e82..f8797bd 100644
--- 
a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/JxrReportTest.java
+++ 
b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/JxrReportTest.java
@@ -35,21 +35,189 @@ public class JxrReportTest
     extends AbstractMojoTestCase
 {
     /**
-     * Test the plugin with default configuration
+     * Test the plugin with original configuration
      *
      * @throws Exception
      */
     public void testDefaultConfiguration()
         throws Exception
     {
+        File resourcesDir = new File( getBasedir(), 
"src/test/resources/unit/default-configuration" );
+
+        File outputDir = new File( getBasedir(), 
"target/test/unit/default-configuration/target/site" );
+        File xrefDir = new File( outputDir, "xref" );
+
+        copyFilesFromDirectory( new File( resourcesDir, "javadoc-files" ), 
outputDir );
+
+        File testPom = new File( resourcesDir, 
"default-configuration-plugin-config.xml" );
+        JxrReport mojo = (JxrReport) lookupMojo( "jxr", testPom );
+        mojo.execute();
+
+        //check if xref files were generated
+        assertTrue( new File( xrefDir, "allclasses-frame.html" ).exists() );
+        assertTrue( new File( xrefDir, "index.html" ).exists() );
+        assertTrue( new File( xrefDir, "overview-frame.html" ).exists() );
+        assertTrue( new File( xrefDir, "overview-summary.html" ).exists() );
+        assertTrue( new File( xrefDir, "stylesheet.css" ).exists() );
+        assertTrue( new File( xrefDir, "def/configuration/App.html" ).exists() 
);
+        assertTrue( new File( xrefDir, "def/configuration/AppSample.html" 
).exists() );
+        assertTrue( new File( xrefDir, "def/configuration/package-frame.html" 
).exists() );
+        assertTrue( new File( xrefDir, 
"def/configuration/package-summary.html" ).exists() );
+
+        //check if there's a link to the javadoc files
+        String str = readFile( new File( xrefDir, 
"def/configuration/AppSample.html" ) );
+        assertTrue( str.toLowerCase().indexOf( 
"/apidocs/def/configuration/AppSample.html\"".toLowerCase() ) != -1 );
+
+        str = readFile( new File( xrefDir, "def/configuration/App.html" ) );
+        assertTrue( str.toLowerCase().indexOf( 
"/apidocs/def/configuration/app.html\"".toLowerCase() ) != -1 );
+
+        // check if encoding is UTF-8, the default value
+        assertTrue( str.indexOf( "text/html; charset=UTF-8" ) != -1 );
+    }
+
+    /**
+     * Test the plugin with jdk-4 configuration
+     *
+     * @throws Exception
+     */
+    public void testJdk4Configuration()
+        throws Exception
+    {
        File resourcesDir = new File( getBasedir(), 
"src/test/resources/unit/default-configuration" );
 
-       File outputDir = new File( getBasedir(), 
"target/test/unit/default-configuration/target/site" );
+       File outputDir = new File( getBasedir(), 
"target/test/unit/default-configuration/target/site/4" );
        File xrefDir = new File( outputDir, "xref" );
 
        copyFilesFromDirectory( new File( resourcesDir, "javadoc-files" ), 
outputDir );
 
-        File testPom = new File( resourcesDir, 
"default-configuration-plugin-config.xml" );
+        File testPom = new File( resourcesDir, 
"default-configuration-plugin-config-4.xml" );
+        JxrReport mojo = (JxrReport) lookupMojo( "jxr", testPom );
+        mojo.execute();
+
+        //check if xref files were generated
+        assertTrue( new File( xrefDir, "allclasses-frame.html" ).exists() );
+        assertTrue( new File( xrefDir, "index.html" ).exists() );
+        assertTrue( new File( xrefDir, "overview-frame.html" ).exists() );
+        assertTrue( new File( xrefDir, "overview-summary.html" ).exists() );
+        assertTrue( new File( xrefDir, "stylesheet.css" ).exists() );
+        assertTrue( new File( xrefDir, "def/configuration/App.html" ).exists() 
);
+        assertTrue( new File( xrefDir, "def/configuration/AppSample.html" 
).exists() );
+        assertTrue( new File( xrefDir, "def/configuration/package-frame.html" 
).exists() );
+        assertTrue( new File( xrefDir, 
"def/configuration/package-summary.html" ).exists() );
+
+        //check if there's a link to the javadoc files
+        String str = readFile( new File( xrefDir, 
"def/configuration/AppSample.html" ) );
+        assertTrue( str.toLowerCase().indexOf( 
"/apidocs/def/configuration/AppSample.html\"".toLowerCase() ) != -1 );
+
+        str = readFile( new File( xrefDir, "def/configuration/App.html" ) );
+        assertTrue( str.toLowerCase().indexOf( 
"/apidocs/def/configuration/app.html\"".toLowerCase() ) != -1 );
+
+        // check if encoding is UTF-8, the default value
+        assertTrue( str.indexOf( "text/html; charset=UTF-8" ) != -1 );
+    }
+
+    /**
+     * Test the plugin with jdk-6 configuration
+     *
+     * @throws Exception
+     */
+    public void testJdk6Configuration()
+        throws Exception
+    {
+        File resourcesDir = new File( getBasedir(), 
"src/test/resources/unit/default-configuration" );
+
+        File outputDir = new File( getBasedir(), 
"target/test/unit/default-configuration/target/site/6" );
+        File xrefDir = new File( outputDir, "xref" );
+
+        copyFilesFromDirectory( new File( resourcesDir, "javadoc-files" ), 
outputDir );
+
+        File testPom = new File( resourcesDir, 
"default-configuration-plugin-config-6.xml" );
+        JxrReport mojo = (JxrReport) lookupMojo( "jxr", testPom );
+        mojo.execute();
+
+        //check if xref files were generated
+        assertTrue( new File( xrefDir, "allclasses-frame.html" ).exists() );
+        assertTrue( new File( xrefDir, "index.html" ).exists() );
+        assertTrue( new File( xrefDir, "overview-frame.html" ).exists() );
+        assertTrue( new File( xrefDir, "overview-summary.html" ).exists() );
+        assertTrue( new File( xrefDir, "stylesheet.css" ).exists() );
+        assertTrue( new File( xrefDir, "def/configuration/App.html" ).exists() 
);
+        assertTrue( new File( xrefDir, "def/configuration/AppSample.html" 
).exists() );
+        assertTrue( new File( xrefDir, "def/configuration/package-frame.html" 
).exists() );
+        assertTrue( new File( xrefDir, 
"def/configuration/package-summary.html" ).exists() );
+
+        //check if there's a link to the javadoc files
+        String str = readFile( new File( xrefDir, 
"def/configuration/AppSample.html" ) );
+        assertTrue( str.toLowerCase().indexOf( 
"/apidocs/def/configuration/AppSample.html\"".toLowerCase() ) != -1 );
+
+        str = readFile( new File( xrefDir, "def/configuration/App.html" ) );
+        assertTrue( str.toLowerCase().indexOf( 
"/apidocs/def/configuration/app.html\"".toLowerCase() ) != -1 );
+
+        // check if encoding is UTF-8, the default value
+        assertTrue( str.indexOf( "text/html; charset=UTF-8" ) != -1 );
+    }
+
+    /**
+     * Test the plugin with jdk-7 configuration
+     *
+     * @throws Exception
+     */
+    public void testJdk7Configuration()
+        throws Exception
+    {
+        File resourcesDir = new File( getBasedir(), 
"src/test/resources/unit/default-configuration" );
+
+        File outputDir = new File( getBasedir(), 
"target/test/unit/default-configuration/target/site/7" );
+        File xrefDir = new File( outputDir, "xref" );
+
+        copyFilesFromDirectory( new File( resourcesDir, "javadoc-files" ), 
outputDir );
+
+        File testPom = new File( resourcesDir, 
"default-configuration-plugin-config-7.xml" );
+        JxrReport mojo = (JxrReport) lookupMojo( "jxr", testPom );
+        mojo.execute();
+
+        //check if xref files were generated
+        assertTrue( new File( xrefDir, "allclasses-frame.html" ).exists() );
+        assertTrue( new File( xrefDir, "index.html" ).exists() );
+        assertTrue( new File( xrefDir, "overview-frame.html" ).exists() );
+        assertTrue( new File( xrefDir, "overview-summary.html" ).exists() );
+        assertTrue( new File( xrefDir, "stylesheet.css" ).exists() );
+        assertTrue( new File( xrefDir, "resources/background.gif" ).exists() );
+        assertTrue( new File( xrefDir, "resources/tab.gif" ).exists() );
+        assertTrue( new File( xrefDir, "resources/titlebar.gif" ).exists() );
+        assertTrue( new File( xrefDir, "resources/titlebar_end.gif" ).exists() 
);
+        assertTrue( new File( xrefDir, "def/configuration/App.html" ).exists() 
);
+        assertTrue( new File( xrefDir, "def/configuration/AppSample.html" 
).exists() );
+        assertTrue( new File( xrefDir, "def/configuration/package-frame.html" 
).exists() );
+        assertTrue( new File( xrefDir, 
"def/configuration/package-summary.html" ).exists() );
+
+        //check if there's a link to the javadoc files
+        String str = readFile( new File( xrefDir, 
"def/configuration/AppSample.html" ) );
+        assertTrue( str.toLowerCase().indexOf( 
"/apidocs/def/configuration/AppSample.html\"".toLowerCase() ) != -1 );
+
+        str = readFile( new File( xrefDir, "def/configuration/App.html" ) );
+        assertTrue( str.toLowerCase().indexOf( 
"/apidocs/def/configuration/app.html\"".toLowerCase() ) != -1 );
+
+        // check if encoding is UTF-8, the default value
+        assertTrue( str.indexOf( "text/html; charset=UTF-8" ) != -1 );
+    }
+
+    /**
+     * Test the plugin with jdk-8 configuration
+     *
+     * @throws Exception
+     */
+    public void testJdk8Configuration()
+        throws Exception
+    {
+        File resourcesDir = new File( getBasedir(), 
"src/test/resources/unit/default-configuration" );
+
+        File outputDir = new File( getBasedir(), 
"target/test/unit/default-configuration/target/site/8" );
+        File xrefDir = new File( outputDir, "xref" );
+
+        copyFilesFromDirectory( new File( resourcesDir, "javadoc-files" ), 
outputDir );
+
+        File testPom = new File( resourcesDir, 
"default-configuration-plugin-config-8.xml" );
         JxrReport mojo = (JxrReport) lookupMojo( "jxr", testPom );
         mojo.execute();
 
diff --git 
a/maven-jxr-plugin/src/test/resources/unit/aggregate-test/aggregate-test-plugin-config.xml
 
b/maven-jxr-plugin/src/test/resources/unit/aggregate-test/aggregate-test-plugin-config.xml
index 32b1585..6236fc9 100644
--- 
a/maven-jxr-plugin/src/test/resources/unit/aggregate-test/aggregate-test-plugin-config.xml
+++ 
b/maven-jxr-plugin/src/test/resources/unit/aggregate-test/aggregate-test-plugin-config.xml
@@ -45,7 +45,7 @@ under the License.
           
<javadocDir>${basedir}/target/test/unit/aggregate-test/target/site/apidocs</javadocDir>
           <linkJavadoc>false</linkJavadoc>
           <bottom>Copyright 2006 Apache Foundation</bottom>
-          <templateDir>templates</templateDir>
+          <javadocVersion>1.4</javadocVersion>
           <stylesheet>stylesheet.css</stylesheet>
           <reactorProjects>
             <project 
implementation="org.apache.maven.plugin.jxr.stubs.AggregateSubmodule1MavenProjectStub"/>
diff --git 
a/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml
 
b/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config-4.xml
similarity index 91%
copy from 
maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml
copy to 
maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config-4.xml
index e20aa2f..124f7aa 100644
--- 
a/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml
+++ 
b/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config-4.xml
@@ -33,18 +33,17 @@ under the License.
         <artifactId>maven-jxr-plugin</artifactId>
         <configuration>
           <project 
implementation="org.apache.maven.plugin.jxr.stubs.DefaultConfigurationMavenProjectStub"/>
-          
<outputDirectory>${basedir}/target/test/unit/default-configuration/target/site</outputDirectory>
+          
<outputDirectory>${basedir}/target/test/unit/default-configuration/target/site/4</outputDirectory>
           <docTitle>Maven Jxr Plugin Default Configuration Test 1.0-SNAPSHOT 
Reference</docTitle>
           <inputEncoding>ISO-8859-1</inputEncoding>
           <sourceDirs>
             
<value>${basedir}/src/test/resources/unit/default-configuration</value>
           </sourceDirs>
-          
<destDir>${basedir}/target/test/unit/default-configuration/target/site/xref</destDir>
-          
<javadocDir>${basedir}/target/test/unit/default-configuration/target/site/apidocs</javadocDir>
+          
<destDir>${basedir}/target/test/unit/default-configuration/target/site/4/xref</destDir>
+          
<javadocDir>${basedir}/target/test/unit/default-configuration/target/site/4/apidocs</javadocDir>
           <linkJavadoc>true</linkJavadoc>
           <bottom>Copyright 2006 Apache Foundation</bottom>
-          <templateDir>templates</templateDir>
-          <stylesheet>stylesheet.css</stylesheet>
+          <javadocVersion>1.4</javadocVersion>
         </configuration>
       </plugin>
     </plugins>
diff --git 
a/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml
 
b/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config-6.xml
similarity index 91%
copy from 
maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml
copy to 
maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config-6.xml
index e20aa2f..5f0edb2 100644
--- 
a/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml
+++ 
b/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config-6.xml
@@ -33,18 +33,17 @@ under the License.
         <artifactId>maven-jxr-plugin</artifactId>
         <configuration>
           <project 
implementation="org.apache.maven.plugin.jxr.stubs.DefaultConfigurationMavenProjectStub"/>
-          
<outputDirectory>${basedir}/target/test/unit/default-configuration/target/site</outputDirectory>
+          
<outputDirectory>${basedir}/target/test/unit/default-configuration/target/site/6</outputDirectory>
           <docTitle>Maven Jxr Plugin Default Configuration Test 1.0-SNAPSHOT 
Reference</docTitle>
           <inputEncoding>ISO-8859-1</inputEncoding>
           <sourceDirs>
             
<value>${basedir}/src/test/resources/unit/default-configuration</value>
           </sourceDirs>
-          
<destDir>${basedir}/target/test/unit/default-configuration/target/site/xref</destDir>
-          
<javadocDir>${basedir}/target/test/unit/default-configuration/target/site/apidocs</javadocDir>
+          
<destDir>${basedir}/target/test/unit/default-configuration/target/site/6/xref</destDir>
+          
<javadocDir>${basedir}/target/test/unit/default-configuration/target/site/6/apidocs</javadocDir>
           <linkJavadoc>true</linkJavadoc>
           <bottom>Copyright 2006 Apache Foundation</bottom>
-          <templateDir>templates</templateDir>
-          <stylesheet>stylesheet.css</stylesheet>
+          <javadocVersion>1.6</javadocVersion>
         </configuration>
       </plugin>
     </plugins>
diff --git 
a/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml
 
b/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config-7.xml
similarity index 91%
copy from 
maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml
copy to 
maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config-7.xml
index e20aa2f..db16d9d 100644
--- 
a/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml
+++ 
b/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config-7.xml
@@ -33,18 +33,17 @@ under the License.
         <artifactId>maven-jxr-plugin</artifactId>
         <configuration>
           <project 
implementation="org.apache.maven.plugin.jxr.stubs.DefaultConfigurationMavenProjectStub"/>
-          
<outputDirectory>${basedir}/target/test/unit/default-configuration/target/site</outputDirectory>
+          
<outputDirectory>${basedir}/target/test/unit/default-configuration/target/site/7</outputDirectory>
           <docTitle>Maven Jxr Plugin Default Configuration Test 1.0-SNAPSHOT 
Reference</docTitle>
           <inputEncoding>ISO-8859-1</inputEncoding>
           <sourceDirs>
             
<value>${basedir}/src/test/resources/unit/default-configuration</value>
           </sourceDirs>
-          
<destDir>${basedir}/target/test/unit/default-configuration/target/site/xref</destDir>
-          
<javadocDir>${basedir}/target/test/unit/default-configuration/target/site/apidocs</javadocDir>
+          
<destDir>${basedir}/target/test/unit/default-configuration/target/site/7/xref</destDir>
+          
<javadocDir>${basedir}/target/test/unit/default-configuration/target/site/7/apidocs</javadocDir>
           <linkJavadoc>true</linkJavadoc>
           <bottom>Copyright 2006 Apache Foundation</bottom>
-          <templateDir>templates</templateDir>
-          <stylesheet>stylesheet.css</stylesheet>
+          <javadocVersion>1.7</javadocVersion>
         </configuration>
       </plugin>
     </plugins>
diff --git 
a/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml
 
b/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config-8.xml
similarity index 91%
copy from 
maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml
copy to 
maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config-8.xml
index e20aa2f..8be96ac 100644
--- 
a/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml
+++ 
b/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config-8.xml
@@ -33,18 +33,17 @@ under the License.
         <artifactId>maven-jxr-plugin</artifactId>
         <configuration>
           <project 
implementation="org.apache.maven.plugin.jxr.stubs.DefaultConfigurationMavenProjectStub"/>
-          
<outputDirectory>${basedir}/target/test/unit/default-configuration/target/site</outputDirectory>
+          
<outputDirectory>${basedir}/target/test/unit/default-configuration/target/site/8</outputDirectory>
           <docTitle>Maven Jxr Plugin Default Configuration Test 1.0-SNAPSHOT 
Reference</docTitle>
           <inputEncoding>ISO-8859-1</inputEncoding>
           <sourceDirs>
             
<value>${basedir}/src/test/resources/unit/default-configuration</value>
           </sourceDirs>
-          
<destDir>${basedir}/target/test/unit/default-configuration/target/site/xref</destDir>
-          
<javadocDir>${basedir}/target/test/unit/default-configuration/target/site/apidocs</javadocDir>
+          
<destDir>${basedir}/target/test/unit/default-configuration/target/site/8/xref</destDir>
+          
<javadocDir>${basedir}/target/test/unit/default-configuration/target/site/8/apidocs</javadocDir>
           <linkJavadoc>true</linkJavadoc>
           <bottom>Copyright 2006 Apache Foundation</bottom>
-          <templateDir>templates</templateDir>
-          <stylesheet>stylesheet.css</stylesheet>
+          <javadocVersion>1.8</javadocVersion>
         </configuration>
       </plugin>
     </plugins>
diff --git 
a/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml
 
b/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml
index e20aa2f..6841a75 100644
--- 
a/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml
+++ 
b/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml
@@ -45,6 +45,7 @@ under the License.
           <bottom>Copyright 2006 Apache Foundation</bottom>
           <templateDir>templates</templateDir>
           <stylesheet>stylesheet.css</stylesheet>
+          <javadocVersion>3</javadocVersion>
         </configuration>
       </plugin>
     </plugins>
diff --git 
a/maven-jxr-plugin/src/test/resources/unit/exclude-configuration/exclude-configuration-plugin-config.xml
 
b/maven-jxr-plugin/src/test/resources/unit/exclude-configuration/exclude-configuration-plugin-config.xml
index c9a287e..cc61d9f 100644
--- 
a/maven-jxr-plugin/src/test/resources/unit/exclude-configuration/exclude-configuration-plugin-config.xml
+++ 
b/maven-jxr-plugin/src/test/resources/unit/exclude-configuration/exclude-configuration-plugin-config.xml
@@ -44,7 +44,7 @@ under the License.
           
<javadocDir>${basedir}/target/test/unit/exclude-configuration/target/site/apidocs</javadocDir>
           <linkJavadoc>true</linkJavadoc>
           <bottom>Copyright 2006 Apache Foundation</bottom>
-          <templateDir>templates</templateDir>
+          <javadocVersion>1.4</javadocVersion>
           <stylesheet>stylesheet.css</stylesheet>
           <excludes>
             <exclude>**/AppSample.java</exclude>
diff --git 
a/maven-jxr-plugin/src/test/resources/unit/include-configuration/include-configuration-plugin-config.xml
 
b/maven-jxr-plugin/src/test/resources/unit/include-configuration/include-configuration-plugin-config.xml
index 912fffc..580c19c 100644
--- 
a/maven-jxr-plugin/src/test/resources/unit/include-configuration/include-configuration-plugin-config.xml
+++ 
b/maven-jxr-plugin/src/test/resources/unit/include-configuration/include-configuration-plugin-config.xml
@@ -44,7 +44,7 @@ under the License.
           
<javadocDir>${basedir}/target/test/unit/include-configuration/target/site/apidocs</javadocDir>
           <linkJavadoc>true</linkJavadoc>
           <bottom>Copyright 2006 Apache Foundation</bottom>
-          <templateDir>templates</templateDir>
+          <javadocVersion>1.4</javadocVersion>
           <stylesheet>stylesheet.css</stylesheet>
           <includes>
             <include>**/App.java</include>
diff --git 
a/maven-jxr-plugin/src/test/resources/unit/nojavadocdir-test/nojavadocdir-test-plugin-config.xml
 
b/maven-jxr-plugin/src/test/resources/unit/nojavadocdir-test/nojavadocdir-test-plugin-config.xml
index 7a7017b..351f7aa 100644
--- 
a/maven-jxr-plugin/src/test/resources/unit/nojavadocdir-test/nojavadocdir-test-plugin-config.xml
+++ 
b/maven-jxr-plugin/src/test/resources/unit/nojavadocdir-test/nojavadocdir-test-plugin-config.xml
@@ -44,7 +44,7 @@ under the License.
           
<javadocDir>${basedir}/target/test/unit/nojavadocdir-test/target/site/apidocs</javadocDir>
           <linkJavadoc>true</linkJavadoc>
           <bottom>Copyright 2006 Apache Foundation</bottom>
-          <templateDir>templates</templateDir>
+          <javadocVersion>1.4</javadocVersion>
           <stylesheet>stylesheet.css</stylesheet>
         </configuration>
       </plugin>
diff --git 
a/maven-jxr-plugin/src/test/resources/unit/nojavadoclink-configuration/nojavadoclink-configuration-plugin-config.xml
 
b/maven-jxr-plugin/src/test/resources/unit/nojavadoclink-configuration/nojavadoclink-configuration-plugin-config.xml
index 0621f03..6fae9b8 100644
--- 
a/maven-jxr-plugin/src/test/resources/unit/nojavadoclink-configuration/nojavadoclink-configuration-plugin-config.xml
+++ 
b/maven-jxr-plugin/src/test/resources/unit/nojavadoclink-configuration/nojavadoclink-configuration-plugin-config.xml
@@ -44,7 +44,7 @@ under the License.
           
<javadocDir>${basedir}/target/test/unit/nojavadoclink-configuration/target/site/apidocs</javadocDir>
           <linkJavadoc>false</linkJavadoc>
           <bottom>Copyright 2006 Apache Foundation</bottom>
-          <templateDir>templates</templateDir>
+          <javadocVersion>1.4</javadocVersion>
           <stylesheet>stylesheet.css</stylesheet>
         </configuration>
       </plugin>
diff --git 
a/maven-jxr-plugin/src/test/resources/unit/testsourcedir-test/testsourcedir-test-plugin-config.xml
 
b/maven-jxr-plugin/src/test/resources/unit/testsourcedir-test/testsourcedir-test-plugin-config.xml
index 430e144..6f08c17 100644
--- 
a/maven-jxr-plugin/src/test/resources/unit/testsourcedir-test/testsourcedir-test-plugin-config.xml
+++ 
b/maven-jxr-plugin/src/test/resources/unit/testsourcedir-test/testsourcedir-test-plugin-config.xml
@@ -42,7 +42,7 @@ under the License.
           </sourceDirs>
           
<destDir>${basedir}/target/test/unit/testsourcedir-test/target/site/xref-test</destDir>
           <bottom>Copyright 2006 Apache Foundation</bottom>
-          <templateDir>templates</templateDir>
+          <javadocVersion>1.4</javadocVersion>
           <stylesheet>stylesheet.css</stylesheet>
         </configuration>
       </plugin>
diff --git a/maven-jxr/pom.xml b/maven-jxr/pom.xml
index e50bc7e..9254c81 100644
--- a/maven-jxr/pom.xml
+++ b/maven-jxr/pom.xml
@@ -79,6 +79,10 @@ under the License.
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-java</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
     </dependency>
 
diff --git a/maven-jxr/src/main/resources/templates/jdk4/allclasses-frame.vm 
b/maven-jxr/src/main/resources/templates/jdk4/allclasses-frame.vm
new file mode 100644
index 0000000..379b83a
--- /dev/null
+++ b/maven-jxr/src/main/resources/templates/jdk4/allclasses-frame.vm
@@ -0,0 +1,45 @@
+#*
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+
+*#
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html xml:lang="en" lang="en">
+    <!-- generated by Apache Maven JXR (jdk4) -->
+    <head>
+        <meta http-equiv="content-type" content="text/html; 
charset=$outputEncoding" />
+        <title>All Classes</title>
+        <link rel="stylesheet" type="text/css" href="stylesheet.css" 
title="style" />
+    </head>
+    <body bgcolor="white">
+        <font size="+1" class="FrameHeadingFont"><b>All Classes</b></font>
+        <br/>
+        <table border="0" width="100%" summary="">
+            <tr>
+                <td nowrap>
+                    <font class="FrameItemFont">
+                        #foreach ($classInfo in $info.allClasses.values())
+                        <a 
href="${classInfo.dir}/${classInfo.filename}.html#${classInfo.name}" 
target="classFrame">$classInfo.name</a>
+                        <br/>
+                        #end
+                    </font>
+                </td>
+            </tr>
+        </table>
+    </body>
+</html>
diff --git a/maven-jxr/src/main/resources/templates/jdk4/index.vm 
b/maven-jxr/src/main/resources/templates/jdk4/index.vm
new file mode 100644
index 0000000..378591f
--- /dev/null
+++ b/maven-jxr/src/main/resources/templates/jdk4/index.vm
@@ -0,0 +1,42 @@
+#*
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+
+*#
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd";>
+<html xml:lang="en" lang="en">
+    <!-- this is a JXR report set (jdk4) -->
+    <head>
+        <meta http-equiv="content-type" content="text/html; 
charset=$outputEncoding" />
+        <title>$windowTitle</title>
+    </head>
+    <frameset cols="20%,80%">
+        <frameset rows="30%,70%">
+            <frame src="overview-frame.html" name="packageListFrame" />
+            <frame src="allclasses-frame.html" name="packageFrame" />
+        </frameset>
+        <frame src="overview-summary.html" name="classFrame" />
+        <noframes>
+            <h1>Frame Alert</h1>
+            <p>
+                You don't have frames. Go <a 
href="overview-summary.html">here</a>
+            </p>
+        </noframes>
+    </frameset>
+</html>
+
diff --git a/maven-jxr/src/main/resources/templates/jdk4/overview-frame.vm 
b/maven-jxr/src/main/resources/templates/jdk4/overview-frame.vm
new file mode 100644
index 0000000..2c86e2c
--- /dev/null
+++ b/maven-jxr/src/main/resources/templates/jdk4/overview-frame.vm
@@ -0,0 +1,53 @@
+#*
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+
+*#
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html xml:lang="en" lang="en">
+    <!-- generated by Apache Maven JXR (jdk4) -->
+    <head>
+        <meta http-equiv="content-type" content="text/html; 
charset=$outputEncoding" />
+        <title>$windowTitle</title>
+        <link rel="stylesheet" type="text/css" href="stylesheet.css" 
title="style" />
+    </head>
+    <body bgcolor="white">
+        <table border="0" width="100%" summary="">
+            <tr>
+                <td nowrap>
+                    <font size="+1" 
class="FrameTitleFont"><b>$docTitle</b></font>
+                </td>
+            </tr>
+        </table>
+        <table border="0" width="100%" summary="">
+            <tr>
+                <td nowrap>
+                    <font class="FrameItemFont"><a 
href="allclasses-frame.html" target="packageFrame">All Classes</a></font>
+                    <p>
+                    <font size="+1" class="FrameHeadingFont">Packages</font>
+                    <br/>
+                    #foreach ($pkgInfo in $info.allPackages.values())
+                    <font class="FrameItemFont"><a 
href="${pkgInfo.dir}/package-frame.html" 
target="packageFrame">$pkgInfo.name</a></font>
+                    <br/>
+                    #end
+                </td>
+            </tr>
+        </table>
+        <p>&nbsp;</p>
+    </body>
+</html>
diff --git a/maven-jxr/src/main/resources/templates/jdk4/overview-summary.vm 
b/maven-jxr/src/main/resources/templates/jdk4/overview-summary.vm
new file mode 100644
index 0000000..bcf5fcb
--- /dev/null
+++ b/maven-jxr/src/main/resources/templates/jdk4/overview-summary.vm
@@ -0,0 +1,144 @@
+#*
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+
+*#
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html xml:lang="en" lang="en">
+    <!-- generated by Apache Maven JXR (jdk4) -->
+    <head>
+        <meta http-equiv="content-type" content="text/html; 
charset=$outputEncoding" />
+        <title>$windowTitle</title>
+        <link rel="stylesheet" type="text/css" href="stylesheet.css" 
title="style" />
+    </head>
+    <body>
+        ## Navigation Bar -------- START --------
+        <a name="navbar_top"><!-- --></a>
+        <a href="#skip-navbar_top" title="Skip navigation links"></a>
+        <table border="0" width="100%" cellpadding="1" cellspacing="0" 
summary="">
+            <tr>
+                <td colspan=3 bgcolor="#EEEEFF" class="NavBarCell1">
+                    <a name="navbar_top_firstrow"><!-- --></a>
+                    <table border="0" cellpadding="0" cellspacing="3" 
summary="">
+                        <tr align="center" valign="top">
+                            <td bgcolor="#FFFFFF" 
class="NavBarCell1Rev">&nbsp;<font 
class="NavBarFont1Rev"><b>Overview</b></font>&nbsp;</td>
+                            <td bgcolor="#EEEEFF" 
class="NavBarCell1">&nbsp;<font class="NavBarFont1">Package</font>&nbsp;</td>
+                            <td bgcolor="#EEEEFF" 
class="NavBarCell1">&nbsp;<font class="NavBarFont1">Class</font>&nbsp;</td>
+                            <td bgcolor="#EEEEFF" 
class="NavBarCell1">&nbsp;<font class="NavBarFont1">Use</font>&nbsp;</td>
+                            <td bgcolor="#EEEEFF" 
class="NavBarCell1">&nbsp;<font class="NavBarFont1">Tree</font>&nbsp;</td>
+                            <td bgcolor="#EEEEFF" 
class="NavBarCell1">&nbsp;<font class="NavBarFont1">Deprecated</font>&nbsp;</td>
+                            <td bgcolor="#EEEEFF" 
class="NavBarCell1">&nbsp;<font class="NavBarFont1">Index</font>&nbsp;</td>
+                            <td bgcolor="#EEEEFF" 
class="NavBarCell1">&nbsp;<font class="NavBarFont1">Help</font>&nbsp;</td>
+                        </tr>
+                    </table>
+                </td>
+                <td align="right" valign="top" rowspan=3>
+                    <b>$docTitle</b>
+                </td>
+            </tr>
+            <tr>
+                <td bgcolor="white" class="NavBarCell2">
+                    <font size="-2">&nbsp;PREV&nbsp;&nbsp;NEXT</font>
+                </td>
+                <td bgcolor="white" class="NavBarCell2">
+                    <font size="-2">
+                        <a href="index.html" 
target="_top"><b>FRAMES</b></a>&nbsp;
+                        <a href="overview-summary.html" target="_top"><b>NO 
FRAMES</b></a>
+                        <b>All Classes</b>
+                    </font>
+                </td>
+            </tr>
+        </table>
+        <a name="skip-navbar_top"></a>
+        ## Navigation Bar -------- END --------
+
+        ## Overview Summary -------- START --------
+        <hr/>
+        <center>
+            <h1>$docTitle</h1>
+        </center>
+        <p>
+
+        <table border="1" width="100%" cellpadding="3" cellspacing="0" 
summary="">
+            <thead>
+                <tr bgcolor="#CCCCFF" class="TableHeadingColor">
+                    <td>
+                        <font size="+2">
+                            <b>Packages</b>
+                        </font>
+                    </td>
+                </tr>
+            </thead>
+            <tbody>
+                #foreach ($pkgInfo in $info.allPackages.values())
+                <tr bgcolor="white" class="TableRowColor">
+                    <td><b><a 
href="${pkgInfo.dir}/package-summary.html">$pkgInfo.name</a></b></td>
+                </tr>
+                #end
+            </tbody>
+        </table>
+
+        <hr/>
+        ## Overview Summary -------- END --------
+
+        ## Navigation Bar -------- START --------
+        <a name="navbar_bottom"><!-- --></a>
+        <a href="#skip-navbar_bottom" title="Skip navigation links"></a>
+        <table border="0" width="100%" cellpadding="1" cellspacing="0" 
summary="">
+            <tr>
+                <td colspan=3 bgcolor="#EEEEFF" class="NavBarCell1">
+                    <a name="navbar_bottom_firstrow"><!-- --></a>
+                    <table border="0" cellpadding="0" cellspacing="3" 
summary="">
+                        <tr align="center" valign="top">
+                            <td bgcolor="#FFFFFF" 
class="NavBarCell1Rev">&nbsp;<font 
class="NavBarFont1Rev"><b>Overview</b></font>&nbsp;</td>
+                            <td bgcolor="#EEEEFF" 
class="NavBarCell1">&nbsp;<font class="NavBarFont1">Package</font>&nbsp;</td>
+                            <td bgcolor="#EEEEFF" 
class="NavBarCell1">&nbsp;<font class="NavBarFont1">Class</font>&nbsp;</td>
+                            <td bgcolor="#EEEEFF" 
class="NavBarCell1">&nbsp;<font class="NavBarFont1">Use</font>&nbsp;</td>
+                            <td bgcolor="#EEEEFF" 
class="NavBarCell1">&nbsp;<font class="NavBarFont1">Tree</font>&nbsp;</td>
+                            <td bgcolor="#EEEEFF" 
class="NavBarCell1">&nbsp;<font class="NavBarFont1">Deprecated</font>&nbsp;</td>
+                            <td bgcolor="#EEEEFF" 
class="NavBarCell1">&nbsp;<font class="NavBarFont1">Index</font>&nbsp;</td>
+                            <td bgcolor="#EEEEFF" 
class="NavBarCell1">&nbsp;<font class="NavBarFont1">Help</font>&nbsp;</td>
+                        </tr>
+                    </table>
+                </td>
+                <td align="right" valign="top" rowspan=3>
+                    <b>$docTitle</b>
+                </td>
+            </tr>
+            <tr>
+                <td bgcolor="white" class="NavBarCell2">
+                    <font size="-2">&nbsp;PREV&nbsp;&nbsp;NEXT</font>
+                </td>
+                <td bgcolor="white" class="NavBarCell2">
+                    <font size="-2">
+                        <a href="index.html" 
target="_top"><b>FRAMES</b></a>&nbsp;
+                        <a href="overview-summary.html" target="_top"><b>NO 
FRAMES</b></a>
+                        <b>All Classes</b>
+                    </font>
+                </td>
+            </tr>
+        </table>
+        <a name="skip-navbar_bottom"></a>
+        ## Navigation Bar -------- END --------
+
+        <hr/>
+        <div id="footer">
+            ${bottom}
+        </div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/maven-jxr/src/main/resources/templates/jdk4/package-frame.vm 
b/maven-jxr/src/main/resources/templates/jdk4/package-frame.vm
new file mode 100644
index 0000000..c682c44
--- /dev/null
+++ b/maven-jxr/src/main/resources/templates/jdk4/package-frame.vm
@@ -0,0 +1,48 @@
+#*
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+
+*#
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html xml:lang="en" lang="en">
+    <!-- generated by Apache Maven JXR (jdk4) -->
+    <head>
+        <meta http-equiv="content-type" content="text/html; 
charset=$outputEncoding" />
+        <title>$windowTitle Package $pkgInfo.name</title>
+        <link rel="stylesheet" type="text/css" 
href="${pkgInfo.rootRef}stylesheet.css" title="style" />
+    </head>
+    <body bgcolor="white">
+        <font size="+1" class="FrameTitleFont">
+            <a href="package-summary.html" 
target="classFrame">$pkgInfo.name</a>
+        </font>
+
+        <table border="0" width="100%" summary="">
+            <tr>
+                <td nowrap>
+                    <font size="+1" 
class="FrameHeadingFont">Classes</font>&nbsp;
+                    <font class="FrameItemFont">
+                        #foreach ($classInfo in $pkgInfo.classes.values())
+                        <br>
+                        <a href="${classInfo.filename}.html#${classInfo.name}" 
target="classFrame">$classInfo.name</a>
+                        #end
+                    </font>
+                </td>
+            </tr>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/maven-jxr/src/main/resources/templates/jdk4/package-summary.vm 
b/maven-jxr/src/main/resources/templates/jdk4/package-summary.vm
new file mode 100644
index 0000000..0a91272
--- /dev/null
+++ b/maven-jxr/src/main/resources/templates/jdk4/package-summary.vm
@@ -0,0 +1,142 @@
+#*
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+
+*#
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html xml:lang="en" lang="en">
+    <!-- generated by Apache Maven JXR (jdk4) -->
+    <head>
+        <meta http-equiv="content-type" content="text/html; 
charset=$outputEncoding" />
+        <title>$windowTitle Package $pkgInfo.name</title>
+        <link rel="stylesheet" type="text/css" 
href="${pkgInfo.rootRef}stylesheet.css" title="style" />
+    </head>
+    <body>
+        ## Navigation Bar -------- START --------
+        <a name="navbar_top"><!-- --></a>
+        <a href="#skip-navbar_top" title="Skip navigation links"></a>
+        <table border="0" width="100%" cellpadding="1" cellspacing="0" 
summary="">
+            <tr>
+                <td colspan=3 bgcolor="#EEEEFF" class="NavBarCell1">
+                    <a name="navbar_top_firstrow"><!-- --></a>
+                    <table border="0" cellpadding="0" cellspacing="3" 
summary="">
+                        <tr align="center" valign="top">
+                            <td bgcolor="#EEEEFF" class="NavBarCell1">&nbsp;<a 
href="${pkgInfo.rootRef}overview-summary.html"><font 
class="NavBarFont1"><b>Overview</b></font></a>&nbsp;</td>
+                            <td bgcolor="#FFFFFF" 
class="NavBarCell1Rev">&nbsp;<font 
class="NavBarFont1Rev">Package</font>&nbsp;</td>
+                            <td bgcolor="#EEEEFF" 
class="NavBarCell1">&nbsp;<font class="NavBarFont1">Class</font>&nbsp;</td>
+                            <td bgcolor="#EEEEFF" 
class="NavBarCell1">&nbsp;<font class="NavBarFont1">Use</font>&nbsp;</td>
+                            <td bgcolor="#EEEEFF" 
class="NavBarCell1">&nbsp;<font class="NavBarFont1">Tree</font>&nbsp;</td>
+                            <td bgcolor="#EEEEFF" 
class="NavBarCell1">&nbsp;<font class="NavBarFont1">Deprecated</font>&nbsp;</td>
+                            <td bgcolor="#EEEEFF" 
class="NavBarCell1">&nbsp;<font class="NavBarFont1">Index</font>&nbsp;</td>
+                            <td bgcolor="#EEEEFF" 
class="NavBarCell1">&nbsp;<font class="NavBarFont1">Help</font>&nbsp;</td>
+                        </tr>
+                    </table>
+                </td>
+                <td align="right" valign="top" rowspan=3>
+                    <b>$docTitle</b>
+                </td>
+            </tr>
+            <tr>
+                <td bgcolor="white" class="NavBarCell2">
+                    <font size="-2">&nbsp;PREV&nbsp;&nbsp;NEXT</font>
+                </td>
+                <td bgcolor="white" class="NavBarCell2">
+                    <font size="-2">
+                        <a href="${pkgInfo.rootRef}index.html" 
target="_top"><b>FRAMES</b></a>&nbsp;
+                        <a href="package-summary.html" target="_top"><b>NO 
FRAMES</b></a>
+                        <b>All Classes</b>
+                    </font>
+                </td>
+            </tr>
+        </table>
+        <a name="skip-navbar_top"></a>
+        ## Navigation Bar -------- END --------
+
+        ## Package Summary -------- START --------
+       <hr/>
+
+       <h2>Package $pkgInfo.name</h2>
+
+        <table border="1" width="100%" cellpadding="3" cellspacing="0" 
summary="">
+            <thead>
+                <tr bgcolor="#CCCCFF" class="TableHeadingColor">
+                    <td>
+                        <font size="+2">
+                            <b>Classes</b>
+                        </font>
+                    </td>
+                </tr>
+            </thead>
+            <tbody>
+                #foreach ($classInfo in $pkgInfo.classes.values())
+                <tr bgcolor="white" class="TableRowColor">
+                    <td><b><a 
href="${classInfo.filename}.html#${classInfo.name}" 
target="classFrame">$classInfo.name</a></b></td>
+                </tr>
+                #end
+            </tbody>
+        </table>
+
+       <hr/>
+        ## Package Summary -------- END --------
+
+        ## Navigation Bar -------- START --------
+        <a name="navbar_bottom"><!-- --></a>
+        <a href="#skip-navbar_bottom" title="Skip navigation links"></a>
+        <table border="0" width="100%" cellpadding="1" cellspacing="0" 
summary="">
+            <tr>
+                <td colspan=3 bgcolor="#EEEEFF" class="NavBarCell1">
+                    <a name="navbar_top_firstrow"><!-- --></a>
+                    <table border="0" cellpadding="0" cellspacing="3" 
summary="">
+                        <tr align="center" valign="top">
+                            <td bgcolor="#EEEEFF" class="NavBarCell1">&nbsp;<a 
href="${pkgInfo.rootRef}overview-summary.html"><font 
class="NavBarFont1"><b>Overview</b></font></a>&nbsp;</td>
+                            <td bgcolor="#FFFFFF" 
class="NavBarCell1Rev">&nbsp;<font 
class="NavBarFont1Rev">Package</font>&nbsp;</td>
+                            <td bgcolor="#EEEEFF" 
class="NavBarCell1">&nbsp;<font class="NavBarFont1">Class</font>&nbsp;</td>
+                            <td bgcolor="#EEEEFF" 
class="NavBarCell1">&nbsp;<font class="NavBarFont1">Use</font>&nbsp;</td>
+                            <td bgcolor="#EEEEFF" 
class="NavBarCell1">&nbsp;<font class="NavBarFont1">Tree</font>&nbsp;</td>
+                            <td bgcolor="#EEEEFF" 
class="NavBarCell1">&nbsp;<font class="NavBarFont1">Deprecated</font>&nbsp;</td>
+                            <td bgcolor="#EEEEFF" 
class="NavBarCell1">&nbsp;<font class="NavBarFont1">Index</font>&nbsp;</td>
+                            <td bgcolor="#EEEEFF" 
class="NavBarCell1">&nbsp;<font class="NavBarFont1">Help</font>&nbsp;</td>
+                        </tr>
+                    </table>
+                </td>
+                <td align="right" valign="top" rowspan=3>
+                    <b>$docTitle</b>
+                </td>
+            </tr>
+            <tr>
+                <td bgcolor="white" class="NavBarCell2">
+                    <font size="-2">&nbsp;PREV&nbsp;&nbsp;NEXT</font>
+                </td>
+                <td bgcolor="white" class="NavBarCell2">
+                    <font size="-2">
+                        <a href="${pkgInfo.rootRef}index.html" 
target="_top"><b>FRAMES</b></a>&nbsp;
+                        <a href="package-summary.html" target="_top"><b>NO 
FRAMES</b></a>
+                        <b>All Classes</b>
+                    </font>
+                </td>
+            </tr>
+        </table>
+        <a name="skip-navbar_bottom"></a>
+        ## Navigation Bar -------- END --------
+
+        <hr/>
+        <div id="footer">
+            ${bottom}
+        </div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/maven-jxr/src/main/resources/templates/jdk7/allclasses-frame.vm 
b/maven-jxr/src/main/resources/templates/jdk7/allclasses-frame.vm
new file mode 100644
index 0000000..36943ba
--- /dev/null
+++ b/maven-jxr/src/main/resources/templates/jdk7/allclasses-frame.vm
@@ -0,0 +1,39 @@
+#*
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+
+*#
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html xml:lang="en" lang="en">
+    <!-- generated by Apache Maven JXR (jdk7) -->
+    <head>
+        <meta http-equiv="content-type" content="text/html; 
charset=$outputEncoding" />
+        <title>All Classes</title>
+        <link rel="stylesheet" type="text/css" href="stylesheet.css" 
title="style" />
+    </head>
+    <body>
+        <h1 class="bar">All Classes</h1>
+        <div class="indexContainer">
+            <ul>
+                #foreach ($classInfo in $info.allClasses.values())
+                <li><a 
href="${classInfo.dir}/${classInfo.filename}.html#${classInfo.name}" 
target="classFrame">$classInfo.name</a></li>
+                #end
+            </ul>
+        </div>
+    </body>
+</html>
diff --git a/maven-jxr/src/main/resources/templates/jdk7/index.vm 
b/maven-jxr/src/main/resources/templates/jdk7/index.vm
new file mode 100644
index 0000000..6ed01ec
--- /dev/null
+++ b/maven-jxr/src/main/resources/templates/jdk7/index.vm
@@ -0,0 +1,94 @@
+#*
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+
+*#
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd";>
+<html xml:lang="en" lang="en">
+    <!-- this is a JXR report set (jdk7) -->
+    <head>
+        <meta http-equiv="content-type" content="text/html; 
charset=$outputEncoding" />
+        <title>$windowTitle</title>
+        <script type="text/javascript">
+            tmpTargetPage = "" + window.location.search;
+            if (tmpTargetPage != "" && tmpTargetPage != "undefined")
+                tmpTargetPage = tmpTargetPage.substring(1);
+            if (tmpTargetPage.indexOf(":") != -1 || (tmpTargetPage != "" && 
!validURL(tmpTargetPage)))
+                tmpTargetPage = "undefined";
+            targetPage = tmpTargetPage;
+            function validURL(url) {
+                try {
+                    url = decodeURIComponent(url);
+                }
+                catch (error) {
+                    return false;
+                }
+                var pos = url.indexOf(".html");
+                if (pos == -1 || pos != url.length - 5)
+                    return false;
+                var allowNumber = false;
+                var allowSep = false;
+                var seenDot = false;
+                for (var i = 0; i < url.length - 5; i++) {
+                    var ch = url.charAt(i);
+                    if ('a' <= ch && ch <= 'z' ||
+                            'A' <= ch && ch <= 'Z' ||
+                            ch == '$' ||
+                            ch == '_' ||
+                            ch.charCodeAt(0) > 127) {
+                        allowNumber = true;
+                        allowSep = true;
+                    } else if ('0' <= ch && ch <= '9'
+                            || ch == '-') {
+                        if (!allowNumber)
+                            return false;
+                    } else if (ch == '/' || ch == '.') {
+                        if (!allowSep)
+                            return false;
+                        allowNumber = false;
+                        allowSep = false;
+                        if (ch == '.')
+                            seenDot = true;
+                        if (ch == '/' && seenDot)
+                            return false;
+                    } else {
+                        return false;
+                    }
+                }
+                return true;
+            }
+            function loadFrames() {
+                if (targetPage != "" && targetPage != "undefined")
+                    top.classFrame.location = top.targetPage;
+            }
+        </script>
+    </head>
+    <frameset cols="20%,80%" title="Documentation frame" 
onload="top.loadFrames()">
+        <frameset rows="30%,70%" title="Left frames" onload="top.loadFrames()">
+            <frame src="overview-frame.html" name="packageListFrame" 
title="All Packages"/>
+            <frame src="allclasses-frame.html" name="packageFrame" title="All 
classes and interfaces (except non-static nested types)"/>
+        </frameset>
+        <frame src="overview-summary.html" name="classFrame" title="Package, 
class and interface descriptions" scrolling="yes"/>
+        <noframes>
+            <h1>Frame Alert</h1>
+            <p>
+                You don't have frames. Go <a 
href="overview-summary.html">here</a>
+            </p>
+        </noframes>
+    </frameset>
+</html>
diff --git a/maven-jxr/src/main/resources/templates/jdk7/overview-frame.vm 
b/maven-jxr/src/main/resources/templates/jdk7/overview-frame.vm
new file mode 100644
index 0000000..f3f2fdc
--- /dev/null
+++ b/maven-jxr/src/main/resources/templates/jdk7/overview-frame.vm
@@ -0,0 +1,45 @@
+#*
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+
+*#
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html xml:lang="en" lang="en">
+    <!-- generated by Apache Maven JXR (jdk7) -->
+    <head>
+        <meta http-equiv="content-type" content="text/html; 
charset=$outputEncoding" />
+        <title>$windowTitle</title>
+        <link rel="stylesheet" type="text/css" href="stylesheet.css" 
title="style" />
+    </head>
+    <body>
+        <h1 title="All Classes" class="bar"><strong>All Classes</strong></h1>
+        <div class="indexHeader"><a href="allclasses-frame.html" 
target="packageFrame">All Classes</a></div>
+        <div class="indexContainer">
+            <h2 title="Packages">Packages</h2>
+            <ul title="Packages">
+                #foreach ($pkgInfo in $info.allPackages.values())
+                <li>
+                    <a href="${pkgInfo.dir}/package-frame.html" 
target="packageFrame">$pkgInfo.name</a>
+                </li>
+                #end
+            </ul>
+        </div>
+        <p>&nbsp;</p>
+    </body>
+</html>
+
diff --git a/maven-jxr/src/main/resources/templates/jdk7/overview-summary.vm 
b/maven-jxr/src/main/resources/templates/jdk7/overview-summary.vm
new file mode 100644
index 0000000..b80f903
--- /dev/null
+++ b/maven-jxr/src/main/resources/templates/jdk7/overview-summary.vm
@@ -0,0 +1,131 @@
+#*
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+
+*#
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html xml:lang="en" lang="en">
+    <!-- generated by Apache Maven JXR (jdk7) -->
+    <head>
+        <meta http-equiv="content-type" content="text/html; 
charset=$outputEncoding" />
+        <title>$windowTitle</title>
+        <link rel="stylesheet" type="text/css" href="stylesheet.css" 
title="style" />
+    </head>
+    <body>
+        ## Navigation Bar -------- START --------
+        <div class="topNav">
+            <a name="navbar_top"><!--   --></a>
+            <a href="#skip-navbar_top" title="Skip navigation links"></a>
+            <a name="navbar_top_firstrow"><!--   --></a>
+            <ul class="navList" title="Navigation">
+                <li class="navBarCell1Rev">Overview</li>
+                <li>Package</li>
+                <li>Class</li>
+                <li>Use</li>
+                <li>Tree</li>
+                <li>Deprecated</li>
+                <li>Index</li>
+                <li>Help</li>
+            </ul>
+            <div 
class="aboutLanguage"><em><strong>$docTitle</strong></em></div>
+        </div>
+        <div class="subNav">
+            <ul class="navList">
+                <li>Prev</li>
+                <li>Next</li>
+            </ul>
+            <ul class="navList">
+                <li><a href="index.html?overview-summary.html" 
target="_top">Frames</a></li>
+                <li><a href="overview-summary.html" target="_top">No 
Frames</a></li>
+            </ul>
+            <ul class="navList" id="allclasses_navbar_top">
+                <li>All Classes</li>
+            </ul>
+            <a name="skip-navbar_top"><!--   --></a>
+        </div>
+        ## Navigation Bar -------- END --------
+
+        ## Overview Summary -------- START --------
+        <div class="header">
+            <h1 class="title">$docTitle</h1>
+        </div>
+        <div class="contentContainer">
+            <table class="overviewSummary" border="0" cellpadding="3" 
cellspacing="0" summary="Packages table, listing packages">
+                <caption><span>Packages</span><span 
class="tabEnd">&nbsp;</span></caption>
+                <thead>
+                    <tr>
+                        <th class="colFirst colLast" scope="col">Package</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    #set ($rowclass = "rowColor")
+                    #foreach ($pkgInfo in $info.allPackages.values())
+                        #if ($rowclass == "rowColor")
+                            #set ($rowclass = "altColor")
+                        #else
+                            #set ($rowclass = "rowColor")
+                        #end
+                    <tr class="${rowclass}">
+                        <td class="colFirst colLast">
+                            <a 
href="${pkgInfo.dir}/package-summary.html">$pkgInfo.name</a>
+                        </td>
+                    </tr>
+                    #end
+                </tbody>
+            </table>
+        </div>
+        ## Overview Summary -------- END --------
+
+        ## Navigation Bar -------- START --------
+        <div class="bottomNav">
+            <a name="navbar_bottom"><!--   --></a>
+            <a href="#skip-navbar_bottom" title="Skip navigation links"></a>
+            <a name="navbar_bottom_firstrow"><!--   --></a>
+            <ul class="navList" title="Navigation">
+                <li class="navBarCell1Rev">Overview</li>
+                <li>Package</li>
+                <li>Class</li>
+                <li>Use</li>
+                <li>Tree</li>
+                <li>Deprecated</li>
+                <li>Index</li>
+                <li>Help</li>
+            </ul>
+            <div 
class="aboutLanguage"><em><strong>$docTitle</strong></em></div>
+        </div>
+        <div class="subNav">
+            <ul class="navList">
+                <li>Prev</li>
+                <li>Next</li>
+            </ul>
+            <ul class="navList">
+                <li><a href="index.html?overview-summary.html" 
target="_top">Frames</a></li>
+                <li><a href="overview-summary.html" target="_top">No 
Frames</a></li>
+            </ul>
+            <ul class="navList" id="allclasses_navbar_bottom">
+                <li>All Classes</li>
+            </ul>
+            <a name="skip-navbar_bottom"><!--   --></a>
+        </div>
+        ## Navigation Bar -------- END --------
+
+        <div id="footer">
+            ${bottom}
+        </div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/maven-jxr/src/main/resources/templates/jdk7/package-frame.vm 
b/maven-jxr/src/main/resources/templates/jdk7/package-frame.vm
new file mode 100644
index 0000000..9e5b9d7
--- /dev/null
+++ b/maven-jxr/src/main/resources/templates/jdk7/package-frame.vm
@@ -0,0 +1,42 @@
+#*
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+
+*#
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html xml:lang="en" lang="en">
+    <!-- generated by Apache Maven JXR (jdk7) -->
+    <head>
+        <meta http-equiv="content-type" content="text/html; 
charset=$outputEncoding" />
+        <title>$windowTitle Package $pkgInfo.name</title>
+        <link rel="stylesheet" type="text/css" 
href="${pkgInfo.rootRef}stylesheet.css" title="style" />
+    </head>
+    <body>
+        <h1 class="bar"><a href="package-summary.html" 
target="classFrame">$pkgInfo.name</a></h1>
+        <div class="indexContainer">
+            <h2 title="Classes">Classes</h2>
+            <ul title="Classes">
+               #foreach ($classInfo in $pkgInfo.classes.values())
+               <li>
+                       <a href="${classInfo.filename}.html#${classInfo.name}" 
target="classFrame">$classInfo.name</a>
+               </li>
+               #end
+            </ul>
+        </div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/maven-jxr/src/main/resources/templates/jdk7/package-summary.vm 
b/maven-jxr/src/main/resources/templates/jdk7/package-summary.vm
new file mode 100644
index 0000000..ba0ce45
--- /dev/null
+++ b/maven-jxr/src/main/resources/templates/jdk7/package-summary.vm
@@ -0,0 +1,140 @@
+#*
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+
+*#
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html xml:lang="en" lang="en">
+    <!-- generated by Apache Maven JXR (jdk7) -->
+    <head>
+        <meta http-equiv="content-type" content="text/html; 
charset=$outputEncoding" />
+        <title>$windowTitle Package $pkgInfo.name</title>
+        <link rel="stylesheet" type="text/css" 
href="${pkgInfo.rootRef}stylesheet.css" title="style" />
+    </head>
+
+    <body>
+        ## Navigation Bar -------- START --------
+        <div class="topNav">
+            <a name="navbar_top"><!--   --></a>
+            <a href="#skip-navbar_top" title="Skip navigation links"></a>
+            <a name="navbar_top_firstrow"><!--   --></a>
+            <ul class="navList" title="Navigation">
+                <li><a 
href="${pkgInfo.rootRef}overview-summary.html">Overview</a></li>
+                <li class="navBarCell1Rev">Package</li>
+                <li>Class</li>
+                <li>Use</li>
+                <li>Tree</li>
+                <li>Deprecated</li>
+                <li>Index</li>
+                <li>Help</li>
+            </ul>
+            <div 
class="aboutLanguage"><em><strong>$docTitle</strong></em></div>
+        </div>
+        <div class="subNav">
+            <ul class="navList">
+                <li>Prev</li>
+                <li>Next</li>
+            </ul>
+            <ul class="navList">
+                <li><a 
href="${pkgInfo.rootRef}index.html?overview-summary.html" 
target="_top">Frames</a></li>
+                <li><a href="package-summary.html" target="_top">No 
Frames</a></li>
+            </ul>
+            <ul class="navList" id="allclasses_navbar_top">
+                <li>All Classes</li>
+            </ul>
+            <div>
+            </div>
+            <a name="skip-navbar_top"><!--   --></a>
+        </div>
+        ## Navigation Bar -------- END --------
+
+        ## Package Summary -------- START --------
+        <div class="header">
+            <h1 title="Package" class="title">Package $pkgInfo.name</h1>
+        </div>
+        <div class="contentContainer">
+            <ul class="blockList">
+                <li class="blockList">
+                    <table class="packageSummary" border="0" cellpadding="3" 
cellspacing="0" summary="Class Summary table, listing classes, and an 
explanation">
+                        <caption><span>Class Summary</span><span 
class="tabEnd">&nbsp;</span></caption>
+                        <thead>
+                            <tr>
+                                <th class="colFirst colLast" 
scope="col">Class</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            #set ($rowclass = "rowColor")
+                                   #foreach ($classInfo in 
$pkgInfo.classes.values())
+                                #if ($rowclass == "rowColor")
+                                    #set ($rowclass = "altColor")
+                                #else
+                                    #set ($rowclass = "rowColor")
+                                #end
+                            <tr class="${rowclass}">
+                                <td class="colFirst colLast">
+                                    <a 
href="${classInfo.filename}.html#${classInfo.name}" target="classFrame" 
title="class in $pkgInfo.name">$classInfo.name</a>
+                                </td>
+                            </tr>
+                            #end
+                        </tbody>
+                    </table>
+                </li>
+            </ul>
+        </div>
+        ## Package Summary -------- END --------
+
+        ## Navigation Bar -------- START --------
+        <div class="bottomNav">
+            <a name="navbar_bottom"><!--   --></a>
+            <a href="#skip-navbar_bottom" title="Skip navigation links"></a>
+            <a name="navbar_bottom_firstrow"><!--   --></a>
+            <ul class="navList" title="Navigation">
+                <li><a 
href="${pkgInfo.rootRef}overview-summary.html">Overview</a></li>
+                <li class="navBarCell1Rev">Package</li>
+                <li>Class</li>
+                <li>Use</li>
+                <li>Tree</li>
+                <li>Deprecated</li>
+                <li>Index</li>
+                <li>Help</li>
+            </ul>
+            <div 
class="aboutLanguage"><em><strong>$docTitle</strong></em></div>
+        </div>
+        <div class="subNav">
+            <ul class="navList">
+                <li>Prev</li>
+                <li>Next</li>
+            </ul>
+            <ul class="navList">
+                <li><a 
href="${pkgInfo.rootRef}index.html?overview-summary.html" 
target="_top">Frames</a></li>
+                <li><a href="package-summary.html" target="_top">No 
Frames</a></li>
+            </ul>
+            <ul class="navList" id="allclasses_navbar_bottom">
+                <li>All Classes</li>
+            </ul>
+            <div>
+            </div>
+            <a name="skip-navbar_bottom"><!--   --></a>
+        </div>
+        ## Navigation Bar -------- END --------
+
+        <div id="footer">
+            ${bottom}
+        </div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/maven-jxr/src/main/resources/templates/jdk8/allclasses-frame.vm 
b/maven-jxr/src/main/resources/templates/jdk8/allclasses-frame.vm
new file mode 100644
index 0000000..bea3497
--- /dev/null
+++ b/maven-jxr/src/main/resources/templates/jdk8/allclasses-frame.vm
@@ -0,0 +1,39 @@
+#*
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+
+*#
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html xml:lang="en" lang="en">
+    <!-- generated by Apache Maven JXR (jdk8) -->
+    <head>
+        <meta http-equiv="content-type" content="text/html; 
charset=$outputEncoding" />
+        <title>All Classes</title>
+        <link rel="stylesheet" type="text/css" href="stylesheet.css" 
title="style" />
+    </head>
+    <body>
+        <h1 class="bar">All Classes</h1>
+        <div class="indexContainer">
+            <ul>
+                #foreach ($classInfo in $info.allClasses.values())
+                <li><a 
href="${classInfo.dir}/${classInfo.filename}.html#${classInfo.name}" 
target="classFrame">$classInfo.name</a></li>
+                #end
+            </ul>
+        </div>
+    </body>
+</html>
diff --git a/maven-jxr/src/main/resources/templates/jdk8/index.vm 
b/maven-jxr/src/main/resources/templates/jdk8/index.vm
new file mode 100644
index 0000000..4b2fb84
--- /dev/null
+++ b/maven-jxr/src/main/resources/templates/jdk8/index.vm
@@ -0,0 +1,94 @@
+#*
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+
+*#
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd";>
+<html xml:lang="en" lang="en">
+    <!-- this is a JXR report set (jdk8) -->
+    <head>
+        <meta http-equiv="content-type" content="text/html; 
charset=$outputEncoding" />
+        <title>$windowTitle</title>
+        <script type="text/javascript">
+            tmpTargetPage = "" + window.location.search;
+            if (tmpTargetPage != "" && tmpTargetPage != "undefined")
+                tmpTargetPage = tmpTargetPage.substring(1);
+            if (tmpTargetPage.indexOf(":") != -1 || (tmpTargetPage != "" && 
!validURL(tmpTargetPage)))
+                tmpTargetPage = "undefined";
+            targetPage = tmpTargetPage;
+            function validURL(url) {
+                try {
+                    url = decodeURIComponent(url);
+                }
+                catch (error) {
+                    return false;
+                }
+                var pos = url.indexOf(".html");
+                if (pos == -1 || pos != url.length - 5)
+                    return false;
+                var allowNumber = false;
+                var allowSep = false;
+                var seenDot = false;
+                for (var i = 0; i < url.length - 5; i++) {
+                    var ch = url.charAt(i);
+                    if ('a' <= ch && ch <= 'z' ||
+                            'A' <= ch && ch <= 'Z' ||
+                            ch == '$' ||
+                            ch == '_' ||
+                            ch.charCodeAt(0) > 127) {
+                        allowNumber = true;
+                        allowSep = true;
+                    } else if ('0' <= ch && ch <= '9'
+                            || ch == '-') {
+                        if (!allowNumber)
+                            return false;
+                    } else if (ch == '/' || ch == '.') {
+                        if (!allowSep)
+                            return false;
+                        allowNumber = false;
+                        allowSep = false;
+                        if (ch == '.')
+                            seenDot = true;
+                        if (ch == '/' && seenDot)
+                            return false;
+                    } else {
+                        return false;
+                    }
+                }
+                return true;
+            }
+            function loadFrames() {
+                if (targetPage != "" && targetPage != "undefined")
+                    top.classFrame.location = top.targetPage;
+            }
+        </script>
+    </head>
+    <frameset cols="20%,80%" title="Documentation frame" 
onload="top.loadFrames()">
+        <frameset rows="30%,70%" title="Left frames" onload="top.loadFrames()">
+            <frame src="overview-frame.html" name="packageListFrame" 
title="All Packages"/>
+            <frame src="allclasses-frame.html" name="packageFrame" title="All 
classes and interfaces (except non-static nested types)"/>
+        </frameset>
+        <frame src="overview-summary.html" name="classFrame" title="Package, 
class and interface descriptions" scrolling="yes"/>
+        <noframes>
+            <h1>Frame Alert</h1>
+            <p>
+                You don't have frames. Go <a 
href="overview-summary.html">here</a>
+            </p>
+        </noframes>
+    </frameset>
+</html>
diff --git a/maven-jxr/src/main/resources/templates/jdk8/overview-frame.vm 
b/maven-jxr/src/main/resources/templates/jdk8/overview-frame.vm
new file mode 100644
index 0000000..78410a0
--- /dev/null
+++ b/maven-jxr/src/main/resources/templates/jdk8/overview-frame.vm
@@ -0,0 +1,45 @@
+#*
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+
+*#
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html xml:lang="en" lang="en">
+    <!-- generated by Apache Maven JXR (jdk8) -->
+    <head>
+        <meta http-equiv="content-type" content="text/html; 
charset=$outputEncoding" />
+        <title>$windowTitle</title>
+        <link rel="stylesheet" type="text/css" href="stylesheet.css" 
title="style" />
+    </head>
+    <body>
+        <h1 title="$docTitle" class="bar"><strong>$docTitle</strong></h1>
+        <div class="indexHeader"><span><a href="allclasses-frame.html" 
target="packageFrame">All&nbsp;Classes</a></span></div>
+        <div class="indexContainer">
+            <h2 title="Packages">Packages</h2>
+            <ul title="Packages">
+                #foreach ($pkgInfo in $info.allPackages.values())
+                <li>
+                    <a href="${pkgInfo.dir}/package-frame.html" 
target="packageFrame">$pkgInfo.name</a>
+                </li>
+                #end
+            </ul>
+        </div>
+        <p>&nbsp;</p>
+    </body>
+</html>
+
diff --git a/maven-jxr/src/main/resources/templates/jdk8/overview-summary.vm 
b/maven-jxr/src/main/resources/templates/jdk8/overview-summary.vm
new file mode 100644
index 0000000..8c9cf1d
--- /dev/null
+++ b/maven-jxr/src/main/resources/templates/jdk8/overview-summary.vm
@@ -0,0 +1,125 @@
+#*
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+
+*#
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html xml:lang="en" lang="en">
+    <!-- generated by Apache Maven JXR (jdk7) -->
+    <head>
+        <meta http-equiv="content-type" content="text/html; 
charset=$outputEncoding" />
+        <title>$windowTitle</title>
+        <link rel="stylesheet" type="text/css" href="stylesheet.css" 
title="style" />
+    </head>
+    <body>
+        ## Navigation Bar -------- START --------
+        <div class="topNav">
+            <a name="navbar_top"><!--   --></a>
+            <a href="#skip-navbar_top" title="Skip navigation links"></a>
+            <a name="navbar_top_firstrow"><!--   --></a>
+            <ul class="navList" title="Navigation">
+                <li class="navBarCell1Rev">Overview</li>
+                <li>Package</li>
+                <li>Class</li>
+                <li>Use</li>
+                <li>Tree</li>
+                <li>Deprecated</li>
+                <li>Index</li>
+                <li>Help</li>
+            </ul>
+            <div 
class="aboutLanguage"><em><strong>$docTitle</strong></em></div>
+        </div>
+        <div class="subNav">
+            <ul class="navList">
+                <li>Prev</li>
+                <li>Next</li>
+            </ul>
+            <ul class="navList">
+                <li><a href="index.html?overview-summary.html" 
target="_top">Frames</a></li>
+                <li><a href="overview-summary.html" target="_top">No 
Frames</a></li>
+            </ul>
+            <a name="skip-navbar_top"><!--   --></a>
+        </div>
+        ## Navigation Bar -------- END --------
+
+        ## Overview Summary -------- START --------
+        <div class="header">
+            <h1 class="title">$docTitle</h1>
+        </div>
+        <div class="contentContainer">
+            <table class="overviewSummary" border="0" cellpadding="3" 
cellspacing="0" summary="Packages table, listing packages">
+                <caption><span>Packages</span><span 
class="tabEnd">&nbsp;</span></caption>
+                <thead>
+                    <tr>
+                        <th class="colFirst colLast" scope="col">Package</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    #set ($rowclass = "rowColor")
+                    #foreach ($pkgInfo in $info.allPackages.values())
+                        #if ($rowclass == "rowColor")
+                            #set ($rowclass = "altColor")
+                        #else
+                            #set ($rowclass = "rowColor")
+                        #end
+                    <tr class="${rowclass}">
+                        <td class="colFirst colLast">
+                            <a 
href="${pkgInfo.dir}/package-summary.html">$pkgInfo.name</a>
+                        </td>
+                    </tr>
+                    #end
+                </tbody>
+            </table>
+        </div>
+        ## Overview Summary -------- END --------
+
+        ## Navigation Bar -------- START --------
+        <div class="bottomNav">
+            <a name="navbar_bottom"><!--   --></a>
+            <a href="#skip-navbar_bottom" title="Skip navigation links"></a>
+            <a name="navbar_bottom_firstrow"><!--   --></a>
+            <ul class="navList" title="Navigation">
+                <li class="navBarCell1Rev">Overview</li>
+                <li>Package</li>
+                <li>Class</li>
+                <li>Use</li>
+                <li>Tree</li>
+                <li>Deprecated</li>
+                <li>Index</li>
+                <li>Help</li>
+            </ul>
+            <div 
class="aboutLanguage"><em><strong>$docTitle</strong></em></div>
+        </div>
+        <div class="subNav">
+            <ul class="navList">
+                <li>Prev</li>
+                <li>Next</li>
+            </ul>
+            <ul class="navList">
+                <li><a href="index.html?overview-summary.html" 
target="_top">Frames</a></li>
+                <li><a href="overview-summary.html" target="_top">No 
Frames</a></li>
+            </ul>
+            <a name="skip-navbar_bottom"><!--   --></a>
+        </div>
+        ## Navigation Bar -------- END --------
+
+        <div id="footer">
+            ${bottom}
+        </div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/maven-jxr/src/main/resources/templates/jdk8/package-frame.vm 
b/maven-jxr/src/main/resources/templates/jdk8/package-frame.vm
new file mode 100644
index 0000000..c2a1ef3
--- /dev/null
+++ b/maven-jxr/src/main/resources/templates/jdk8/package-frame.vm
@@ -0,0 +1,42 @@
+#*
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+
+*#
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html xml:lang="en" lang="en">
+    <!-- generated by Apache Maven JXR (jdk8) -->
+    <head>
+        <meta http-equiv="content-type" content="text/html; 
charset=$outputEncoding" />
+        <title>$windowTitle Package $pkgInfo.name</title>
+        <link rel="stylesheet" type="text/css" 
href="${pkgInfo.rootRef}stylesheet.css" title="style" />
+    </head>
+    <body>
+        <h1 class="bar"><a href="package-summary.html" 
target="classFrame">$pkgInfo.name</a></h1>
+        <div class="indexContainer">
+            <h2 title="Classes">Classes</h2>
+            <ul title="Classes">
+                #foreach ($classInfo in $pkgInfo.classes.values())
+                <li>
+                    <a href="${classInfo.filename}.html#${classInfo.name}" 
target="classFrame">$classInfo.name</a>
+                </li>
+                #end
+            </ul>
+        </div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/maven-jxr/src/main/resources/templates/jdk8/package-summary.vm 
b/maven-jxr/src/main/resources/templates/jdk8/package-summary.vm
new file mode 100644
index 0000000..b8a3344
--- /dev/null
+++ b/maven-jxr/src/main/resources/templates/jdk8/package-summary.vm
@@ -0,0 +1,140 @@
+#*
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+
+*#
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html xml:lang="en" lang="en">
+    <!-- generated by Apache Maven JXR (jdk8) -->
+    <head>
+        <meta http-equiv="content-type" content="text/html; 
charset=$outputEncoding" />
+        <title>$windowTitle Package $pkgInfo.name</title>
+        <link rel="stylesheet" type="text/css" 
href="${pkgInfo.rootRef}stylesheet.css" title="style" />
+    </head>
+
+    <body>
+        ## Navigation Bar -------- START --------
+        <div class="topNav">
+            <a name="navbar_top"><!--   --></a>
+            <a href="#skip-navbar_top" title="Skip navigation links"></a>
+            <a name="navbar_top_firstrow"><!--   --></a>
+            <ul class="navList" title="Navigation">
+                <li><a 
href="${pkgInfo.rootRef}overview-summary.html">Overview</a></li>
+                <li class="navBarCell1Rev">Package</li>
+                <li>Class</li>
+                <li>Use</li>
+                <li>Tree</li>
+                <li>Deprecated</li>
+                <li>Index</li>
+                <li>Help</li>
+            </ul>
+            <div 
class="aboutLanguage"><em><strong>$docTitle</strong></em></div>
+        </div>
+        <div class="subNav">
+            <ul class="navList">
+                <li>Prev</li>
+                <li>Next</li>
+            </ul>
+            <ul class="navList">
+                <li><a 
href="${pkgInfo.rootRef}index.html?overview-summary.html" 
target="_top">Frames</a></li>
+                <li><a href="package-summary.html" target="_top">No 
Frames</a></li>
+            </ul>
+            <ul class="navList" id="allclasses_navbar_top">
+                <li>All Classes</li>
+            </ul>
+            <div>
+            </div>
+            <a name="skip-navbar_top"><!--   --></a>
+        </div>
+        ## Navigation Bar -------- END --------
+
+        ## Package Summary -------- START --------
+        <div class="header">
+            <h1 title="Package" class="title">Package $pkgInfo.name</h1>
+        </div>
+        <div class="contentContainer">
+            <ul class="blockList">
+                <li class="blockList">
+                    <table class="typeSummary" border="0" cellpadding="3" 
cellspacing="0" summary="Class Summary table, listing classes, and an 
explanation">
+                        <caption><span>Class Summary</span><span 
class="tabEnd">&nbsp;</span></caption>
+                        <thead>
+                            <tr>
+                                <th class="colFirst colLast" 
scope="col">Class</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            #set ($rowclass = "rowColor")
+                                   #foreach ($classInfo in 
$pkgInfo.classes.values())
+                                #if ($rowclass == "rowColor")
+                                    #set ($rowclass = "altColor")
+                                #else
+                                    #set ($rowclass = "rowColor")
+                                #end
+                            <tr class="${rowclass}">
+                                <td class="colFirst colLast">
+                                    <a 
href="${classInfo.filename}.html#${classInfo.name}" target="classFrame" 
title="class in $pkgInfo.name">$classInfo.name</a>
+                                </td>
+                            </tr>
+                            #end
+                        </tbody>
+                    </table>
+                </li>
+            </ul>
+        </div>
+        ## Package Summary -------- END --------
+
+        ## Navigation Bar -------- START --------
+        <div class="bottomNav">
+            <a name="navbar_bottom"><!--   --></a>
+            <a href="#skip-navbar_bottom" title="Skip navigation links"></a>
+            <a name="navbar_bottom_firstrow"><!--   --></a>
+            <ul class="navList" title="Navigation">
+                <li><a 
href="${pkgInfo.rootRef}overview-summary.html">Overview</a></li>
+                <li class="navBarCell1Rev">Package</li>
+                <li>Class</li>
+                <li>Use</li>
+                <li>Tree</li>
+                <li>Deprecated</li>
+                <li>Index</li>
+                <li>Help</li>
+            </ul>
+            <div 
class="aboutLanguage"><em><strong>$docTitle</strong></em></div>
+        </div>
+        <div class="subNav">
+            <ul class="navList">
+                <li>Prev</li>
+                <li>Next</li>
+            </ul>
+            <ul class="navList">
+                <li><a 
href="${pkgInfo.rootRef}index.html?overview-summary.html" 
target="_top">Frames</a></li>
+                <li><a href="package-summary.html" target="_top">No 
Frames</a></li>
+            </ul>
+            <ul class="navList" id="allclasses_navbar_bottom">
+                <li>All Classes</li>
+            </ul>
+            <div>
+            </div>
+            <a name="skip-navbar_bottom"><!--   --></a>
+        </div>
+        ## Navigation Bar -------- END --------
+
+        <div id="footer">
+            ${bottom}
+        </div>
+    </body>
+</html>
\ No newline at end of file
diff --git 
a/maven-jxr/src/test/java/org/apache/maven/jxr/IncludeExcludeTest.java 
b/maven-jxr/src/test/java/org/apache/maven/jxr/IncludeExcludeTest.java
index 992cb8e..5a80669 100644
--- a/maven-jxr/src/test/java/org/apache/maven/jxr/IncludeExcludeTest.java
+++ b/maven-jxr/src/test/java/org/apache/maven/jxr/IncludeExcludeTest.java
@@ -59,7 +59,7 @@ public class IncludeExcludeTest
         jxr.setExcludes( excludes );
         String[] includes = {"**/exclude/*.java", 
"**/include/IncludedClass.java"};
         jxr.setIncludes( includes );
-        jxr.xref( Collections.singletonList( "src/test/resources" ), 
"templates",
+        jxr.xref( Collections.singletonList( "src/test/resources" ), 
"templates/jdk4",
                   "title", "title", "copyright" );
         Path excludedFile = Paths.get( "target/exclude/ExcludedClass.html" );
         assertFalse( Files.exists( excludedFile ) );
diff --git a/maven-jxr/src/test/java/org/apache/maven/jxr/JxrBeanTest.java 
b/maven-jxr/src/test/java/org/apache/maven/jxr/JxrBeanTest.java
index 02a7bc2..fcac23b 100644
--- a/maven-jxr/src/test/java/org/apache/maven/jxr/JxrBeanTest.java
+++ b/maven-jxr/src/test/java/org/apache/maven/jxr/JxrBeanTest.java
@@ -45,7 +45,7 @@ public class JxrBeanTest
     public void testXref()
         throws Exception
     {
-        jxrBean.xref( Collections.singletonList( "src/test/java" ), 
"templates",
+        jxrBean.xref( Collections.singletonList( "src/test/java" ), 
"templates/jdk4",
                       "title", "title", "copyright" );
     }
 
diff --git a/pom.xml b/pom.xml
index 036fca1..5f6f41f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,6 +93,11 @@ under the License.
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-java</artifactId>
+        <version>0.9.8</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-utils</artifactId>
         <version>3.1.0</version>
       </dependency>
@@ -110,6 +115,33 @@ under the License.
         </plugin>
       </plugins>
     </pluginManagement>
+    <plugins>
+    <plugin>
+      <groupId>org.apache.maven.plugins</groupId>
+      <artifactId>maven-enforcer-plugin</artifactId>
+      <executions>
+        <execution>
+          <id>enforce-bytecode-version</id>
+          <configuration>
+            <rules>
+              <enforceBytecodeVersion>
+                <ignoreClasses>
+                  <ignoreClass>module-info</ignoreClass>
+                </ignoreClasses>
+              </enforceBytecodeVersion>
+            </rules>
+          </configuration>
+        </execution>
+      </executions>
+      <dependencies>
+        <dependency>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>extra-enforcer-rules</artifactId>
+          <version>1.0-beta-6</version>
+        </dependency>
+      </dependencies>
+    </plugin>
+    </plugins>
   </build>
 
   <profiles>

Reply via email to