You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2015/08/13 09:32:00 UTC
[2/2] logging-log4j2 git commit: Revert "Revert "[LOG4J2-1092] Update
Jackson from 2.6.0 to 2.6.1.""
Revert "Revert "[LOG4J2-1092] Update Jackson from 2.6.0 to 2.6.1.""
This reverts commit 126eaa91bdd76a98cbd9b74647f67c8693d1f097.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/940d4d3a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/940d4d3a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/940d4d3a
Branch: refs/heads/master
Commit: 940d4d3a9d765b7f8ffd8cc0c13359b7c3ede3c3
Parents: 126eaa9
Author: ggregory <gg...@apache.org>
Authored: Thu Aug 13 00:31:27 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Thu Aug 13 00:31:27 2015 -0700
----------------------------------------------------------------------
log4j-core/pom.xml | 6 ++++++
src/changes/changes.xml | 3 +++
2 files changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/940d4d3a/log4j-core/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml
index 79ab281..5f44d86 100644
--- a/log4j-core/pom.xml
+++ b/log4j-core/pom.xml
@@ -114,6 +114,12 @@
<artifactId>commons-compress</artifactId>
<optional>true</optional>
</dependency>
+ <!-- Used for the CSV layout -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-csv</artifactId>
+ <optional>true</optional>
+ </dependency>
<!-- TEST DEPENDENCIES -->
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/940d4d3a/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index daabda6..f525871 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -196,6 +196,9 @@
<action issue="LOG4J2-1879" dev="ggregory" type="update">
Update Jackson from 2.5.4 to 2.6.0.
</action>
+ <action issue="LOG4J2-1092" dev="ggregory" type="update">
+ Update Jackson from 2.6.0 to 2.6.1.
+ </action>
</release>
<release version="2.3" date="2015-05-09" description="GA Release 2.3">
<action issue="LOG4J2-1009" dev="ggregory" type="fix" due-to="Mikael Ståldal">