[LOG4J2-2079] Update Conversant Disruptor from 1.12.10 to 1.12.11.

THausherr · Feb 20, 2018 · 233d9e2 · 233d9e2
1 parent dbfedf7
commit 233d9e2
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/log4j-core-its/pom.xml b/log4j-core-its/pom.xml
@@ -83,7 +83,6 @@
     <dependency>
       <groupId>com.conversantmedia</groupId>
       <artifactId>disruptor</artifactId>
-      <classifier>jdk7</classifier>
       <optional>true</optional>
     </dependency>
     <!-- Alternative implementation of BlockingQueue using JCTools for AsyncAppender -->

diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml
@@ -61,7 +61,6 @@
     <dependency>
       <groupId>com.conversantmedia</groupId>
       <artifactId>disruptor</artifactId>
-      <classifier>jdk7</classifier>
       <optional>true</optional>
     </dependency>
     <!-- Alternative implementation of BlockingQueue using JCTools for AsyncAppender -->

diff --git a/log4j-perf/pom.xml b/log4j-perf/pom.xml
@@ -103,7 +103,6 @@
     <dependency>
       <groupId>com.conversantmedia</groupId>
       <artifactId>disruptor</artifactId>
-      <classifier>jdk7</classifier>
     </dependency>
     <dependency>
       <groupId>org.jctools</groupId>

diff --git a/pom.xml b/pom.xml
@@ -183,9 +183,9 @@
     <jackson1Version>1.9.13</jackson1Version>
     <jackson2Version>2.9.4</jackson2Version>
     <springVersion>3.2.18.RELEASE</springVersion>
-    <flumeVersion>1.8.0</flumeVersion> <!-- Version 1.8.0 requires Java 8 -->
+    <flumeVersion>1.8.0</flumeVersion>
     <disruptorVersion>3.3.7</disruptorVersion>
-    <conversantDisruptorVersion>1.2.10</conversantDisruptorVersion> <!-- Version 1.2.11 requires Java 8 -->
+    <conversantDisruptorVersion>1.2.11</conversantDisruptorVersion>
     <mongodb2.version>2.14.3</mongodb2.version>
     <mongodb3.version>3.6.1</mongodb3.version>
     <compiler.plugin.version>3.7.0</compiler.plugin.version>
@@ -627,8 +627,6 @@
         <groupId>com.conversantmedia</groupId>
         <artifactId>disruptor</artifactId>
         <version>${conversantDisruptorVersion}</version>
-        <!-- TODO: this can be switched based on a profile -->
-        <classifier>jdk7</classifier>
       </dependency>
       <dependency>
         <groupId>org.jctools</groupId>

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -67,6 +67,9 @@
       <action issue="LOG4J2-2082" dev="ggregory" type="update" due-to="Gary Gregory">
         Update Apache Flume from 1.7.0 to 1.8.0.
       </action>      
+      <action issue="LOG4J2-2079" dev="ggregory" type="update" due-to="Gary Gregory">
+        Update Conversant Disruptor from 1.12.10 to 1.12.11.
+      </action>      
     </release>
     <release version="2.11.0" date="2018-xx-xx" description="GA Release 2.11.0">
       <action issue="LOG4J2-2254" dev="rgoers" type="fix">