logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgo...@apache.org
Subject svn commit: r1361632 - in /logging/log4j/log4j2/trunk: api/pom.xml core/pom.xml dist/pom.xml flume-ng/pom.xml jcl-bridge/pom.xml log4j12-api/pom.xml pom.xml slf4j-impl/pom.xml src/site/site.xml src/site/xdoc/manual/appenders.xml
Date Sun, 15 Jul 2012 06:05:02 GMT
Author: rgoers
Date: Sun Jul 15 06:05:01 2012
New Revision: 1361632

URL: http://svn.apache.org/viewvc?rev=1361632&view=rev
Log:
Revert versions. Remove Flume OG from site navigation

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/flume-ng/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/site/site.xml
    logging/log4j/log4j2/trunk/src/site/xdoc/manual/appenders.xml

Modified: logging/log4j/log4j2/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/pom.xml?rev=1361632&r1=1361631&r2=1361632&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/pom.xml (original)
+++ logging/log4j/log4j2/trunk/api/pom.xml Sun Jul 15 06:05:01 2012
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.logging.log4j</groupId>
     <artifactId>log4j</artifactId>
-    <version>2.0-alpha2-SNAPSHOT</version>
+    <version>2.0-alpha1-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=1361632&r1=1361631&r2=1361632&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/pom.xml (original)
+++ logging/log4j/log4j2/trunk/core/pom.xml Sun Jul 15 06:05:01 2012
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.logging.log4j</groupId>
     <artifactId>log4j</artifactId>
-    <version>2.0-alpha2-SNAPSHOT</version>
+    <version>2.0-alpha1-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=1361632&r1=1361631&r2=1361632&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/dist/pom.xml (original)
+++ logging/log4j/log4j2/trunk/dist/pom.xml Sun Jul 15 06:05:01 2012
@@ -30,7 +30,7 @@ limitations under the License.
   <parent>
     <groupId>org.apache.logging.log4j</groupId>
     <artifactId>log4j</artifactId>
-    <version>2.0-alpha2-SNAPSHOT</version>
+    <version>2.0-alpha1-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 

Modified: logging/log4j/log4j2/trunk/flume-ng/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/pom.xml?rev=1361632&r1=1361631&r2=1361632&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/pom.xml (original)
+++ logging/log4j/log4j2/trunk/flume-ng/pom.xml Sun Jul 15 06:05:01 2012
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.logging.log4j</groupId>
     <artifactId>log4j</artifactId>
-    <version>2.0-alpha2-SNAPSHOT</version>
+    <version>2.0-alpha1-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
   <groupId>org.apache.logging.log4j</groupId>

Modified: logging/log4j/log4j2/trunk/jcl-bridge/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/jcl-bridge/pom.xml?rev=1361632&r1=1361631&r2=1361632&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/jcl-bridge/pom.xml (original)
+++ logging/log4j/log4j2/trunk/jcl-bridge/pom.xml Sun Jul 15 06:05:01 2012
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>log4j</artifactId>
     <groupId>org.apache.logging.log4j</groupId>
-    <version>2.0-alpha2-SNAPSHOT</version>
+    <version>2.0-alpha1-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: logging/log4j/log4j2/trunk/log4j12-api/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/pom.xml?rev=1361632&r1=1361631&r2=1361632&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/pom.xml (original)
+++ logging/log4j/log4j2/trunk/log4j12-api/pom.xml Sun Jul 15 06:05:01 2012
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.logging.log4j</groupId>
     <artifactId>log4j</artifactId>
-    <version>2.0-alpha2-SNAPSHOT</version>
+    <version>2.0-alpha1-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
   <groupId>org.apache.logging.log4j</groupId>

Modified: logging/log4j/log4j2/trunk/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/pom.xml?rev=1361632&r1=1361631&r2=1361632&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/pom.xml (original)
+++ logging/log4j/log4j2/trunk/pom.xml Sun Jul 15 06:05:01 2012
@@ -21,7 +21,7 @@
   <artifactId>log4j</artifactId>
   <packaging>pom</packaging>
   <name>Apache Log4j 2</name>
-  <version>2.0-alpha2-SNAPSHOT</version>
+  <version>2.0-alpha1-SNAPSHOT</version>
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
@@ -380,6 +380,7 @@
     <module>core</module>
     <module>slf4j-impl</module>
     <module>jcl-bridge</module>
+    <module>flume-ng</module>
   </modules>
   <profiles>
     <profile>
@@ -402,19 +403,6 @@
         </build>
     </profile>
     <profile>
-      <id>include-flume</id>
-      <modules>
-        <module>flume-og</module>
-        <module>flume-ng</module>
-      </modules>
-    </profile>
-    <profile>
-      <id>include-flume-ng</id>
-      <modules>
-        <module>flume-ng</module>
-      </modules>
-    </profile>
-    <profile>
       <id>include-flume-og</id>
       <modules>
         <module>flume-og</module>
@@ -474,7 +462,6 @@
         </plugins>
       </build>
       <modules>
-        <module>flume-ng</module>
         <module>dist</module>
       </modules>
     </profile>

Modified: logging/log4j/log4j2/trunk/slf4j-impl/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/slf4j-impl/pom.xml?rev=1361632&r1=1361631&r2=1361632&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/slf4j-impl/pom.xml (original)
+++ logging/log4j/log4j2/trunk/slf4j-impl/pom.xml Sun Jul 15 06:05:01 2012
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.logging.log4j</groupId>
     <artifactId>log4j</artifactId>
-    <version>2.0-alpha2-SNAPSHOT</version>
+    <version>2.0-alpha1-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
   <groupId>org.apache.logging.log4j</groupId>

Modified: logging/log4j/log4j2/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/site.xml?rev=1361632&r1=1361631&r2=1361632&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/site.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/site.xml Sun Jul 15 06:05:01 2012
@@ -136,8 +136,7 @@
       <item name="Log4J 1.2 API" href="log4j12-api/index.html"/>
       <item name="Commons Logging Bridge" href="log4j-jcl/index.html"/>
       <item name="SLF4J Binding" href="slf4j-impl/index.html"/>
-      <item name="Flume OG" href="log4j-flume-og/index.html"/>
-      <item name="Flume NG" href="log4j-flume-ng/index.html"/>
+      <item name="Apache Flume" href="log4j-flume-ng/index.html"/>
     </menu>
     <links>
       <item name="Logging Wiki" href="http://wiki.apache.org/logging"/>

Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/appenders.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/appenders.xml?rev=1361632&r1=1361631&r2=1361632&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/appenders.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/appenders.xml Sun Jul 15 06:05:01 2012
@@ -283,9 +283,10 @@
             from many different sources to a centralized data store. The FlumeAppender takes
LogEvents and sends
             them to a Flume agent as serialized Avro events for consumption.</p>
           <p>
-            There are two versions of the Flume Appender available. The first is for "Flume
OG", the original
-            version of Flume before it became an Apache project. The second is for "Flume
NG", which is
-            maintained by the Apache Flume project.
+            There are two versions of the Flume Appender in the source control. The first
is for "Flume OG", the
+            original version of Flume before it became an Apache project. The second is for
"Flume NG", which is
+            maintained by the Apache Flume project. Only the Flume NG appender is included
in Log4j 2 releases as
+            Flume OG itself is considered deprecated.
           </p>
           <table border="1" width="100%">
             <tr>



Mime
View raw message