Index: pom.xml
===================================================================
--- pom.xml	(revision 1763614)
+++ pom.xml	(working copy)
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
-        <version>10</version>
+        <version>18</version>
         <relativePath />
     </parent>
 
Index: src/main/resources/META-INF/maven/site.vm
===================================================================
--- src/main/resources/META-INF/maven/site.vm	(revision 1763614)
+++ src/main/resources/META-INF/maven/site.vm	(working copy)
@@ -106,7 +106,7 @@
         ## Workaround for banner inheriting problems, see also skin docs
         ## Right banner is always ASF reduced logo, image included in skin
         #if( $id.toLowerCase().equals('bannerright') )
-            #set ( $src = 'images/logos/asf-logo-reduced.gif' )
+            #set ( $src = 'images/logos/asf_logo_small.png' )
         #else
             ## Left banner is constructed by a fix path and the value given in the <alt> tag
             #set ( $src = 'images/logos/' + $banner.alt )
Index: src/main/resources/images/logos/asf_logo_small.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: src/main/resources/images/logos/asf_logo_small.png
===================================================================
--- src/main/resources/images/logos/asf_logo_small.png	(nonexistent)
+++ src/main/resources/images/logos/asf_logo_small.png	(working copy)

Property changes on: src/main/resources/images/logos/asf_logo_small.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: src/main/resources/images/logos/james-crypto-mailets-logo.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: src/main/resources/images/logos/james-crypto-mailets-logo.gif
===================================================================
--- src/main/resources/images/logos/james-crypto-mailets-logo.gif	(revision 1763614)
+++ src/main/resources/images/logos/james-crypto-mailets-logo.gif	(nonexistent)

Property changes on: src/main/resources/images/logos/james-crypto-mailets-logo.gif
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: src/main/resources/images/logos/james-imap-logo.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: src/main/resources/images/logos/james-imap-logo.gif
===================================================================
--- src/main/resources/images/logos/james-imap-logo.gif	(revision 1763614)
+++ src/main/resources/images/logos/james-imap-logo.gif	(nonexistent)

Property changes on: src/main/resources/images/logos/james-imap-logo.gif
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: src/main/resources/images/logos/james-jdkim-logo.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: src/main/resources/images/logos/james-jdkim-logo.gif
===================================================================
--- src/main/resources/images/logos/james-jdkim-logo.gif	(revision 1763614)
+++ src/main/resources/images/logos/james-jdkim-logo.gif	(nonexistent)

Property changes on: src/main/resources/images/logos/james-jdkim-logo.gif
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: src/main/resources/images/logos/james-jsieve-logo.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: src/main/resources/images/logos/james-jsieve-logo.gif
===================================================================
--- src/main/resources/images/logos/james-jsieve-logo.gif	(revision 1763614)
+++ src/main/resources/images/logos/james-jsieve-logo.gif	(nonexistent)

Property changes on: src/main/resources/images/logos/james-jsieve-logo.gif
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: src/main/resources/images/logos/james-jspf-logo.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: src/main/resources/images/logos/james-jspf-logo.gif
===================================================================
--- src/main/resources/images/logos/james-jspf-logo.gif	(revision 1763614)
+++ src/main/resources/images/logos/james-jspf-logo.gif	(nonexistent)

Property changes on: src/main/resources/images/logos/james-jspf-logo.gif
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: src/main/resources/images/logos/james-logo.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/jpeg
Index: src/main/resources/images/logos/james-logo.jpg
===================================================================
--- src/main/resources/images/logos/james-logo.jpg	(revision 1763614)
+++ src/main/resources/images/logos/james-logo.jpg	(nonexistent)

Property changes on: src/main/resources/images/logos/james-logo.jpg
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-image/jpeg
\ No newline at end of property
Index: src/main/resources/images/logos/james-logo.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: src/main/resources/images/logos/james-logo.png
===================================================================
--- src/main/resources/images/logos/james-logo.png	(nonexistent)
+++ src/main/resources/images/logos/james-logo.png	(working copy)

Property changes on: src/main/resources/images/logos/james-logo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: src/main/resources/images/logos/james-mailet-base-logo.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: src/main/resources/images/logos/james-mailet-base-logo.gif
===================================================================
--- src/main/resources/images/logos/james-mailet-base-logo.gif	(revision 1763614)
+++ src/main/resources/images/logos/james-mailet-base-logo.gif	(nonexistent)

Property changes on: src/main/resources/images/logos/james-mailet-base-logo.gif
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: src/main/resources/images/logos/james-mailetapi-logo.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: src/main/resources/images/logos/james-mailetapi-logo.gif
===================================================================
--- src/main/resources/images/logos/james-mailetapi-logo.gif	(revision 1763614)
+++ src/main/resources/images/logos/james-mailetapi-logo.gif	(nonexistent)

