logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mattsic...@apache.org
Subject svn commit: r1574757 - in /logging/log4j/log4j2/trunk: log4j-bom/ log4j-bom/pom.xml pom.xml src/site/xdoc/maven-artifacts.xml.vm
Date Thu, 06 Mar 2014 03:33:02 GMT
Author: mattsicker
Date: Thu Mar  6 03:33:02 2014
New Revision: 1574757

URL: http://svn.apache.org/r1574757
Log:
LOG4J2-558 Create a log4j-bom

  - Added log4j-bom Maven module.
  - Added Maven usage information to manual.

Added:
    logging/log4j/log4j2/trunk/log4j-bom/
    logging/log4j/log4j2/trunk/log4j-bom/pom.xml
Modified:
    logging/log4j/log4j2/trunk/pom.xml
    logging/log4j/log4j2/trunk/src/site/xdoc/maven-artifacts.xml.vm

Added: logging/log4j/log4j2/trunk/log4j-bom/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-bom/pom.xml?rev=1574757&view=auto
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-bom/pom.xml (added)
+++ logging/log4j/log4j2/trunk/log4j-bom/pom.xml Thu Mar  6 03:33:02 2014
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+  <parent>
+    <artifactId>log4j</artifactId>
+    <groupId>org.apache.logging.log4j</groupId>
+    <version>2.0-rc2-SNAPSHOT</version>
+    <relativePath>../</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <name>Apache Log4j 2 BOM</name>
+  <description>Apache Log4j 2 Bill of Material</description>
+  <artifactId>log4j-bom</artifactId>
+  <version>${parent.version}</version>
+  <dependencies>
+    <!-- Log4j API -->
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <!-- Core Log4j -->
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <!-- Legacy Log4j 1.2 API -->
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-1.2-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <!-- Commons Logging Compatibility API -->
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-jcl</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <!-- Apache Flume Bridge -->
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-flume-ng</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <!-- JSP Tag Library -->
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-taglib</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <!-- JMX GUI -->
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-jmx-gui</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <!-- SLF4J Compatibility API -->
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-slf4j-impl</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
+</project>
\ No newline at end of file

Modified: logging/log4j/log4j2/trunk/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/pom.xml?rev=1574757&r1=1574756&r2=1574757&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/pom.xml (original)
+++ logging/log4j/log4j2/trunk/pom.xml Thu Mar  6 03:33:02 2014
@@ -886,6 +886,7 @@
     <module>log4j-taglib</module>
     <module>log4j-jmx-gui</module>
     <module>log4j-samples</module>
+    <module>log4j-bom</module>
   </modules>
   <profiles>
     <profile>

Modified: logging/log4j/log4j2/trunk/src/site/xdoc/maven-artifacts.xml.vm
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/maven-artifacts.xml.vm?rev=1574757&r1=1574756&r2=1574757&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/maven-artifacts.xml.vm (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/maven-artifacts.xml.vm Thu Mar  6 03:33:02 2014
@@ -72,12 +72,38 @@ dependencies {
 }
 ]]></pre>
       </subsection>
+      <subsection name="Bill of Material">
+        <p>
+          To keep your Log4j module versions in sync with each other, a
+          <abbr id="Bill of Material">BOM</abbr>
+          pom.xml file is provided for your convenience. To use this with
+          <a href="http://maven.apache.org/">Maven</a>, add the dependency listed
below to your
+          <code>pom.xml</code>
+          file. When you specify the version identifier in this section, you don't have to
specify the version in your
+          <code><![CDATA[<dependencies/>]]></code>
+          section.
+        </p>
+        <code>pom.xml</code>
+        <pre class="prettyprint linenums"><![CDATA[
+<dependencyManagement>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-bom</artifactId>
+      <version>${Log4jReleaseVersion}</version>
+      <scope>import</scope>
+      <type>pom</type>
+    </dependency>
+  </dependencies>
+</dependencyManagement>
+]]></pre>
+      </subsection>
       <subsection name="Optional Components">
         <p>
           Log4j 2.x contains several optional components that can be included in an application.
         </p>
         <h4>Log4j 1.x API Bridge</h4>
-        <p>If existing components use Log4j 1.x and you want to have this logging routed
to Log4j 2, 
+        <p>If existing components use Log4j 1.x and you want to have this logging routed
to Log4j 2,
           then remove any log4j 1.x dependencies and add the following.
         </p>
         <code>pom.xml</code>
@@ -103,7 +129,7 @@ dependencies {
 }
 ]]></pre>
         <h4>Apache Commons Logging Bridge</h4>
-        <p>If existing components use Apache Commons Logging 1.x and you want to have
this logging routed to Log4j 2, 
+        <p>If existing components use Apache Commons Logging 1.x and you want to have
this logging routed to Log4j 2,
           then add the following but do not remove any Commons Logging 1.x dependencies.
         </p>
         <code>pom.xml</code>
@@ -129,7 +155,7 @@ dependencies {
 }
 ]]></pre>
         <h4>SLF4J Bridge</h4>
-        <p>If existing components use SLF4J and you want to have this logging routed
to Log4j 2, then add the 
+        <p>If existing components use SLF4J and you want to have this logging routed
to Log4j 2, then add the
           following but do not remove any SLF4J dependencies.
         </p>
         <code>pom.xml</code>



Mime
View raw message