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 2017/11/13 15:54:26 UTC

[1/2] logging-log4j2 git commit: [LOG4J2-2117] Jackson dependencies for 2.9.2 incorrectly bring in jackson-annotations 2.9.0 instead of 2.9.2.

Repository: logging-log4j2
Updated Branches:
  refs/heads/master 8b71dbbf1 -> ac82a0d78


[LOG4J2-2117] Jackson dependencies for 2.9.2 incorrectly bring in
jackson-annotations 2.9.0 instead of 2.9.2.

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

Branch: refs/heads/master
Commit: d5d2c47cb2f024c158e256b77dc39380f35e744a
Parents: d85f39a
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Nov 13 08:53:54 2017 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Nov 13 08:53:54 2017 -0700

----------------------------------------------------------------------
 pom.xml                 | 6 ++++++
 src/changes/changes.xml | 3 +++
 2 files changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d5d2c47c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b211ce1..71ffc56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -549,6 +549,12 @@
         <optional>true</optional>
       </dependency>
       <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-annotations</artifactId>
+        <version>${jackson2Version}</version>
+        <optional>true</optional>
+      </dependency>
+      <dependency>
         <groupId>com.fasterxml.jackson.dataformat</groupId>
         <artifactId>jackson-dataformat-yaml</artifactId>
         <version>${jackson2Version}</version>

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d5d2c47c/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 7532de2..683a67c 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -155,6 +155,9 @@
       <action issue="LOG4J2-2077" dev="ggregory" type="update">
         Update from Jackson 2.9.1 to 2.9.2.
       </action>
+      <action issue="LOG4J2-2117" dev="ggregory" type="update">
+        Jackson dependencies for 2.9.2 incorrectly bring in jackson-annotations 2.9.0 instead of 2.9.2.
+      </action>
     </release>
     <release version="2.9.1" date="2017-09-17" description="GA Release 2.9.1">
       <action issue="LOG4J2-1988" dev="rpopma" type="fix">


[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git

Posted by gg...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git

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

Branch: refs/heads/master
Commit: ac82a0d782a583f059778f0db3c6012180747fb3
Parents: d5d2c47 8b71dbb
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Nov 13 08:54:09 2017 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Nov 13 08:54:09 2017 -0700

----------------------------------------------------------------------
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------