You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/11/20 18:17:27 UTC

[maven-doxia-sitetools] 01/01: [DOXIASITETOOLS-270] Remove internal (pseudo) skin and use Maven Fluido Skin by default

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

michaelo pushed a commit to branch remove-default-skin
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git

commit a05262b17ba6f725c4c184149d7411215b4d5690
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Jun 18 22:50:43 2022 +0200

    [DOXIASITETOOLS-270] Remove internal (pseudo) skin and use Maven Fluido Skin by default
    
    This closes #39
---
 .../apache/maven/doxia/tools/DefaultSiteTool.java  |   8 -
 .../org/apache/maven/doxia/tools/SiteTool.java     |  13 -
 .../src/main/resources/default-site.xml            |   4 +-
 .../org/apache/maven/doxia/tools/SiteToolTest.java |  13 -
 .../doxia/siterenderer/DefaultSiteRenderer.java    | 133 ++----
 .../doxia/siterenderer/SiteRenderingContext.java   |  30 +-
 .../siterenderer/resources/css/maven-base.css      | 168 -------
 .../doxia/siterenderer/resources/css/print.css     |  26 --
 .../siterenderer/resources/default-site-macros.vm  | 494 ---------------------
 .../doxia/siterenderer/resources/default-site.vm   | 102 -----
 .../siterenderer/resources/images/collapsed.gif    | Bin 53 -> 0 bytes
 .../siterenderer/resources/images/expanded.gif     | Bin 52 -> 0 bytes
 .../images/logos/build-by-maven-black.png          | Bin 2294 -> 0 bytes
 .../images/logos/build-by-maven-white.png          | Bin 2260 -> 0 bytes
 .../resources/images/logos/maven-feather.png       | Bin 3330 -> 0 bytes
 .../doxia/siterenderer/resources/resources.txt     |  24 -
 16 files changed, 31 insertions(+), 984 deletions(-)

diff --git a/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java b/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
index 2a08839..ca364f5 100644
--- a/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
+++ b/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
@@ -169,14 +169,6 @@ public class DefaultSiteTool
         return artifact;
     }
 
-    public Artifact getDefaultSkinArtifact( ArtifactRepository localRepository,
-                                            List<ArtifactRepository> remoteArtifactRepositories )
-        throws SiteToolException
-    {
-        DecorationModel decorationModel = getDefaultDecorationModel();
-        return getSkinArtifactFromRepository( localRepository, remoteArtifactRepositories, decorationModel );
-    }
-
     /**
      * This method is not implemented according to the URI specification and has many weird
      * corner cases where it doesn't do the right thing. Please consider using a better
diff --git a/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java b/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java
index 9424c90..b5454ce 100644
--- a/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java
+++ b/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java
@@ -59,19 +59,6 @@ public interface SiteTool
                                             DecorationModel decoration )
         throws SiteToolException;
 
-    /**
-     * Get the default skin artifact for a project from one of the repositories.
-     *
-     * @param localRepository the Maven local repository, not null.
-     * @param remoteArtifactRepositories the Maven remote repositories, not null.
-     * @return the default <code>Skin</code> artifact from a given project and a local repository
-     * @throws SiteToolException if any
-     * @see #getSkinArtifactFromRepository(ArtifactRepository, List, DecorationModel)
-     */
-    Artifact getDefaultSkinArtifact( ArtifactRepository localRepository,
-                                     List<ArtifactRepository> remoteArtifactRepositories )
-        throws SiteToolException;
-
     /**
      * Get a site descriptor from the project's site directory.
      *
diff --git a/doxia-integration-tools/src/main/resources/default-site.xml b/doxia-integration-tools/src/main/resources/default-site.xml
index c04d78e..7bbb718 100644
--- a/doxia-integration-tools/src/main/resources/default-site.xml
+++ b/doxia-integration-tools/src/main/resources/default-site.xml
@@ -24,8 +24,8 @@ under the License.
   </bannerLeft>
   <skin>
     <groupId>org.apache.maven.skins</groupId>
-    <artifactId>maven-default-skin</artifactId>
-    <version>1.3</version>
+    <artifactId>maven-fluido-skin</artifactId>
+    <version>1.11.1</version>
   </skin>
   <body>
     <links>
diff --git a/doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java b/doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java
index ce40b8e..071ba27 100644
--- a/doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java
+++ b/doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java
@@ -107,19 +107,6 @@ public class SiteToolTest
         return new File( getLocalRepo().getBasedir() );
     }
 
-    /**
-     * @throws Exception
-     */
-    @Test
-    public void testGetDefaultSkinArtifact()
-        throws Exception
-    {
-        assertNotNull( tool );
-
-        SiteToolMavenProjectStub project = new SiteToolMavenProjectStub( "site-tool-test" );
-        assertNotNull( tool.getDefaultSkinArtifact( getLocalRepo(), project.getRemoteArtifactRepositories() ) );
-    }
-
     /**
      * @throws Exception
      */
diff --git a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
index 96b8211..6755c94 100644
--- a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
+++ b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
@@ -29,8 +29,6 @@ import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.LineNumberReader;
-import java.io.OutputStream;
 import java.io.Reader;
 import java.io.StringReader;
 import java.io.StringWriter;
@@ -143,10 +141,6 @@ public class DefaultSiteRenderer
     @Inject
     private PlexusContainer plexus;
 
