Repository: logging-log4j2 Updated Branches: refs/heads/master dbfedf7db -> 233d9e230
[LOG4J2-2079] Update Conversant Disruptor from 1.12.10 to 1.12.11. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/233d9e23 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/233d9e23 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/233d9e23 Branch: refs/heads/master Commit: 233d9e230338f884c93b86ce88ebb580df335b2b Parents: dbfedf7 Author: Gary Gregory <garydgreg...@gmail.com> Authored: Mon Feb 19 22:53:32 2018 -0700 Committer: Gary Gregory <garydgreg...@gmail.com> Committed: Mon Feb 19 22:53:32 2018 -0700 ---------------------------------------------------------------------- log4j-core-its/pom.xml | 1 - log4j-core/pom.xml | 1 - log4j-perf/pom.xml | 1 - pom.xml | 6 ++---- src/changes/changes.xml | 3 +++ 5 files changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/233d9e23/log4j-core-its/pom.xml ---------------------------------------------------------------------- diff --git a/log4j-core-its/pom.xml b/log4j-core-its/pom.xml index 513fce3..fc25818 100644 --- 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 --> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/233d9e23/log4j-core/pom.xml ---------------------------------------------------------------------- diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml index 196e4e5..b0813d4 100644 --- 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 --> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/233d9e23/log4j-perf/pom.xml ---------------------------------------------------------------------- diff --git a/log4j-perf/pom.xml b/log4j-perf/pom.xml index 02e3162..3fb9af9 100644 --- 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> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/233d9e23/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b5f0a47..82218cf 100644 --- 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> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/233d9e23/src/changes/changes.xml ---------------------------------------------------------------------- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index c279e01..50e621e 100644 --- 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">
