Author: rgoers
Date: Mon Apr 30 04:30:39 2012
New Revision: 1332055
URL: http://svn.apache.org/viewvc?rev=1332055&view=rev
Log:
Change from Logj42 1.0-alpha1 to Log4j 2.0-alpha1
Modified:
logging/log4j/log4j2/trunk/dist/pom.xml
logging/log4j/log4j2/trunk/dist/src/assembly/bin.xml
logging/log4j/log4j2/trunk/log4j12-api/pom.xml
logging/log4j/log4j2/trunk/log4j2-api/pom.xml
logging/log4j/log4j2/trunk/log4j2-core/pom.xml
logging/log4j/log4j2/trunk/log4j2-flume-ng/pom.xml
logging/log4j/log4j2/trunk/log4j2-flume-og/pom.xml
logging/log4j/log4j2/trunk/log4j2-jcl/pom.xml
logging/log4j/log4j2/trunk/pom.xml
logging/log4j/log4j2/trunk/slf4j-impl/pom.xml
logging/log4j/log4j2/trunk/src/changes/changes.xml
Modified: logging/log4j/log4j2/trunk/dist/pom.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/dist/pom.xml?rev=1332055&r1=1332054&r2=1332055&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/dist/pom.xml (original)
+++ logging/log4j/log4j2/trunk/dist/pom.xml Mon Apr 30 04:30:39 2012
@@ -17,195 +17,191 @@ See the License for the specific languag
limitations under the License.
-->
-<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";>
+<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>
- <name>Log4j2 Distribution</name>
+ <name>Log4j Distribution</name>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-distribution</artifactId>
+ <artifactId>log4j-distribution</artifactId>
<packaging>pom</packaging>
- <description>Log4j2 - Distribution archives.</description>
+ <description>Log4j - Distribution archives.</description>
<parent>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2</artifactId>
- <version>1.0-alpha1-SNAPSHOT</version>
+ <artifactId>log4j</artifactId>
+ <version>2.0-alpha1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
- <profiles>
- <profile>
- <id>apache-release</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-api</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-api</artifactId>
- <version>${project.version}</version>
- <classifier>javadoc</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-core</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-core</artifactId>
- <version>${project.version}</version>
- <classifier>javadoc</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-core</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-jcl</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-jcl</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-jcl</artifactId>
- <version>${project.version}</version>
- <classifier>javadoc</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-flume-og</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-flume-og</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-flume-og</artifactId>
- <version>${project.version}</version>
- <classifier>javadoc</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-flume-ng</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-flume-ng</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-flume-ng</artifactId>
- <version>${project.version}</version>
- <classifier>javadoc</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j12-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j12-api</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j12-api</artifactId>
- <version>${project.version}</version>
- <classifier>javadoc</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>slf4j-impl</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>slf4j-impl</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>slf4j-impl</artifactId>
- <version>${project.version}</version>
- <classifier>javadoc</classifier>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <!-- As the main Apache pom only builds source zip archives but
- commons wants both zip and tar.gz and because this is
configured
- in the assembly, we need to use a specific assembly. That
also allows
- naming the final artifact as -src not -source-release.
- -->
- <execution>
- <id>log4j2-source-release-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <finalName>log4j2-${project.version}</finalName>
- <descriptors>
- <descriptor>src/assembly/src.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </execution>
- <execution>
- <id>binary</id>
- <configuration>
- <finalName>log4j2-${project.version}</finalName>
- <descriptors>
- <descriptor>src/assembly/bin.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-jcl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-jcl</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-jcl</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-flume-og</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-flume-og</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-flume-og</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-flume-ng</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-flume-ng</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-flume-ng</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j12-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j12-api</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j12-api</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>slf4j-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>slf4j-impl</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>slf4j-impl</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <!-- As the main Apache pom only builds source zip archives but
+ commons wants both zip and tar.gz and because this is configured
+ in the assembly, we need to use a specific assembly. That also
allows
+ naming the final artifact as -src not -source-release.
+ -->
+ <execution>
+ <id>log4j2-source-release-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>log4j-${project.version}</finalName>
+ <descriptors>
+ <descriptor>src/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ <execution>
+ <id>binary</id>
+ <configuration>
+ <finalName>log4j-${project.version}</finalName>
+ <descriptors>
+ <descriptor>src/assembly/bin.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: logging/log4j/log4j2/trunk/dist/src/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/dist/src/assembly/bin.xml?rev=1332055&r1=1332054&r2=1332055&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/dist/src/assembly/bin.xml (original)
+++ logging/log4j/log4j2/trunk/dist/src/assembly/bin.xml Mon Apr 30 04:30:39
2012
@@ -29,12 +29,12 @@ limitations under the License.
<dependencySets>
<dependencySet>
<includes>
- <include>org.apache.logging.log4j:log4j2-*</include>
+ <include>org.apache.logging.log4j:log4j-*</include>
<include>org.apache.logging.log4j:slf4j-*</include>
<include>org.apache.logging.log4j:log4j12-*</include>
</includes>
<excludes>
- <exclude>org.apache.logging.log4j:log4j2-distribution</exclude>
+ <exclude>org.apache.logging.log4j:log4j-distribution</exclude>
</excludes>
<outputDirectory></outputDirectory>
<unpack>false</unpack>
Modified: logging/log4j/log4j2/trunk/log4j12-api/pom.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/pom.xml?rev=1332055&r1=1332054&r2=1332055&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/pom.xml (original)
+++ logging/log4j/log4j2/trunk/log4j12-api/pom.xml Mon Apr 30 04:30:39 2012
@@ -20,8 +20,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2</artifactId>
- <version>1.0-alpha1-SNAPSHOT</version>
+ <artifactId>log4j</artifactId>
+ <version>2.0-alpha1-SNAPSHOT</version>
</parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j12-api</artifactId>
@@ -40,15 +40,15 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-api</artifactId>
+ <artifactId>log4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-core</artifactId>
+ <artifactId>log4j-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-core</artifactId>
+ <artifactId>log4j-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Modified: logging/log4j/log4j2/trunk/log4j2-api/pom.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j2-api/pom.xml?rev=1332055&r1=1332054&r2=1332055&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j2-api/pom.xml (original)
+++ logging/log4j/log4j2/trunk/log4j2-api/pom.xml Mon Apr 30 04:30:39 2012
@@ -20,11 +20,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2</artifactId>
- <version>1.0-alpha1-SNAPSHOT</version>
+ <artifactId>log4j</artifactId>
+ <version>2.0-alpha1-SNAPSHOT</version>
</parent>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-api</artifactId>
+ <artifactId>log4j-api</artifactId>
<packaging>jar</packaging>
<name>Log4J API</name>
<description>The Log4J API</description>
Modified: logging/log4j/log4j2/trunk/log4j2-core/pom.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j2-core/pom.xml?rev=1332055&r1=1332054&r2=1332055&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j2-core/pom.xml (original)
+++ logging/log4j/log4j2/trunk/log4j2-core/pom.xml Mon Apr 30 04:30:39 2012
@@ -20,21 +20,21 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2</artifactId>
- <version>1.0-alpha1-SNAPSHOT</version>
+ <artifactId>log4j</artifactId>
+ <version>2.0-alpha1-SNAPSHOT</version>
</parent>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-core</artifactId>
+ <artifactId>log4j-core</artifactId>
<packaging>jar</packaging>
- <name>Log4J2 Core</name>
- <description>Log4j 2.0 Implementation.</description>
+ <name>Log4J Core</name>
+ <description>Log4 Implementation.</description>
<properties>
<log4j.parent.dir>${basedir}/..</log4j.parent.dir>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-api</artifactId>
+ <artifactId>log4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
Modified: logging/log4j/log4j2/trunk/log4j2-flume-ng/pom.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j2-flume-ng/pom.xml?rev=1332055&r1=1332054&r2=1332055&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j2-flume-ng/pom.xml (original)
+++ logging/log4j/log4j2/trunk/log4j2-flume-ng/pom.xml Mon Apr 30 04:30:39 2012
@@ -20,13 +20,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2</artifactId>
- <version>1.0-alpha1-SNAPSHOT</version>
+ <artifactId>log4j</artifactId>
+ <version>2.0-alpha1-SNAPSHOT</version>
</parent>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-flume-ng</artifactId>
+ <artifactId>log4j-flume-ng</artifactId>
<packaging>jar</packaging>
- <name>Log4J2 Flume NG</name>
+ <name>Log4J Flume NG</name>
<description>Log4j 2.0 Flume Appender</description>
<properties>
<log4j.parent.dir>${basedir}/..</log4j.parent.dir>
@@ -34,11 +34,11 @@
<dependencies>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-api</artifactId>
+ <artifactId>log4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-core</artifactId>
+ <artifactId>log4j-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
Modified: logging/log4j/log4j2/trunk/log4j2-flume-og/pom.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j2-flume-og/pom.xml?rev=1332055&r1=1332054&r2=1332055&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j2-flume-og/pom.xml (original)
+++ logging/log4j/log4j2/trunk/log4j2-flume-og/pom.xml Mon Apr 30 04:30:39 2012
@@ -20,13 +20,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2</artifactId>
- <version>1.0-alpha1-SNAPSHOT</version>
+ <artifactId>log4j</artifactId>
+ <version>2.0-alpha1-SNAPSHOT</version>
</parent>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-flume-og</artifactId>
+ <artifactId>log4j-flume-og</artifactId>
<packaging>jar</packaging>
- <name>Log4J2 Flume OG</name>
+ <name>Log4J Flume OG</name>
<description>Log4j 2.0 Flume (Original) Appender</description>
<properties>
<log4j.parent.dir>${basedir}/..</log4j.parent.dir>
@@ -34,11 +34,11 @@
<dependencies>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-api</artifactId>
+ <artifactId>log4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-core</artifactId>
+ <artifactId>log4j-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
Modified: logging/log4j/log4j2/trunk/log4j2-jcl/pom.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j2-jcl/pom.xml?rev=1332055&r1=1332054&r2=1332055&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j2-jcl/pom.xml (original)
+++ logging/log4j/log4j2/trunk/log4j2-jcl/pom.xml Mon Apr 30 04:30:39 2012
@@ -20,17 +20,17 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
- <artifactId>log4j2</artifactId>
+ <artifactId>log4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
- <version>1.0-alpha1-SNAPSHOT</version>
+ <version>2.0-alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-jcl</artifactId>
+ <artifactId>log4j-jcl</artifactId>
<packaging>jar</packaging>
- <name>Log4J2 Commons Logging</name>
- <description>Log4j2 Commons Logging Adapter</description>
+ <name>Log4J Commons Logging</name>
+ <description>Log4j 2.0 Commons Logging Adapter</description>
<properties>
<log4j.parent.dir>${basedir}/..</log4j.parent.dir>
</properties>
@@ -48,11 +48,11 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-core</artifactId>
+ <artifactId>log4j-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-core</artifactId>
+ <artifactId>log4j-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Modified: logging/log4j/log4j2/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/pom.xml?rev=1332055&r1=1332054&r2=1332055&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/pom.xml (original)
+++ logging/log4j/log4j2/trunk/pom.xml Mon Apr 30 04:30:39 2012
@@ -19,10 +19,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2</artifactId>
+ <artifactId>log4j</artifactId>
<packaging>pom</packaging>
<name>Apache Log4j 2</name>
- <version>1.0-alpha1-SNAPSHOT</version>
+ <version>2.0-alpha1-SNAPSHOT</version>
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
@@ -93,6 +93,15 @@
<logback.version>1.0.0</logback.version>
<log4j.parent.dir>${basedir}</log4j.parent.dir>
<Log4j2ReleaseVersion>1.0-alpha1</Log4j2ReleaseVersion>
+ <!-- Configuration properties for the OSGi maven-bundle-plugin -->
+
<osgi.symbolicName>org.apache.commons.${project.artifactId}</osgi.symbolicName>
+
<osgi.export>org.apache.logging.log4j.*;version=${project.version};-noimport:=true</osgi.export>
+ <osgi.import>*</osgi.import>
+ <osgi.dynamicImport />
+ <osgi.private />
+ <manifestfile>target/osgi/MANIFEST.MF</manifestfile>
+ <maven.compile.source>1.5</maven.compile.source>
+ <maven.compile.target>1.5</maven.compile.target>
</properties>
<dependencyManagement>
<dependencies>
@@ -124,17 +133,17 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-api</artifactId>
+ <artifactId>log4j-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-core</artifactId>
+ <artifactId>log4j-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-core</artifactId>
+ <artifactId>log4j-core</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
@@ -145,7 +154,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-jcl</artifactId>
+ <artifactId>log4j-jcl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -166,6 +175,12 @@
<pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.3.7</version>
+ <inherited>true</inherited>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
<version>2.6</version>
@@ -200,10 +215,31 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>${maven.compile.source}</source>
+ <target>${maven.compile.target}</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${manifestfile}</manifestFile>
+ <manifestEntries>
+ <Specification-Title>${project.name}</Specification-Title>
+ <Specification-Version>${project.version}</Specification-Version>
+
<Specification-Vendor>${project.organization.name}</Specification-Vendor>
+ <Implementation-Title>${project.name}</Implementation-Title>
+
<Implementation-Version>${project.version}</Implementation-Version>
+
<Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+ <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+
<X-Compile-Source-JDK>${maven.compile.source}</X-Compile-Source-JDK>
+
<X-Compile-Target-JDK>${maven.compile.target}</X-Compile-Target-JDK>
+ </manifestEntries>
+ </archive>
</configuration>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
@@ -236,6 +272,44 @@
</execution>
</executions>
</plugin> -->
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <!--
+ dummy entry to stop bundle plugin from picking up jar config and
reporting
+ WARNING: Duplicate name in Manifest
+ See http://markmail.org/message/mpkl24wk3jrjhhjg
+ -->
+ <archive>
+ <forced>true</forced>
+ </archive>
+ <excludeDependencies>true</excludeDependencies>
+ <manifestLocation>target/osgi</manifestLocation>
+ <instructions>
+ <!-- stops the "uses" clauses being added to "Export-Package"
manifest entry -->
+ <_nouses>true</_nouses>
+ <!-- Stop the JAVA_1_n_HOME variables from being treated as
headers by Bnd -->
+
<_removeheaders>JAVA_1_3_HOME,JAVA_1_4_HOME,JAVA_1_5_HOME,JAVA_1_6_HOME,JAVA_1_7_HOME</_removeheaders>
+ <Bundle-SymbolicName>${osgi.symbolicName}</Bundle-SymbolicName>
+ <Export-Package>${osgi.export}</Export-Package>
+ <Private-Package>${osgi.private}</Private-Package>
+ <Import-Package>${osgi.import}</Import-Package>
+
<DynamicImport-Package>${osgi.dynamicImport}</DynamicImport-Package>
+ <Bundle-DocURL>${project.url}</Bundle-DocURL>
+ </instructions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<reporting>
@@ -307,7 +381,6 @@
<module>log4j2-core</module>
<module>slf4j-impl</module>
<module>log4j2-jcl</module>
- <module>dist</module>
</modules>
<profiles>
<profile>
@@ -377,6 +450,11 @@
</plugin>
</plugins>
</build>
+ <modules>
+ <module>log4j2-flume-og</module>
+ <module>log4j2-flume-ng</module>
+ <module>dist</module>
+ </modules>
</profile>
</profiles>
</project>
Modified: logging/log4j/log4j2/trunk/slf4j-impl/pom.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/slf4j-impl/pom.xml?rev=1332055&r1=1332054&r2=1332055&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/slf4j-impl/pom.xml (original)
+++ logging/log4j/log4j2/trunk/slf4j-impl/pom.xml Mon Apr 30 04:30:39 2012
@@ -20,8 +20,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2</artifactId>
- <version>1.0-alpha1-SNAPSHOT</version>
+ <artifactId>log4j</artifactId>
+ <version>2.0-alpha1-SNAPSHOT</version>
</parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>slf4j-impl</artifactId>
@@ -42,15 +42,15 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-api</artifactId>
+ <artifactId>log4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-core</artifactId>
+ <artifactId>log4j-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j2-core</artifactId>
+ <artifactId>log4j-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1332055&r1=1332054&r2=1332055&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/changes/changes.xml (original)
+++ logging/log4j/log4j2/trunk/src/changes/changes.xml Mon Apr 30 04:30:39 2012
@@ -22,7 +22,7 @@
</properties>
<body>
- <release version="1.0-alpha1" date="TBD" description="Rewrite of Log4j">
+ <release version="2.0-alpha1" date="TBD" description="Rewrite of Log4j">
<action issue="LOG4J2-56" dev="rgoers" type="fix" due-to="John Owen
Atala">
Level.toLevel would throw an IllegalArgumentException instead of
returning the default value.
</action>
