You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by gr...@apache.org on 2011/08/15 12:48:16 UTC
svn commit: r1157771 - in /logging/log4j/companions/extras/trunk: pom.xml
src/changes/changes.xml src/site/site.xml
Author: grobmeier
Date: Mon Aug 15 10:48:16 2011
New Revision: 1157771
URL: http://svn.apache.org/viewvc?rev=1157771&view=rev
Log:
upgraded to maven 3
Modified:
logging/log4j/companions/extras/trunk/pom.xml
logging/log4j/companions/extras/trunk/src/changes/changes.xml
logging/log4j/companions/extras/trunk/src/site/site.xml
Modified: logging/log4j/companions/extras/trunk/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/pom.xml?rev=1157771&r1=1157770&r2=1157771&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/pom.xml (original)
+++ logging/log4j/companions/extras/trunk/pom.xml Mon Aug 15 10:48:16 2011
@@ -18,18 +18,20 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>log4j</groupId>
- <artifactId>apache-log4j-companions-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>log4j</groupId>
+ <artifactId>apache-log4j-companions-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>log4j</groupId>
<artifactId>apache-log4j-extras</artifactId>
<packaging>bundle</packaging>
<version>1.2-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
- the abandoned Apache log4j 1.3 development effort.</description>
+ <description>
+ This companion provides additional appenders, filters and
+ other capabilities for version 1.2 of Apache log4jâ¢. Several of these were backported from
+ the abandoned Apache log4j 1.3 development effort.
+ </description>
<url>http://logging.apache.org:80/log4j/companions/extras</url>
<issueManagement>
<system>Bugzilla</system>
@@ -39,51 +41,88 @@
<system>Gump</system>
<url>http://vmgump.apache.org/gump/public/logging-log4j-extras/logging-log4j-extras/index.html</url>
</ciManagement>
-<mailingLists>
- <mailingList>
- <name>log4j-user</name>
- <subscribe>log4j-user-subscribe@logging.apache.org</subscribe>
- <unsubscribe>log4j-user-unsubscribe@logging.apache.org</unsubscribe>
- <post>log4j-user@logging.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/logging-log4j-user/</archive>
- <otherArchives>
- <otherArchive>http://marc.theaimsgroup.com/?l=log4j-user&r=1&w=2</otherArchive>
- <otherArchive>http://dir.gmane.org/gmane.comp.jakarta.log4j.user</otherArchive>
- </otherArchives>
- </mailingList>
- <mailingList>
- <name>log4j-dev</name>
- <subscribe>log4j-dev-subscribe@logging.apache.org</subscribe>
- <unsubscribe>log4j-dev-unsubscribe@logging.apache.org</unsubscribe>
- <post>log4j-dev@logging.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/logging-log4j-dev/</archive>
- <otherArchives>
- <otherArchive>http://marc.theaimsgroup.com/?l=log4j-dev&r=1&w=2</otherArchive>
- <otherArchive>http://dir.gmane.org/gmane.comp.jakarta.log4j.devel</otherArchive>
- </otherArchives>
- </mailingList>
-</mailingLists>
-<licenses>
- <license>
+ <mailingLists>
+ <mailingList>
+ <name>log4j-user</name>
+ <subscribe>log4j-user-subscribe@logging.apache.org</subscribe>
+ <unsubscribe>log4j-user-unsubscribe@logging.apache.org</unsubscribe>
+ <post>log4j-user@logging.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/logging-log4j-user/</archive>
+ <otherArchives>
+ <otherArchive>http://marc.theaimsgroup.com/?l=log4j-user&r=1&w=2</otherArchive>
+ <otherArchive>http://dir.gmane.org/gmane.comp.jakarta.log4j.user</otherArchive>
+ </otherArchives>
+ </mailingList>
+ <mailingList>
+ <name>log4j-dev</name>
+ <subscribe>log4j-dev-subscribe@logging.apache.org</subscribe>
+ <unsubscribe>log4j-dev-unsubscribe@logging.apache.org</unsubscribe>
+ <post>log4j-dev@logging.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/logging-log4j-dev/</archive>
+ <otherArchives>
+ <otherArchive>http://marc.theaimsgroup.com/?l=log4j-dev&r=1&w=2</otherArchive>
+ <otherArchive>http://dir.gmane.org/gmane.comp.jakarta.log4j.devel</otherArchive>
+ </otherArchives>
+ </mailingList>
+ </mailingLists>
+ <licenses>
+ <license>
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
- </license>
-</licenses>
-<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/logging/log4j/companions/extras/tags/apache-log4j-extras-1.1</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/logging/log4j/companions/extras/tags/apache-log4j-extras-1.1</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/logging/log4j/companions/extras/tags/apache-log4j-extras-1.1</url>
-</scm>
-<organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org</url>
-</organization>
-<build>
+ </license>
+ </licenses>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/logging/log4j/companions/extras/tags/apache-log4j-extras-1.1</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/logging/log4j/companions/extras/tags/apache-log4j-extras-1.1</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/logging/log4j/companions/extras/tags/apache-log4j-extras-1.1</url>
+ </scm>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org</url>
+ </organization>
+ <!--+
+ | BUILD PLUGINS
+ +-->
+ <build>
<plugins>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
+ <version>0.7</version>
+ <configuration>
+ <excludes>
+ <exclude>src/test/resources/org/apache/log4j/**/*.log</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.null</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.throwable</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.0</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.1</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.2</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.3</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.4</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.5</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.6</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.7</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.8</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.9</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.9</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.10</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.11</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.12</exclude>
+ <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>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -103,10 +142,11 @@
<configuration>
<source>1.4</source>
<target>1.4</target>
- <encoding>UTF-8</encoding>
+ <encoding>UTF-8</encoding>
</configuration>
</plugin>
- <plugin>
+ <!-- JAR Plugin -->
+ <plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
@@ -123,6 +163,7 @@
</archive>
</configuration>
</plugin>
+ <!-- ANTRUN plugin -->
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
@@ -130,13 +171,13 @@
<phase>site</phase>
<id>untag-site</id>
<configuration>
- <tasks>
- <taskdef name="replaceregexp" classname="org.apache.tools.ant.taskdefs.optional.ReplaceRegExp" />
- <replaceregexp file="target/site/source-repository.html" match="/tags/[^ "'<]*" replace="/trunk" flags="g" />
- <replaceregexp match="-- Generated by (.*) on .*--" replace="-- Generated by \1 --" flags="g">
- <fileset dir="target/site/apidocs" includes="**/*.html" />
- </replaceregexp>
- </tasks>
+ <tasks>
+ <taskdef name="replaceregexp" classname="org.apache.tools.ant.taskdefs.optional.ReplaceRegExp" />
+ <replaceregexp file="target/site/source-repository.html" match="/tags/[^ "'<]*" replace="/trunk" flags="g" />
+ <replaceregexp match="-- Generated by (.*) on .*--" replace="-- Generated by \1 --" flags="g">
+ <fileset dir="target/site/apidocs" includes="**/*.html" />
+ </replaceregexp>
+ </tasks>
</configuration>
<goals>
<goal>run</goal>
@@ -202,7 +243,8 @@
</dependency>
</dependencies>
</plugin>
- <plugin>
+ <!-- ASSEMBLY Plugin -->
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
@@ -219,21 +261,109 @@
</goals>
</execution>
</executions>
- </plugin>
+ </plugin>
+
+ <!-- SITE Plugin -->
<plugin>
<artifactId>maven-site-plugin</artifactId>
+ <version>3.0</version>
<configuration>
- <templateFile>${basedir}/src/site/maven-site.vm</templateFile>
+ <templateFile>${basedir}/src/site/maven-site.vm</templateFile>
+ <reportPlugins>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.4</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>scm</report>
+ <report>dependencies</report>
+ <report>cim</report>
+ <report>issue-tracking</report>
+ <report>mailing-list</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <artifactId>maven-changes-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>changes-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ <configuration>
+ <issueLinkTemplate>%URL%/show_bug.cgi?id=%ISSUE%</issueLinkTemplate>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ <bottom><![CDATA[<p>Copyright ]]>© {currentYear} The Apache Software Foundation. Licensed under the <![CDATA[<a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a></p>
+<p>Apache Extras Companion for Apache log4j, Apache log4j and Apache are trademarks of the Apache Software Foundation.</p>]]></bottom>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.7</version>
+ <configuration>
+ <excludes>
+ <exclude>src/test/resources/org/apache/log4j/**/*.log</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.null</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.throwable</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.0</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.1</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.2</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.3</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.4</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.5</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.6</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.7</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.8</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.9</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.9</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.10</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.11</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.12</exclude>
+ <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>
+ </reportPlugins>
</configuration>
- <executions>
+ <!-- <executions>
<execution>
- <phase>package</phase>
- <goals>
- <goal>site</goal>
- </goals>
- </execution>
+ <phase>package</phase>
+ <goals>
+ <goal>site</goal>
+ </goals>
+ </execution>
</executions>
+ -->
</plugin>
+
+ <!-- Javadoc Plugin -->
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
@@ -249,6 +379,8 @@
</execution>
</executions>
</plugin>
+
+ <!-- SourcePlugin -->
<plugin>
<artifactId>maven-source-plugin</artifactId>
<executions>
@@ -259,48 +391,11 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
- <configuration>
- <excludes>
- <exclude>src/test/resources/org/apache/log4j/**/*.log</exclude>
- <exclude>src/test/resources/org/apache/log4j/**/*.null</exclude>
- <exclude>src/test/resources/org/apache/log4j/**/*.throwable</exclude>
- <exclude>src/test/resources/org/apache/log4j/**/*.0</exclude>
- <exclude>src/test/resources/org/apache/log4j/**/*.1</exclude>
- <exclude>src/test/resources/org/apache/log4j/**/*.2</exclude>
- <exclude>src/test/resources/org/apache/log4j/**/*.3</exclude>
- <exclude>src/test/resources/org/apache/log4j/**/*.4</exclude>
- <exclude>src/test/resources/org/apache/log4j/**/*.5</exclude>
- <exclude>src/test/resources/org/apache/log4j/**/*.6</exclude>
- <exclude>src/test/resources/org/apache/log4j/**/*.7</exclude>
- <exclude>src/test/resources/org/apache/log4j/**/*.8</exclude>
- <exclude>src/test/resources/org/apache/log4j/**/*.9</exclude>
- <exclude>src/test/resources/org/apache/log4j/**/*.9</exclude>
- <exclude>src/test/resources/org/apache/log4j/**/*.10</exclude>
- <exclude>src/test/resources/org/apache/log4j/**/*.11</exclude>
- <exclude>src/test/resources/org/apache/log4j/**/*.12</exclude>
- <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>
+
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.1.0</version>
+ <version>2.3.5</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -313,9 +408,15 @@
</instructions>
</configuration>
</plugin>
-
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-9</version>
+ <configuration>
+ <goals>package site-deploy assembly:attached deploy</goals>
+ </configuration>
+ </plugin>
</plugins>
-</build>
+ </build>
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -329,67 +430,8 @@
<version>1.2.16</version>
</dependency>
</dependencies>
- <reporting>
- <excludeDefaults>true</excludeDefaults>
- <plugins>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <!-- version 2.2 runs into http://jira.codehaus.org/browse/DOXIA-215 -->
- <version>2.1</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>scm</report>
- <report>dependencies</report>
- <report>cim</report>
- <report>issue-tracking</report>
- <report>mailing-list</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jxr-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-9</version>
- <configuration>
- <goals>package site-deploy assembly:attached deploy</goals>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-changes-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>changes-report</report>
- </reports>
- </reportSet>
- </reportSets>
- <configuration>
- <issueLinkTemplate>%URL%/show_bug.cgi?id=%ISSUE%</issueLinkTemplate>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <encoding>UTF-8</encoding>
- <bottom><![CDATA[<p>Copyright ]]>© {currentYear} The Apache Software Foundation. Licensed under the <![CDATA[<a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a></p>
-<p>Apache Extras Companion for Apache log4j, Apache log4j and Apache are trademarks of the Apache Software Foundation.</p>]]></bottom>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
- <distributionManagement>
+ <distributionManagement>
<repository>
<id>logging.repo</id>
<url>scp://people.apache.org/www/people.apache.org/builds/logging/repo/</url>
Modified: logging/log4j/companions/extras/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/changes/changes.xml?rev=1157771&r1=1157770&r2=1157771&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/changes/changes.xml (original)
+++ logging/log4j/companions/extras/trunk/src/changes/changes.xml Mon Aug 15 10:48:16 2011
@@ -20,6 +20,9 @@
<title>apache-log4j-extras</title>
</properties>
<body>
+ <release version="1.2" date="TBA" description="Maintenance release">
+ <action action="update">Upgraded to Apache Maven 3</action>
+ </release>
<release version="1.1" date="2010-11-19" description="Maintenance release">
<action action="fix" issue="43312">Mangled source-repository.html</action>
<action action="fix" issue="44899">Extra NPE error message when using missing appender class with DOMConfigurator.</action>
Modified: logging/log4j/companions/extras/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/site/site.xml?rev=1157771&r1=1157770&r2=1157771&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/site/site.xml (original)
+++ logging/log4j/companions/extras/trunk/src/site/site.xml Mon Aug 15 10:48:16 2011
@@ -52,13 +52,12 @@
<item name="Issue Tracking" href="/issue-tracking.html"/>
</menu>
+ <menu ref="reports"/>
+
<menu name="Development">
<item name="Repository" href="/source-repository.html"/>
- <item name="Cross Reference" href="/jxr.html"/>
<item name="Dependencies" href="/dependencies.html"/>
<item name="Continuous Integration" href="/integration.html"/>
- <item name="Duplication" href="/cpd.html"/>
- <item name="PMD" href="/pmd.html"/>
</menu>
<menu name="Apache">
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org