-    private static final String RESOURCE_DIR = "org/apache/maven/doxia/siterenderer/resources";
-
-    private static final String DEFAULT_TEMPLATE = RESOURCE_DIR + "/default-site.vm";
-
     private static final String SKIN_TEMPLATE_LOCATION = "META-INF/maven/site.vm";
 
     private static final String TOOLS_LOCATION = "META-INF/maven/site-tools.xml";
@@ -690,14 +684,12 @@ public class DefaultSiteRenderer
             catch ( ParseErrorException pee )
             {
                 throw new RendererException( "Velocity parsing error while reading the site decoration template "
-                    + ( ( skin == null ) ? ( "'" + templateName + "'" ) : ( "from " + skin.getId() + " skin" ) ),
-                                             pee );
+                    + "from " + skin.getId() + " skin", pee );
             }
             catch ( ResourceNotFoundException rnfe )
             {
                 throw new RendererException( "Could not find the site decoration template "
-                    + ( ( skin == null ) ? ( "'" + templateName + "'" ) : ( "from " + skin.getId() + " skin" ) ),
-                                             rnfe );
+                    + "from " + skin.getId() + " skin", rnfe );
             }
 
             try
@@ -754,17 +746,12 @@ public class DefaultSiteRenderer
 
         try
         {
-            if ( zipFile.getEntry( SKIN_TEMPLATE_LOCATION ) != null )
+            if ( zipFile.getEntry( SKIN_TEMPLATE_LOCATION ) == null )
             {
-                context.setTemplateName( SKIN_TEMPLATE_LOCATION );
-                context.setTemplateClassLoader( new URLClassLoader( new URL[]{skin.getFile().toURI().toURL()} ) );
-            }
-            else
-            {
-                context.setTemplateName( DEFAULT_TEMPLATE );
-                context.setTemplateClassLoader( getClass().getClassLoader() );
-                context.setUsingDefaultTemplate( true );
+                throw new RendererException( "Skin does not contain template at " + SKIN_TEMPLATE_LOCATION );
             }
+            context.setTemplateName( SKIN_TEMPLATE_LOCATION );
+            context.setTemplateClassLoader( new URLClassLoader( new URL[]{skin.getFile().toURI().toURL()} ) );
 
             ZipEntry skinDescriptorEntry = zipFile.getEntry( SkinModel.SKIN_DESCRIPTOR_LOCATION );
             if ( skinDescriptorEntry != null )
@@ -858,111 +845,41 @@ public class DefaultSiteRenderer
     public void copyResources( SiteRenderingContext siteRenderingContext, File outputDirectory )
         throws IOException
     {
-        if ( siteRenderingContext.getSkin() != null )
-        {
-            ZipFile file = getZipFile( siteRenderingContext.getSkin().getFile() );
-
-            try
-            {
-                for ( Enumeration<? extends ZipEntry> e = file.entries(); e.hasMoreElements(); )
-                {
-                    ZipEntry entry = e.nextElement();
-
-                    if ( !entry.getName().startsWith( "META-INF/" ) )
-                    {
-                        File destFile = new File( outputDirectory, entry.getName() );
-                        if ( !entry.isDirectory() )
-                        {
-                            if ( destFile.exists() )
-                            {
-                                // don't override existing content: avoids extra rewrite with same content or extra site
-                                // resource
-                                continue;
-                            }
-
-                            destFile.getParentFile().mkdirs();
+        ZipFile file = getZipFile( siteRenderingContext.getSkin().getFile() );
 
-                            copyFileFromZip( file, entry, destFile );
-                        }
-                        else
-                        {
-                            destFile.mkdirs();
-                        }
-                    }
-                }
-            }
-            finally
-            {
-                closeZipFile( file );
-            }
-        }
-
-        if ( siteRenderingContext.isUsingDefaultTemplate() )
+        try
         {
-            InputStream resourceList = getClass().getClassLoader()
-                    .getResourceAsStream( RESOURCE_DIR + "/resources.txt" );
-
-            if ( resourceList != null )
+            for ( Enumeration<? extends ZipEntry> e = file.entries(); e.hasMoreElements(); )
             {
-                Reader r = null;
-                LineNumberReader reader = null;
-                try
-                {
-                    r = ReaderFactory.newReader( resourceList, ReaderFactory.UTF_8 );
-                    reader = new LineNumberReader( r );
-
-                    String line;
+                ZipEntry entry = e.nextElement();
 
-                    while ( ( line = reader.readLine() ) != null )
+                if ( !entry.getName().startsWith( "META-INF/" ) )
+                {
+                    File destFile = new File( outputDirectory, entry.getName() );
+                    if ( !entry.isDirectory() )
                     {
-                        if ( line.startsWith( "#" ) || line.trim().length() == 0 )
-                        {
-                            continue;
-                        }
-
-                        InputStream is = getClass().getClassLoader().getResourceAsStream( RESOURCE_DIR + "/" + line );
-
-                        if ( is == null )
-                        {
-                            throw new IOException( "The resource " + line + " doesn't exist." );
-                        }
-
-                        File outputFile = new File( outputDirectory, line );
-
-                        if ( outputFile.exists() )
+                        if ( destFile.exists() )
                         {
                             // don't override existing content: avoids extra rewrite with same content or extra site
                             // resource
                             continue;
                         }
 
-                        if ( !outputFile.getParentFile().exists() )
-                        {
-                            outputFile.getParentFile().mkdirs();
-                        }
+                        destFile.getParentFile().mkdirs();
 
-                        OutputStream os = null;
-                        try
-                        {
-                            // for the images
-                            os = new FileOutputStream( outputFile );
-                            IOUtil.copy( is, os );
-                        }
-                        finally
-                        {
-                            IOUtil.close( os );
-                        }
-
-                        IOUtil.close( is );
+                        copyFileFromZip( file, entry, destFile );
+                    }
+                    else
+                    {
+                        destFile.mkdirs();
                     }
-                }
-                finally
-                {
-                    IOUtil.close( reader );
-                    IOUtil.close( r );
                 }
             }
         }
+        finally
+        {
+            closeZipFile( file );
+        }
 
         // Copy extra site resources
         for ( File siteDirectory : siteRenderingContext.getSiteDirectories() )
diff --git a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java
index 8a6079d..434f971 100644
--- a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java
+++ b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java
@@ -62,8 +62,6 @@ public class SiteRenderingContext
 
     private SkinModel skinModel;
 
-    private boolean usingDefaultTemplate;
-
     private File rootDirectory;
 
     private List<File> siteDirectories = new ArrayList<File>();
@@ -282,26 +280,6 @@ public class SiteRenderingContext
         this.templateName = templateName;
     }
 
-    /**
-     * <p>Setter for the field <code>usingDefaultTemplate</code>.</p>
-     *
-     * @param usingDefaultTemplate a boolean.
-     */
-    public void setUsingDefaultTemplate( boolean usingDefaultTemplate )
-    {
-        this.usingDefaultTemplate = usingDefaultTemplate;
-    }
-
-    /**
-     * <p>isUsingDefaultTemplate.</p>
-     *
-     * @return a boolean.
-     */
-    public boolean isUsingDefaultTemplate()
-    {
-        return usingDefaultTemplate;
-    }
-
     /**
      * Add a site directory, expected to have a Doxia Site layout, ie one directory per Doxia parser module containing
      * files with parser extension. Typical values are <code>src/site</code> or <code>target/generated-site</code>.
@@ -407,7 +385,7 @@ public class SiteRenderingContext
 
     /**
      * <p>If you want to specify a specific publish date instead of the current date.</p>
-     * 
+     *
      * @return the publish date, can be {@code null}
      */
     public Date getPublishDate()
@@ -417,7 +395,7 @@ public class SiteRenderingContext
 
     /**
      * <p>Specify a specific publish date instead of the current date.</p>
-     * 
+     *
      * @param publishDate the publish date
      */
     public void setPublishDate( Date publishDate )
@@ -427,7 +405,7 @@ public class SiteRenderingContext
 
     /**
      * Directory where to save content after Velocity processing (<code>*.vm</code>), but before parsing it with Doxia.
-     * 
+     *
      * @return not null if the documents are to be saved
      * @since 1.7
      */
@@ -439,7 +417,7 @@ public class SiteRenderingContext
     /**
      * Where to (eventually) save content after Velocity processing (<code>*.vm</code>), but before parsing it with
      * Doxia?
-     * 
+     *
      * @param processedContentOutput not null if the documents are to be saved
      * @since 1.7
      */
diff --git a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/css/maven-base.css b/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/css/maven-base.css
deleted file mode 100644
index 45dc441..0000000
--- a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/css/maven-base.css
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * 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.
- */
-
-body {
-  margin: 0px;
-  padding: 0px;
-}
-table {
-  padding:0px;
-  width: 100%;
-  margin-left: -2px;
-  margin-right: -2px;
-}
-acronym {
-  cursor: help;
-  border-bottom: 1px dotted #feb;
-}
-table.bodyTable th, table.bodyTable td {
-  padding: 2px 4px 2px 4px;
-  vertical-align: top;
-}
-div.clear {
-  clear:both;
-  visibility: hidden;
-}
-div.clear hr {
-  display: none;
-}
-#bannerLeft, #bannerRight {
-  font-size: xx-large;
-  font-weight: bold;
-}
-#bannerLeft img, #bannerRight img {
-  margin: 0px;
-}
-.xleft, #bannerLeft img {
-  float:left;
-}
-.xright, #bannerRight {
-  float:right;
-}
-#banner {
-  padding: 0px;
-}
-#breadcrumbs {
-  padding: 3px 10px 3px 10px;
-}
-#leftColumn {
- width: 170px;
- float:left;
- overflow: auto;
-}
-#bodyColumn {
-  margin-right: 1.5em;
-  margin-left: 197px;
-}
-#legend {
-  padding: 8px 0 8px 0;
-}
-#navcolumn {
-  padding: 8px 4px 0 8px;
-}
-#navcolumn h5 {
-  margin: 0;
-  padding: 0;
-  font-size: small;
-}
-#navcolumn ul {
-  margin: 0;
-  padding: 0;
-  font-size: small;
-}
-#navcolumn li {
-  list-style-type: none;
-  background-image: none;
-  background-repeat: no-repeat;
-  background-position: 0 0.4em;
-  padding-left: 16px;
-  list-style-position: outside;
-  line-height: 1.2em;
-  font-size: smaller;
-}
-#navcolumn li.expanded {
-  background-image: url(../images/expanded.gif);
-}
-#navcolumn li.collapsed {
-  background-image: url(../images/collapsed.gif);
-}
-#navcolumn li.none {
-  text-indent: -1em;
-  margin-left: 1em;
-}
-#poweredBy {
-  text-align: center;
-}
-#navcolumn img {
-  margin-top: 10px;
-  margin-bottom: 3px;
-}
-#poweredBy img {
-  display:block;
-  margin: 20px 0 20px 17px;
-}
-#search img {
-    margin: 0px;
-    display: block;
-}
-#search #q, #search #btnG {
-    border: 1px solid #999;
-    margin-bottom:10px;
-}
-#search form {
-    margin: 0px;
-}
-#lastPublished {
-  font-size: x-small;
-}
-.navSection {
-  margin-bottom: 2px;
-  padding: 8px;
-}
-.navSectionHead {
-  font-weight: bold;
-  font-size: x-small;
-}
-.section {
-  padding: 4px;
-}
-#footer {
-  padding: 3px 10px 3px 10px;
-  font-size: x-small;
-}
-#breadcrumbs {
-  font-size: x-small;
-  margin: 0pt;
-}
-.source {
-  padding: 12px;
-  margin: 1em 7px 1em 7px;
-}
-.source pre {
-  margin: 0px;
-  padding: 0px;
-}
-#navcolumn img.imageLink, .imageLink {
-  padding-left: 0px;
-  padding-bottom: 0px;
-  padding-top: 0px;
-  padding-right: 2px;
-  border: 0px;
-  margin: 0px;
-}
diff --git a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/css/print.css b/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/css/print.css
deleted file mode 100644
index 18fcbad..0000000
--- a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/css/print.css
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.
- */
-
-#banner, #footer, #leftcol, #breadcrumbs, .docs #toc, .docs .courtesylinks, #leftColumn, #navColumn {
-	display: none !important;
-}
-#bodyColumn, body.docs div.docs {
-	margin: 0 !important;
-	border: none !important
-}
diff --git a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site-macros.vm b/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site-macros.vm
deleted file mode 100644
index 9e879a1..0000000
--- a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site-macros.vm
+++ /dev/null
@@ -1,494 +0,0 @@
-## 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.
-##
-#macro ( link $href $name $target $img $position $alt $border $width $height $title )
-#**##set ( $linkTitle = ' title="' + $name + '"' )
-#**##if( $target )
-#*  *##set ( $linkTarget = ' target="' + $target + '"' )
-#**##else
-#*  *##set ( $linkTarget = "" )
-#**##end
-#**##if ( $decoration.isLink( $href ) )
-#*  *##set ( $linkClass = ' class="externalLink"' )
-#**##else
-#*  *##set ( $linkClass = "" )
-#**##end
-#**##if ( $img )
-#*  *##if ( $position == "left" )
-#*    *#<a href="$href"$linkClass$linkTarget$linkTitle>#image($img $alt $border $width $height $title)$name</a>##
-#*  *##else
-#*    *#<a href="$href"$linkClass$linkTarget$linkTitle>$name #image($img $alt $border $width $height $title)</a>##
-#*  *##end
-#**##else
-#*  *#<a href="$href"$linkClass$linkTarget$linkTitle>$name</a>##
-#**##end
-#end
-##
-#macro ( image $img $alt $border $width $height $title )
-#**##if( $img )
-#*  *##if ( !$decoration.isLink( $img ) )
-#*    *##set ( $imgSrc = $PathTool.calculateLink( $img, $relativePath ) )
-#*    *##set ( $imgSrc = $imgSrc.replaceAll( '\\', '/' ) )
-#*    *##set ( $imgSrc = ' src="' + $imgSrc + '"' )
-#*  *##else
-#*    *##set ( $imgSrc = ' src="' + $img + '"' )
-#*  *##end
-#*  *##if( $alt )
-#*    *##set ( $imgAlt = ' alt="' + $alt + '"' )
-#*  *##else
-#*    *##set ( $imgAlt = ' alt=""' )
-#*  *##end
-#*  *##if( $border )
-#*    *##set ( $imgBorder = ' border="' + $border + '"' )
-#*  *##else
-#*    *##set ( $imgBorder = "" )
-#*  *##end
-#*  *##if( $width )
-#*    *##set ( $imgWidth = ' width="' + $width + '"' )
-#*  *##else
-#*    *##set ( $imgWidth = "" )
-#*  *##end
-#*  *##if( $height )
-#*    *##set ( $imgHeight = ' height="' + $height + '"' )
-#*  *##else
-#*    *##set ( $imgHeight = "" )
-#*  *##end
-#*  *##if( $title )
-#*    *##set ( $imgTitle = ' title="' + $title + '"' )
-#*  *##else
-#*    *##set ( $imgTitle = "" )
-#*  *##end
-#*  *#<img class="imageLink"$imgSrc$imgAlt$imgBorder$imgWidth$imgHeight$imgTitle/>##
-#**##end
-#end
-##
-#macro ( banner $banner $id )
-#**##if ( $banner )
-#*  *##if( $banner.href )
-#*    *##set ( $hrf = $banner.href )
-#*    *##if ( !$decoration.isLink( $hrf ) )
-#*      *##set ( $hrf = $PathTool.calculateLink( $hrf, $relativePath ) )
-#*      *##set ( $hrf = $hrf.replaceAll( '\\', '/' ) )
-#*      *##if ( ( $hrf == '' ) )
-#*        *##set ( $hrf = './' )
-#*      *##end
-#*    *##end
-#*    *#<a href="$hrf" id="$id"#if( $banner.alt ) title="$banner.alt"#end>##
-#*  *##else
-#*    *#<div id="$id">##
-#*  *##end
-##
-#*  *##if( $banner.src )
-#*    *##set ( $src = $banner.src )
-#*      *##if ( !$decoration.isLink( $src ) )
-#*        *##set ( $src = $PathTool.calculateLink( $src, $relativePath ) )
-#*        *##set ( $src = $src.replaceAll( '\\', '/' ) )
-#*      *##end
-#*      *##if ( $banner.alt )
-#*        *##set ( $alt = ' alt="' + $banner.alt + '"' )
-#*      *##elseif ( $banner.name )
-#*        *##set ( $alt = ' alt="' + $banner.name + '"' )
-#*      *##else
-#*        *##set ( $alt = ' alt=""' )
-#*      *##end
-#*      *##if( $banner.border )
-#*        *##set ( $imgBorder = ' border="' + $banner.border + '"' )
-#*      *##else
-#*        *##set ( $imgBorder = "" )
-#*      *##end
-#*      *##if( $banner.width )
-#*        *##set ( $imgWidth = ' width="' + $banner.width + '"' )
-#*      *##else
-#*        *##set ( $imgWidth = "" )
-#*      *##end
-#*      *##if( $banner.height )
-#*        *##set ( $imgHeight = ' height="' + $banner.height + '"' )
-#*      *##else
-#*        *##set ( $imgHeight = "" )
-#*      *##end
-#*      *##if( $banner.title )
-#*        *##set ( $bannerTitle=' title="' + $banner.title + '"' )
-#*      *##else
-#*      *##set ( $bannerTitle="" )
-#*    *##end
-#*    *#<img src="$src" $alt$bannerTitle$imgBorder$imgWidth$imgHeight/>##
-#*  *##else
-#*    *#$banner.name
-#*  *##end
-##
-#*  *##if( $banner.href )
-#*    *#</a>##
-#*  *##else
-#*    *#</div>
-#*  *##end
-#**##end
-#end
-##
-#macro ( links $links )
-#**##set ( $counter = 0 )
-#**##foreach( $item in $links )
-#*  *##set ( $counter = $counter + 1 )
-#*  *##set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
-#*  *##set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
-#*  *##link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height $item.title )
-#*  *##if ( $links.size() > $counter )
-#*  *# |
-#*  *##end
-#**##end
-#end
-##
-#macro ( breadcrumbs $breadcrumbs )
-#**##foreach( $item in $breadcrumbs )
-#*  *##set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
-#*  *##set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
-#*  *##if ( ( $currentItemHref == '' ) )
-#*    *##set ( $currentItemHref = './' )
-#*  *##end
-##
-#*  *##link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height $item.title )
-#**# &gt;
-#**##end
-#**#$shortTitle
-#**##if( $decoration.edit && $docRenderingContext.editable )
-#*  *# <a href="$docRenderingContext.getDoxiaSourcePath( $decoration.edit )">[edit]</a>
-#**##end
-#end
-##
-#macro ( displayTree $display $item )
-#**##if ( $item && $item.items && $item.items.size() > 0 )
-#*  *##foreach( $subitem in $item.items )
-#*    *##set ( $subitemHref = $PathTool.calculateLink( $subitem.href, $relativePath ) )
-#*    *##set ( $subitemHref = $subitemHref.replaceAll( '\\', '/' ) )
-##
-#*    *##if ( $alignedFileName == $subitemHref )
-#*      *##set ( $display = true )
-#*    *##end
-##
-#*    *##displayTree( $display $subitem )
-#*  *##end
-#**##end
-#end
-##
-#macro ( menuItem $item $indent )
-#**##set ( $collapseClass = "none" )
-#**##set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
-#**##set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
-##
-#**##if ( $item && $item.items && $item.items.size() > 0 )
-#*  *##if ( $item.collapse == false )
-#*    *##set ( $collapseClass = "expanded" )
-#*  *##else
-#*    *### By default collapsed
-#*    *##set ( $collapseClass = "collapsed" )
-#*  *##end
-##
-#*  *##set ( $display = false )
-#*  *##displayTree( $display $item )
-##
-#*  *##if ( $alignedFileName == $currentItemHref || $display )
-#*    *##set ( $collapseClass = "expanded" )
-#*  *##end
-#**##end
-$indent     <li class="$collapseClass">##
-#**##if ( $item.img )
-#*  *##if ( $item.position == "left" )
-#*    *##if ( $alignedFileName == $currentItemHref )
-#*      *#<strong>#image($item.img $item.alt $item.border $item.width $item.height $item.title) $item.name</strong>
-#*    *##else
-#*      *##link($currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height $item.title)
-#*    *##end
-#*  *##else
-#*    *##if ( $alignedFileName == $currentItemHref )
-#*      *#<strong>$item.name #image($item.img $item.alt $item.border $item.width $item.height $item.title)</strong>
-#*    *##else
-#*      *##link($currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height $item.title)
-#*    *##end
-#*  *##end
-#**##else
-#*  *##if ( $alignedFileName == $currentItemHref )
-#*    *#<strong>$item.name</strong>##
-#*  *##else
-#*    *##link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height $item.title )
-#*  *##end
-#**##end
-#**##if ( $item && $item.items && $item.items.size() > 0 )
-#*  *##if ( $collapseClass == "expanded" )
-
-$indent      <ul>
-#*    *##foreach( $subitem in $item.items )
-#*      *##menuItem( $subitem "$indent  " )
-#*    *##end
-$indent      </ul>##
-#*  *##end
-#**##end
-#**#</li>
-#end
-##
-#macro ( mainMenu $menus )
-#**##foreach( $menu in $menus )
-#*  *##if ( $menu.name )
-#*    *##if ( $menu.img )
-#*      *##if( $menu.position )
-#*        *##set ( $position = $menu.position )
-#*      *##else
-#*        *##set ( $position = "left" )
-#*      *##end
-##
-#*      *##if ( !$decoration.isLink( $menu.img ) )
-#*        *##set ( $src = $PathTool.calculateLink( $menu.img, $relativePath ) )
-#*        *##set ( $src = $src.replaceAll( '\\', '/' ) )
-#*        *##set ( $src = ' src="' + $src + '"' )
-#*      *##else
-#*        *##set ( $src = ' src="' + $menu.img + '"' )
-#*      *##end
-##
-#*      *##if( $menu.alt )
-#*        *##set ( $alt = ' alt="' + $menu.alt + '"' )
-#*      *##else
-#*        *##set ( $alt = ' alt="' + $menu.name + '"' )
-#*      *##end
-##
-#*      *##if( $menu.border )
-#*        *##set ( $border = ' border="' + $menu.border + '"' )
-#*      *##else
-#*        *##set ( $border = ' border="0"' )
-#*      *##end
-##
-#*      *##if( $menu.width )
-#*        *##set ( $width = ' width="' + $menu.width + '"' )
-#*      *##else
-#*        *##set ( $width = "" )
-#*      *##end
-#*      *##if( $menu.height )
-#*        *##set ( $height = ' height="' + $menu.height + '"' )
-#*      *##else
-#*        *##set ( $height = "" )
-#*      *##end
-#*      *##if( $menu.title )
-#*        *##set ( $title = ' title="' + $menu.title + '"' )
-#*      *##else
-#*        *##set ( $title = "" )
-#*      *##end
-##
-#*      *##set ( $img = '<img class="imageLink"' + $src + $alt + $border + $width + $height + $title + "/>" )
-##
-#*      *##if ( $position == "left" )
-        <h5>$img $menu.name</h5>
-#*      *##else
-        <h5>$menu.name $img</h5>
-#*      *##end
-#*    *##else
-       <h5>$menu.name</h5>
-#*    *##end
-#*  *##end
-#*  *##if ( $menu.items && $menu.items.size() > 0 )
-    <ul>
-#*    *##foreach( $item in $menu.items )
-#*      *##menuItem( $item '' )
-#*    *##end
-    </ul>
-#*  *##end
-#**##end
-#end
-##
-#macro ( copyright )
-#**##if ( $project )
-#*  *##if ( ${project.organization} && ${project.organization.name} )
-#*    *##set ( $period = "" )
-#*  *##else
-#*    *##set ( $period = "." )
-#*  *##end
-##
-#*  *##set ( $currentYear = ${currentDate.year} + 1900 )
-##
-#*  *##if ( ${project.inceptionYear} && ( ${project.inceptionYear} != ${currentYear.toString()} ) )
-      ${project.inceptionYear}&#x2013;${currentYear}${period}##
-#*  *##else
-      ${currentYear}${period}##
-#*  *##end
-##
-#*  *##if ( ${project.organization} )
-#*    *##if ( ${project.organization.name} && ${project.organization.url} )
-#*      *#<a href="$project.organization.url">${project.organization.name}</a>.
-#*    *##elseif ( ${project.organization.name} )
-#*      *#${project.organization.name}.
-#*    *##end
-#*  *##end
-#**##end
-#end
-##
-#macro ( publishDate $position $decorationPublishDate $version )
-#**##if ( $publishDate )
-#*  *##set ( $dateValue = $dateFormat.format( $publishDate ) )
-#**##elseif ( $decoration.custom.getChild( 'publishDate' ) )
-#*  *##set ( $dateValue = $decoration.custom.getChild( 'publishDate' ).getValue() )
-#**##else
-#*  *##set ( $dateValue = $dateFormat.format( $currentDate ) )
-#**##end
-##
-#**##set ( $datePosition = $decorationPublishDate.position )
-#**##set ( $versionPosition = $version.position )
-##
-#**##set ( $breadcrumbs = $decoration.body.breadcrumbs )
-#**##set ( $links = $decoration.body.links )
-##
-#**##if ( $datePosition.equalsIgnoreCase( "right" ) && $links && $links.size() > 0 )
-#*  *##set ( $prefix = " |" )
-#**##else
-#*  *##set ( $prefix = "" )
-#**##end
-##
-#**##if ( $datePosition.equalsIgnoreCase( $position ) )
-#*  *##if ( ( $datePosition.equalsIgnoreCase( "right" ) ) || ( $datePosition.equalsIgnoreCase( "bottom" ) ) )
-        $prefix <span id="publishDate">$text.get( "template.lastpublished" ): $dateValue</span>
-#*    *##if ( $versionPosition.equalsIgnoreCase( $position ) )
-         | <span id="projectVersion">$text.get( "template.version" ): ${project.version}</span>
-#*    *##end
-#*  *##elseif ( ( $datePosition.equalsIgnoreCase( "navigation-bottom" ) ) || ( $datePosition.equalsIgnoreCase( "navigation-top" ) ) )
-      <div id="lastPublished">
-        <span id="publishDate">$text.get( "template.lastpublished" ): $dateValue</span>
-#*      *##if ( $versionPosition.equalsIgnoreCase( $position ) )
-           | <span id="projectVersion">$text.get( "template.version" ): ${project.version}</span>
-#*      *##end
-      </div>
-#*    *##elseif ( $datePosition.equalsIgnoreCase( "left" ) )
-      <div class="xleft">
-        <span id="publishDate">$text.get( "template.lastpublished" ): $dateValue</span>
-#*      *##if ( $versionPosition.equalsIgnoreCase( $position ) )
-           | <span id="projectVersion">$text.get( "template.version" ): ${project.version}</span>
-#*      *##end
-#*      *##if ( $breadcrumbs && $breadcrumbs.size() > 0 )
-          | #breadcrumbs( $breadcrumbs )
-#*      *##end
-      </div>
-#*  *##end
-#**##elseif ( $versionPosition.equalsIgnoreCase( $position ) )
-#*  *##if ( ( $versionPosition.equalsIgnoreCase( "right" ) ) || ( $versionPosition.equalsIgnoreCase( "bottom" ) ) )
-      $prefix <span id="projectVersion">$text.get( "template.version" ): ${project.version}</span>
-#*  *##elseif ( ( $versionPosition.equalsIgnoreCase( "navigation-bottom" ) ) || ( $versionPosition.equalsIgnoreCase( "navigation-top" ) ) )
-      <div id="lastPublished">
-        <span id="projectVersion">$text.get( "template.version" ): ${project.version}</span>
-      </div>
-#*  *##elseif ( $versionPosition.equalsIgnoreCase( "left" ) )
-      <div class="xleft">
-        <span id="projectVersion">$text.get( "template.version" ): ${project.version}</span>
-#*      *##if ( $breadcrumbs && $breadcrumbs.size() > 0 )
-          | #breadcrumbs( $breadcrumbs )
-#*      *##end
-      </div>
-#*  *##end
-#**##elseif ( $position.equalsIgnoreCase( "left" ) )
-#*  *##if ( $breadcrumbs && $breadcrumbs.size() > 0 )
-      <div class="xleft">
-#*      *##breadcrumbs( $breadcrumbs )
-      </div>
-#*  *##end
-#**##end
-#end
-##
-#macro ( poweredByLogo $poweredBy )
-#**##if( $poweredBy )
-#*  *##foreach ($item in $poweredBy)
-#*    *##if( $item.href )
-#*      *##set ( $href = $PathTool.calculateLink( $item.href, $relativePath ) )
-#*      *##set ( $href = $href.replaceAll( '\\', '/' ) )
-#*    *##else
-#*      *##set ( $href="https://maven.apache.org/" )
-#*    *##end
-##
-#*    *##if( $item.name )
-#*      *##set ( $name = $item.name )
-#*    *##else
-#*      *##set ( $name = $text.get( "template.builtby" )  )
-#*      *##set ( $name = "${name} Maven"  )
-#*    *##end
-##
-#*    *##if( $item.img )
-#*      *##set ( $img = $item.img )
-#*    *##else
-#*      *##set ( $img = "images/logos/maven-feather.png" )
-#*    *##end
-##
-#*    *##if ( !$decoration.isLink( $img ) )
-#*      *##set ( $img = $PathTool.calculateLink( $img, $relativePath ) )
-#*      *##set ( $img = $img.replaceAll( '\\', '/' ) )
-#*    *##end
-##
-#*    *##if( $item.alt )
-#*      *##set ( $alt = ' alt="' + $item.alt + '"' )
-#*    *##else
-#*      *##set ( $alt = ' alt="' + $name + '"' )
-#*    *##end
-##
-#*    *##if( $item.border )
-#*      *##set ( $border = ' border="' + $item.border + '"' )
-#*    *##else
-#*      *##set ( $border = "" )
-#*    *##end
-##
-#*    *##if( $item.width )
-#*      *##set ( $width = ' width="' + $item.width + '"' )
-#*    *##else
-#*      *##set ( $width = "" )
-#*    *##end
-#*    *##if( $item.height )
-#*      *##set ( $height = ' height="' + $item.height + '"' )
-#*    *##else
-#*      *##set ( $height = "" )
-#*    *##end
-#*    *##if( $item.title )
-#*      *##set ( $title = ' title="' + $item.title + '"' )
-#*    *##else
-#*      *##set ( $title = "" )
-#*    *##end
-##
-      <a href="$href" title="$name" class="poweredBy">
-        <img class="poweredBy" $alt src="$img" $border $width $height $title />
-      </a>
-#*  *##end
-#*  *##if( $poweredBy.isEmpty() )
-      <a href="http://maven.apache.org/" title="$text.get( "template.builtby" ) Maven" class="poweredBy">
-        <img class="poweredBy" alt="$text.get( "template.builtby" ) Maven" src="$relativePath/images/logos/maven-feather.png" />
-      </a>
-#*  *##end
-#**##else
-    <a href="http://maven.apache.org/" title="$text.get( "template.builtby" ) Maven" class="poweredBy">
-      <img class="poweredBy" alt="$text.get( "template.builtby" ) Maven" src="$relativePath/images/logos/maven-feather.png" />
-    </a>
-#**##end
-#end
-##
-#macro ( googleAnalytics $accountId )
-#**##if( $accountId && $accountId != "" )
-    <!-- Google Analytics -->
-    <script>
-      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-            m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-      ga('create', '$accountId', 'auto');
-      ga('send', 'pageview');
-      ga('set', 'anonymizeIp', true);
-      ga('set', 'forceSSL', true);
-    </script>
-#**##end
-#end
-##
-#macro( generatedBy )
-Apache Maven Doxia Site Renderer#if( $doxiaSiteRendererVersion ) $doxiaSiteRendererVersion#end##
-#end
-##
diff --git a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm b/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
deleted file mode 100644
index 2b5e29b..0000000
--- a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
+++ /dev/null
@@ -1,102 +0,0 @@
-<!DOCTYPE html>
-## 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.
-##
-#parse( "default-site-macros.vm" )
-<!--
- | Generated by #generatedBy()
-#if( $docRenderingContext && ( $docRenderingContext.generator || $docRenderingContext.doxiaSource ) ) from##
-#**##if( $docRenderingContext.generator ) $docRenderingContext.generator#end##
-#**##if( $docRenderingContext.doxiaSource ) $docRenderingContext.doxiaSourcePath#end##
-#end
- at $dateFormat.format( $currentDate )
-
- | Rendered using Apache Maven Default Skin
--->
-##
-<html xmlns="http://www.w3.org/1999/xhtml"#if ( $locale ) xml:lang="$locale.language" lang="$locale.language"#end>
-  <head>
-    <meta charset="${outputEncoding}" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-## put meta together
-    <meta name="generator" content="#generatedBy()" />
-#foreach( $author in $authors )
-    <meta name="author" content="$author" />
-#end
-#if ( $documentDate )
-    <meta name="date" content="$documentDate" />
-#end
-#if ( $title )
-    <title>$title</title>
-#end
-    <link rel="stylesheet" href="$relativePath/css/maven-base.css" />
-    <link rel="stylesheet" href="$relativePath/css/maven-theme.css" />
-    <link rel="stylesheet" href="$relativePath/css/site.css" />
-    <link rel="stylesheet" href="$relativePath/css/print.css" media="print" />
-#**##if( $decoration.body.head )
-#*  *#$render.eval( $decoration.body.head )
-#**##end
-#**##if( $headContent )$headContent#end
-#**##googleAnalytics( $decoration.googleAnalyticsAccountId )
-  </head>
-  <body class="composite">
-    <div id="banner">
-#*  *##banner( $decoration.bannerLeft "bannerLeft" )
-#*  *##banner( $decoration.bannerRight "bannerRight" )
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="breadcrumbs">
-#*  *##publishDate( "left" $decoration.publishDate $decoration.version )
-      <div class="xright">#links( $decoration.body.links )
-#*  *##publishDate( "right" $decoration.publishDate $decoration.version )
-      </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="leftColumn">
-      <div id="navcolumn">
-#*   *##publishDate( "navigation-top" $decoration.publishDate $decoration.version )
-#*   *##mainMenu( $decoration.body.menus )
-#*   *##poweredByLogo( $decoration.poweredBy )
-#*   *##publishDate( "navigation-bottom" $decoration.publishDate $decoration.version )
-      </div>
-    </div>
-    <div id="bodyColumn">
-      <div id="contentBox">
-#*   *#$bodyContent
-      </div>
-    </div>
-    <div class="clear">
-      <hr/>
-    </div>
-    <div id="footer">
-      <div class="xright">
-#*  *##if( $decoration.body.footer )
-        $render.eval( $decoration.body.footer )
-#*  *##else
-        Copyright &#169;#copyright().#publishDate( "bottom" $decoration.publishDate $decoration.version )
-#*  *##end
-      </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/images/collapsed.gif b/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/images/collapsed.gif
deleted file mode 100644
index 6e71084..0000000
Binary files a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/images/collapsed.gif and /dev/null differ
diff --git a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/images/expanded.gif b/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/images/expanded.gif
deleted file mode 100644
index 0fef3d8..0000000
Binary files a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/images/expanded.gif and /dev/null differ
diff --git a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/images/logos/build-by-maven-black.png b/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/images/logos/build-by-maven-black.png
deleted file mode 100644
index 919fd0f..0000000
Binary files a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/images/logos/build-by-maven-black.png and /dev/null differ
diff --git a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/images/logos/build-by-maven-white.png b/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/images/logos/build-by-maven-white.png
deleted file mode 100644
index 7d44c9c..0000000
Binary files a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/images/logos/build-by-maven-white.png and /dev/null differ
diff --git a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/images/logos/maven-feather.png b/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/images/logos/maven-feather.png
deleted file mode 100644
index b5ada83..0000000
Binary files a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/images/logos/maven-feather.png and /dev/null differ
diff --git a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/resources.txt b/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/resources.txt
deleted file mode 100644
index 0384226..0000000
--- a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/resources.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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.
-
-images/expanded.gif
-images/collapsed.gif
-images/logos/maven-feather.png
-images/logos/build-by-maven-white.png
-images/logos/build-by-maven-black.png
-css/maven-base.css
-css/print.css