Property changes on: src/main/resources/images/logos/james-mailetapi-logo.gif
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: src/main/resources/images/logos/james-mailetdocs-logo.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: src/main/resources/images/logos/james-mailetdocs-logo.gif
===================================================================
--- src/main/resources/images/logos/james-mailetdocs-logo.gif	(revision 1763614)
+++ src/main/resources/images/logos/james-mailetdocs-logo.gif	(nonexistent)

Property changes on: src/main/resources/images/logos/james-mailetdocs-logo.gif
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: src/main/resources/images/logos/james-mailets-logo.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: src/main/resources/images/logos/james-mailets-logo.gif
===================================================================
--- src/main/resources/images/logos/james-mailets-logo.gif	(revision 1763614)
+++ src/main/resources/images/logos/james-mailets-logo.gif	(nonexistent)

Property changes on: src/main/resources/images/logos/james-mailets-logo.gif
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: src/main/resources/images/logos/james-mime4j-logo.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: src/main/resources/images/logos/james-mime4j-logo.gif
===================================================================
--- src/main/resources/images/logos/james-mime4j-logo.gif	(revision 1763614)
+++ src/main/resources/images/logos/james-mime4j-logo.gif	(nonexistent)

Property changes on: src/main/resources/images/logos/james-mime4j-logo.gif
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: src/main/resources/images/logos/james-mpt-logo.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: src/main/resources/images/logos/james-mpt-logo.gif
===================================================================
--- src/main/resources/images/logos/james-mpt-logo.gif	(revision 1763614)
+++ src/main/resources/images/logos/james-mpt-logo.gif	(nonexistent)

Property changes on: src/main/resources/images/logos/james-mpt-logo.gif
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: src/main/resources/images/logos/james-postage-logo.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: src/main/resources/images/logos/james-postage-logo.gif
===================================================================
--- src/main/resources/images/logos/james-postage-logo.gif	(revision 1763614)
+++ src/main/resources/images/logos/james-postage-logo.gif	(nonexistent)

Property changes on: src/main/resources/images/logos/james-postage-logo.gif
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: src/main/resources/images/logos/james-project-logo.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: src/main/resources/images/logos/james-project-logo.gif
===================================================================
--- src/main/resources/images/logos/james-project-logo.gif	(revision 1763614)
+++ src/main/resources/images/logos/james-project-logo.gif	(nonexistent)

Property changes on: src/main/resources/images/logos/james-project-logo.gif
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: src/main/resources/images/logos/james-server-logo.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: src/main/resources/images/logos/james-server-logo.gif
===================================================================
--- src/main/resources/images/logos/james-server-logo.gif	(revision 1763614)
+++ src/main/resources/images/logos/james-server-logo.gif	(nonexistent)

Property changes on: src/main/resources/images/logos/james-server-logo.gif
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: src/main/resources/images/logos/james-standard-mailets-logo.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: src/main/resources/images/logos/james-standard-mailets-logo.gif
===================================================================
--- src/main/resources/images/logos/james-standard-mailets-logo.gif	(revision 1763614)
+++ src/main/resources/images/logos/james-standard-mailets-logo.gif	(nonexistent)

Property changes on: src/main/resources/images/logos/james-standard-mailets-logo.gif
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: src/site/apt/index.apt
===================================================================
--- src/site/apt/index.apt	(revision 1763614)
+++ src/site/apt/index.apt	(working copy)
@@ -52,14 +52,14 @@
 +----------------------------------------+
 <bannerLeft>
     <name>James IMAP</name>
-    <src>images/logos/james-imap-logo.gif</src>
+    <src>images/logos/james-logo.png</src>
     <href>http://james.apache.org/imap/index.html</href>
-    <alt>james-imap-logo.gif</alt>
+    <alt>james-logo.png</alt>
 </bannerLeft>
 
 <bannerRight>
     <name>Apache Software Foundation</name>
-    <src>images/logos/asf-logo-reduced.gif</src>
+    <src>images/logos/asf_logo_small.png</src>
     <href>http://james.apache.org/index.html</href>
 </bannerLeft>
 +----------------------------------------+
Index: src/site/site.xml
===================================================================
--- src/site/site.xml	(revision 1763614)
+++ src/site/site.xml	(working copy)
@@ -28,14 +28,14 @@
     <!-- Banner sources must have absolute URL, otherwise inheriting will fail -->
     <bannerLeft>
         <name>James Maven Skin</name>
-        <src>images/logos/james-project-logo.gif</src>
+        <src>images/logos/james-logo.png</src>
         <href>http://james.apache.org/index.html</href>
-        <alt>james-project-logo.gif</alt>
+        <alt>james-logo.png</alt>
     </bannerLeft>
 
     <bannerRight>
         <name>The Apache Software Foundation</name>
-        <src>images/logos/asf-logo-reduced.gif</src>
+        <src>images/logos/asf_logo_small.png</src>
         <href>http://www.apache.org/index.html</href>
     </bannerRight>
 
@@ -43,4 +43,4 @@
         <menu ref="reports" />
     </body>
 
-</project>
\ No newline at end of file
+</project>