Author: carnold
Date: Mon Nov 15 06:09:40 2010
New Revision: 1035152
URL: http://svn.apache.org/viewvc?rev=1035152&view=rev
Log:
Address issues in RC2, reset for RC3
Added:
logging/log4j/companions/extras/trunk/src/site/maven-site.vm
- copied, changed from r1034933,
logging/log4j/companions/extras/trunk/maven-site.vm
logging/log4j/companions/extras/trunk/src/site/resources/images/logos/
logging/log4j/companions/extras/trunk/src/site/resources/images/logos/maven-feather.png
(with props)
Removed:
logging/log4j/companions/extras/trunk/maven-site.vm
Modified:
logging/log4j/companions/extras/trunk/pom.xml
Modified: logging/log4j/companions/extras/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/pom.xml?rev=1035152&r1=1035151&r2=1035152&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/pom.xml (original)
+++ logging/log4j/companions/extras/trunk/pom.xml Mon Nov 15 06:09:40 2010
@@ -20,7 +20,7 @@
<groupId>log4j</groupId>
<artifactId>apache-log4j-extras</artifactId>
<packaging>bundle</packaging>
- <version>1.2-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<name>Apache Extras Companion⢠for Apache log4jâ¢.</name>
<description>This companion provides additional appenders, filters and
other capabilities for version 1.2 of Apache log4jâ¢. Several of these
were backported from
@@ -218,7 +218,7 @@
<plugin>
<artifactId>maven-site-plugin</artifactId>
<configuration>
- <templateFile>${basedir}/maven-site.vm</templateFile>
+ <templateFile>${basedir}/src/site/maven-site.vm</templateFile>
</configuration>
<executions>
<execution>
@@ -280,6 +280,15 @@
<exclude>src/test/resources/org/apache/log4j/**/*.13</exclude>
<exclude>src/test/resources/org/apache/log4j/**/*.14</exclude>
<exclude>src/test/resources/org/apache/log4j/**/*.15</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.17</exclude>
+ <exclude>site/**/*-frame.html</exclude>
+ <exclude>site/**/*-summary.html</exclude>
+ <exclude>site/xref*/index.html</exclude>
+ <exclude>site/pmd.xml</exclude>
+ <exclude>site/cpd.xml</exclude>
+ <exclude>site/apidocs/**/*</exclude>
+ <exclude>site/testapidocs/**/*</exclude>
+ <exclude>site/css/maven-theme.css</exclude>
</excludes>
</configuration>
</plugin>
Copied: logging/log4j/companions/extras/trunk/src/site/maven-site.vm (from
r1034933, logging/log4j/companions/extras/trunk/maven-site.vm)
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/site/maven-site.vm?p2=logging/log4j/companions/extras/trunk/src/site/maven-site.vm&p1=logging/log4j/companions/extras/trunk/maven-site.vm&r1=1034933&r2=1035152&rev=1035152&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/maven-site.vm (original)
+++ logging/log4j/companions/extras/trunk/src/site/maven-site.vm Mon Nov 15
06:09:40 2010
@@ -513,7 +513,7 @@
<div id="footer">
<div class="xleft">Copyright ©#copyright()#publishDate( "bottom"
$decoration.publishDate $decoration.version ) Licensed under the <a
href="http://www.apache.org/licenses/LICENSE-2.0";>Apache Software License,
Version 2.0</a>.</div>
<div class="xleft">Apache Extras Companion for Apache log4j, Apache
log4j, Apache, the Apache feather logo,
- the Apache Logging Services project logo, and the log4j logo are trademarks
of The Apache Software Foundation.</div>
+ the Apache Logging Services project logo, the log4j logo, and the Built by
Maven logo are trademarks of The Apache Software Foundation.</div>
<div class="clear">
<hr/>
</div>
Added:
logging/log4j/companions/extras/trunk/src/site/resources/images/logos/maven-feather.png
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/site/resources/images/logos/maven-feather.png?rev=1035152&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
logging/log4j/companions/extras/trunk/src/site/resources/images/logos/maven-feather.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
