You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2012/09/18 02:06:19 UTC
svn commit: r1386919 - in /logging/log4j/log4j2/trunk: api/pom.xml
core/pom.xml dist/pom.xml dist/src/assembly/bin.xml flume-ng/pom.xml
flume-og/pom.xml jcl-bridge/pom.xml log4j12-api/pom.xml pom.xml
slf4j-impl/pom.xml src/changes/changes.xml web/pom.xml
Author: rgoers
Date: Tue Sep 18 00:06:19 2012
New Revision: 1386919
URL: http://svn.apache.org/viewvc?rev=1386919&view=rev
Log:
Change version from alpha3 to beta1. Move add-ons to org.apache.logging.log4j.adapters groupId
Modified:
logging/log4j/log4j2/trunk/api/pom.xml
logging/log4j/log4j2/trunk/core/pom.xml
logging/log4j/log4j2/trunk/dist/pom.xml
logging/log4j/log4j2/trunk/dist/src/assembly/bin.xml
logging/log4j/log4j2/trunk/flume-ng/pom.xml
logging/log4j/log4j2/trunk/flume-og/pom.xml
logging/log4j/log4j2/trunk/jcl-bridge/pom.xml
logging/log4j/log4j2/trunk/log4j12-api/pom.xml
logging/log4j/log4j2/trunk/pom.xml
logging/log4j/log4j2/trunk/slf4j-impl/pom.xml
logging/log4j/log4j2/trunk/src/changes/changes.xml
logging/log4j/log4j2/trunk/web/pom.xml
Modified: logging/log4j/log4j2/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/pom.xml?rev=1386919&r1=1386918&r2=1386919&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/pom.xml (original)
+++ logging/log4j/log4j2/trunk/api/pom.xml Tue Sep 18 00:06:19 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.0-alpha3-SNAPSHOT</version>
+ <version>2.0-beta1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<groupId>org.apache.logging.log4j</groupId>
Modified: logging/log4j/log4j2/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/pom.xml?rev=1386919&r1=1386918&r2=1386919&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/pom.xml (original)
+++ logging/log4j/log4j2/trunk/core/pom.xml Tue Sep 18 00:06:19 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.0-alpha3-SNAPSHOT</version>
+ <version>2.0-beta1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<groupId>org.apache.logging.log4j</groupId>
Modified: logging/log4j/log4j2/trunk/dist/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/dist/pom.xml?rev=1386919&r1=1386918&r2=1386919&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/dist/pom.xml (original)
+++ logging/log4j/log4j2/trunk/dist/pom.xml Tue Sep 18 00:06:19 2012
@@ -30,7 +30,7 @@ limitations under the License.
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.0-alpha3-SNAPSHOT</version>
+ <version>2.0-beta1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
@@ -76,86 +76,69 @@ limitations under the License.
<classifier>tests</classifier>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
+ <groupId>org.apache.logging.log4j.adapters</groupId>
<artifactId>log4j-jcl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
+ <groupId>org.apache.logging.log4j.adapters</groupId>
<artifactId>log4j-jcl</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
+ <groupId>org.apache.logging.log4j.adapters</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>
+ <groupId>org.apache.logging.log4j.adapters</groupId>
<artifactId>log4j-flume-ng</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
+ <groupId>org.apache.logging.log4j.adapters</groupId>
<artifactId>log4j-flume-ng</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
+ <groupId>org.apache.logging.log4j.adapters</groupId>
<artifactId>log4j-flume-ng</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
+ <groupId>org.apache.logging.log4j.adapters</groupId>
<artifactId>log4j12-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
+ <groupId>org.apache.logging.log4j.adapters</groupId>
<artifactId>log4j12-api</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
+ <groupId>org.apache.logging.log4j.adapters</groupId>
<artifactId>log4j12-api</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
+ <groupId>org.apache.logging.log4j.adapters</groupId>
<artifactId>slf4j-impl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
+ <groupId>org.apache.logging.log4j.adapters</groupId>
<artifactId>slf4j-impl</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
+ <groupId>org.apache.logging.log4j.adapters</groupId>
<artifactId>slf4j-impl</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
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=1386919&r1=1386918&r2=1386919&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/dist/src/assembly/bin.xml (original)
+++ logging/log4j/log4j2/trunk/dist/src/assembly/bin.xml Tue Sep 18 00:06:19 2012
@@ -31,8 +31,9 @@ limitations under the License.
<dependencySet>
<includes>
<include>org.apache.logging.log4j:log4j-*</include>
- <include>org.apache.logging.log4j:slf4j-*</include>
- <include>org.apache.logging.log4j:log4j12-*</include>
+ <include>org.apache.logging.log4j.adapters:log4j-*</include>
+ <include>org.apache.logging.log4j.adapters:slf4j-*</include>
+ <include>org.apache.logging.log4j.adapters:log4j12-*</include>
</includes>
<excludes>
<exclude>org.apache.logging.log4j:log4j-distribution</exclude>
Modified: logging/log4j/log4j2/trunk/flume-ng/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/pom.xml?rev=1386919&r1=1386918&r2=1386919&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/pom.xml (original)
+++ logging/log4j/log4j2/trunk/flume-ng/pom.xml Tue Sep 18 00:06:19 2012
@@ -20,10 +20,10 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.0-alpha3-SNAPSHOT</version>
+ <version>2.0-beta1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
- <groupId>org.apache.logging.log4j</groupId>
+ <groupId>org.apache.logging.log4j.adapters</groupId>
<artifactId>log4j-flume-ng</artifactId>
<packaging>jar</packaging>
<name>Log4J Flume NG</name>
@@ -44,11 +44,11 @@
<artifactId>log4j-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
+ <groupId>org.apache.logging.log4j.adapters</groupId>
<artifactId>slf4j-impl</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
+ <groupId>org.apache.logging.log4j.adapters</groupId>
<artifactId>log4j12-api</artifactId>
</dependency>
<dependency>
Modified: logging/log4j/log4j2/trunk/flume-og/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-og/pom.xml?rev=1386919&r1=1386918&r2=1386919&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-og/pom.xml (original)
+++ logging/log4j/log4j2/trunk/flume-og/pom.xml Tue Sep 18 00:06:19 2012
@@ -21,10 +21,10 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.0-alpha2-SNAPSHOT</version>
+ <version>2.0-beta1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
- <groupId>org.apache.logging.log4j</groupId>
+ <groupId>org.apache.logging.log4j.adapters</groupId>
<artifactId>log4j-flume-og</artifactId>
<packaging>jar</packaging>
<name>Log4J Flume OG</name>
@@ -42,7 +42,7 @@
<artifactId>log4j-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
+ <groupId>org.apache.logging.log4j.adapters</groupId>
<artifactId>slf4j-impl</artifactId>
</dependency>
<dependency>
Modified: logging/log4j/log4j2/trunk/jcl-bridge/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/jcl-bridge/pom.xml?rev=1386919&r1=1386918&r2=1386919&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/jcl-bridge/pom.xml (original)
+++ logging/log4j/log4j2/trunk/jcl-bridge/pom.xml Tue Sep 18 00:06:19 2012
@@ -20,12 +20,12 @@
<parent>
<artifactId>log4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
- <version>2.0-alpha3-SNAPSHOT</version>
+ <version>2.0-beta1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.logging.log4j</groupId>
+ <groupId>org.apache.logging.log4j.adapters</groupId>
<artifactId>log4j-jcl</artifactId>
<packaging>jar</packaging>
<name>Log4J Commons Logging</name>
Modified: logging/log4j/log4j2/trunk/log4j12-api/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/pom.xml?rev=1386919&r1=1386918&r2=1386919&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/pom.xml (original)
+++ logging/log4j/log4j2/trunk/log4j12-api/pom.xml Tue Sep 18 00:06:19 2012
@@ -20,10 +20,10 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.0-alpha3-SNAPSHOT</version>
+ <version>2.0-beta1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
- <groupId>org.apache.logging.log4j</groupId>
+ <groupId>org.apache.logging.log4j.adapters</groupId>
<artifactId>log4j12-api</artifactId>
<packaging>jar</packaging>
<name>Log4J Compatibility API</name>
Modified: logging/log4j/log4j2/trunk/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/pom.xml?rev=1386919&r1=1386918&r2=1386919&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/pom.xml (original)
+++ logging/log4j/log4j2/trunk/pom.xml Tue Sep 18 00:06:19 2012
@@ -21,7 +21,7 @@
<artifactId>log4j</artifactId>
<packaging>pom</packaging>
<name>Apache Log4j 2</name>
- <version>2.0-alpha3-SNAPSHOT</version>
+ <version>2.0-beta1-SNAPSHOT</version>
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
@@ -90,7 +90,7 @@
<slf4j.version>1.7.0</slf4j.version>
<logback.version>1.0.7</logback.version>
<log4jParentDir>${basedir}</log4jParentDir>
- <Log4jReleaseVersion>2.0-alpha3</Log4jReleaseVersion>
+ <Log4jReleaseVersion>2.0-beta1</Log4jReleaseVersion>
<!-- 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>
@@ -149,17 +149,17 @@
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
+ <groupId>org.apache.logging.log4j.adapters</groupId>
<artifactId>slf4j-impl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
+ <groupId>org.apache.logging.log4j.adapters</groupId>
<artifactId>log4j-jcl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
+ <groupId>org.apache.logging.log4j.adapters</groupId>
<artifactId>log4j12-api</artifactId>
<version>${project.version}</version>
</dependency>
Modified: logging/log4j/log4j2/trunk/slf4j-impl/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/slf4j-impl/pom.xml?rev=1386919&r1=1386918&r2=1386919&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/slf4j-impl/pom.xml (original)
+++ logging/log4j/log4j2/trunk/slf4j-impl/pom.xml Tue Sep 18 00:06:19 2012
@@ -20,10 +20,10 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.0-alpha3-SNAPSHOT</version>
+ <version>2.0-beta1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
- <groupId>org.apache.logging.log4j</groupId>
+ <groupId>org.apache.logging.log4j.adapters</groupId>
<artifactId>slf4j-impl</artifactId>
<packaging>jar</packaging>
<name>SLF4J Binding</name>
Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1386919&r1=1386918&r2=1386919&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/changes/changes.xml (original)
+++ logging/log4j/log4j2/trunk/src/changes/changes.xml Tue Sep 18 00:06:19 2012
@@ -22,7 +22,7 @@
</properties>
<body>
- <release version="2.0-alpha3" date="2012-09-17" description="Bug fixes and enhancements">
+ <release version="2.0-beta1" date="2012-09-17" description="Bug fixes and enhancements">
<action dev="rgoers" type="add">
Added AsynchAppender.
</action>
Modified: logging/log4j/log4j2/trunk/web/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/web/pom.xml?rev=1386919&r1=1386918&r2=1386919&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/web/pom.xml (original)
+++ logging/log4j/log4j2/trunk/web/pom.xml Tue Sep 18 00:06:19 2012
@@ -20,10 +20,10 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.0-alpha3-SNAPSHOT</version>
+ <version>2.0-beta1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
- <groupId>org.apache.logging.log4j</groupId>
+ <groupId>org.apache.logging.log4j.adapters</groupId>
<artifactId>log4j-web</artifactId>
<packaging>jar</packaging>
<name>Log4j Web Adapters</name>