Repository: logging-log4j2 Updated Branches: refs/heads/master a6f9d12bd -> 2b2f64e77
[LOG4J2-1781]: Update Conversant Disruptor from 1.2.7 to 1.2.10 Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/2b2f64e7 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/2b2f64e7 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/2b2f64e7 Branch: refs/heads/master Commit: 2b2f64e77ee6dbee05cfd8e5a1ff07380c18e303 Parents: a6f9d12 Author: Matt Sicker <[email protected]> Authored: Sat Jan 14 02:46:31 2017 -0600 Committer: Matt Sicker <[email protected]> Committed: Sat Jan 14 02:46:31 2017 -0600 ---------------------------------------------------------------------- log4j-core/pom.xml | 1 + log4j-perf/pom.xml | 1 + pom.xml | 4 +++- src/changes/changes.xml | 3 +++ 4 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2b2f64e7/log4j-core/pom.xml ---------------------------------------------------------------------- diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml index 6cb6f29..2f263f2 100644 --- a/log4j-core/pom.xml +++ b/log4j-core/pom.xml @@ -54,6 +54,7 @@ <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/2b2f64e7/log4j-perf/pom.xml ---------------------------------------------------------------------- diff --git a/log4j-perf/pom.xml b/log4j-perf/pom.xml index a027651..a6b3b8c 100644 --- a/log4j-perf/pom.xml +++ b/log4j-perf/pom.xml @@ -93,6 +93,7 @@ <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/2b2f64e7/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 26b7717..7ceccdd 100644 --- a/pom.xml +++ b/pom.xml @@ -194,7 +194,7 @@ <springVersion>3.2.18.RELEASE</springVersion> <flumeVersion>1.7.0</flumeVersion> <disruptorVersion>3.3.6</disruptorVersion> - <conversantDisruptorVersion>1.2.8-JDK7</conversantDisruptorVersion> + <conversantDisruptorVersion>1.2.10</conversantDisruptorVersion> <compiler.plugin.version>3.6.0</compiler.plugin.version> <pmd.plugin.version>3.7</pmd.plugin.version> <findbugs.plugin.version>3.0.4</findbugs.plugin.version> @@ -620,6 +620,8 @@ <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/2b2f64e7/src/changes/changes.xml ---------------------------------------------------------------------- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index d3d82fc..8accf57 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -201,6 +201,9 @@ <action issue="LOG4J2-1756" dev="ggregory" type="fix" due-to="shubhankar1100"> Adds xmlns in schema and some other tags. </action> + <action issue="LOG4J2-1781" dev="mattsicker" type="update"> + Update Conversant Disruptor from 1.2.7 to 1.2.10 + </action> <action issue="LOG4J2-1774" dev="mattsicker" type="update"> Replace MockEJB dependency in unit tests with Spring Test and Mockito. </action>
