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 2021/01/16 17:29:51 UTC

[logging-log4j2] branch release-2.x updated (06b31d2 -> acc5c68)

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a change to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.


    from 06b31d2  LOG4J2-2998 Fix truncation of excessive strings ending with a high surrogate in JsonWriter. (#457)
     add 750e914  Update some dependencies.
     new d2adba0  Merge branch 'release-2.x' of https://gitbox.apache.org/repos/asf/logging-log4j2 into release-2.x
     new acc5c68  - [test] Mockito 3.6.0 -> 3.7.0. - [test] XML Unit 2.8.0 -> 2.8.2. - [test] JSON Unit 2.21.0 -> 2.22.0.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml                 |  2 +-
 src/changes/changes.xml | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)


[logging-log4j2] 02/02: - [test] Mockito 3.6.0 -> 3.7.0. - [test] XML Unit 2.8.0 -> 2.8.2. - [test] JSON Unit 2.21.0 -> 2.22.0.

Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git

commit acc5c6836507dd41f46398c3a72a7d28daae8dcf
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jan 16 12:29:46 2021 -0500

    - [test] Mockito 3.6.0 -> 3.7.0.
    - [test] XML Unit 2.8.0 -> 2.8.2.
    - [test] JSON Unit 2.21.0 -> 2.22.0.
---
 pom.xml                 |  2 +-
 src/changes/changes.xml | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index e3f22a5..974682f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -188,7 +188,7 @@
     <slf4jVersion>1.7.25</slf4jVersion>
     <logbackVersion>1.2.3</logbackVersion>
     <jackson1Version>1.9.13</jackson1Version>
-    <jackson2Version>2.12.0</jackson2Version>
+    <jackson2Version>2.12.1</jackson2Version>
     <spring-boot.version>2.3.6.RELEASE</spring-boot.version>
     <springVersion>5.3.2</springVersion>
     <kubernetes-client.version>4.6.1</kubernetes-client.version>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 5264b56..843b316 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -109,7 +109,19 @@
         Update de.flapdoodle.embed:de.flapdoodle.embed.mongo 2.2.0 -> 3.0.0.
       </action>
       <action dev="ggregory" type="update">
-        Update net.javacrumbs.json-unit:json-unit 1.31.1 -> 2.21.0.
+        Update net.javacrumbs.json-unit:json-unit 1.31.1 -> 2.22.0.
+      </action>
+      <action dev="ggregory" type="update">
+        Update Mockito 3.6.0 -> 3.7.0.
+      </action>
+      <action dev="ggregory" type="update">
+        Update XML Unit 2.8.0 -> 2.8.2.
+      </action>
+      <action dev="ggregory" type="update">
+        Update JSON Unit 2.21.0 -> 2.22.0.
+      </action>
+      <action dev="ggregory" type="update">
+        Update JaCoCo 0.8.3 -> 0.8.6.
       </action>
       <action issue="LOG4J2-2967" dev="ckozak" type="fix">
         Fix JsonTemplateLayout index based parameter resolution when messages contain too few parameters.


[logging-log4j2] 01/02: Merge branch 'release-2.x' of https://gitbox.apache.org/repos/asf/logging-log4j2 into release-2.x

Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git

commit d2adba0d6d554edebabd7367c3a7a7af6af09192
Merge: 750e914 06b31d2
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jan 16 11:17:55 2021 -0500

    Merge branch 'release-2.x' of https://gitbox.apache.org/repos/asf/logging-log4j2 into release-2.x

 .../layout/template/json/util/JsonWriter.java      |  12 +-
 .../layout/template/json/util/JsonWriterTest.java  | 142 +++++++++++++++++++--
 src/changes/changes.xml                            |   3 +
 3 files changed, 142 insertions(+), 15 deletions(-)