Repository: logging-log4j2
Updated Branches:
  refs/heads/master dbbeb5cf5 -> e7bbd27fc


Add optional Conversant Disruptor dependency


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/9f2fb7d0
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/9f2fb7d0
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/9f2fb7d0

Branch: refs/heads/master
Commit: 9f2fb7d095d024286d577587281e29b361e10756
Parents: e262eda
Author: Matt Sicker <boa...@gmail.com>
Authored: Wed Jun 15 13:53:40 2016 -0500
Committer: Matt Sicker <boa...@gmail.com>
Committed: Wed Jun 15 13:53:40 2016 -0500

----------------------------------------------------------------------
 log4j-core/pom.xml | 6 ++++++
 pom.xml            | 6 ++++++
 2 files changed, 12 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9f2fb7d0/log4j-core/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml
index f2b08a1..d2c47bf 100644
--- a/log4j-core/pom.xml
+++ b/log4j-core/pom.xml
@@ -51,6 +51,12 @@
       <artifactId>disruptor</artifactId>
       <optional>true</optional>
     </dependency>
+    <!-- Alternative implementation of BlockingQueue for AsyncAppender -->
+    <dependency>
+      <groupId>com.conversantmedia</groupId>
+      <artifactId>disruptor</artifactId>
+      <optional>true</optional>
+    </dependency>
     <!-- Required for JSON support -->
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9f2fb7d0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8cd67a0..010168c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -196,6 +196,7 @@
     <springVersion>3.2.13.RELEASE</springVersion>
     <flumeVersion>1.6.0</flumeVersion>
     <disruptorVersion>3.3.4</disruptorVersion>
+    <conversantDisruptorVersion>1.2.7</conversantDisruptorVersion>
     <compiler.plugin.version>3.5.1</compiler.plugin.version>
     <pmd.plugin.version>3.6</pmd.plugin.version>
     <findbugs.plugin.version>3.0.3</findbugs.plugin.version>
@@ -610,6 +611,11 @@
         <version>${disruptorVersion}</version>
       </dependency>
       <dependency>
+        <groupId>com.conversantmedia</groupId>
+        <artifactId>disruptor</artifactId>
+        <version>${conversantDisruptorVersion}</version>
+      </dependency>
+      <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
         <version>4.12</version>

Reply via email to