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
The following commit(s) were added to refs/heads/release-2.x by this push:
new 4f56062 Update Woodstox 5.0.3 -> 6.2.3 to match Jackson 2.12.1.
4f56062 is described below
commit 4f56062dbbc99c7980522d5db9980b36fec1fdcc
Author: Gary Gregory <[email protected]>
AuthorDate: Tue Feb 2 22:03:23 2021 -0500
Update Woodstox 5.0.3 -> 6.2.3 to match Jackson 2.12.1.
---
log4j-core-its/pom.xml | 5 ++---
log4j-core/pom.xml | 4 ++--
pom.xml | 2 ++
src/changes/changes.xml | 3 +++
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/log4j-core-its/pom.xml b/log4j-core-its/pom.xml
index 42b11ab..2c43352 100644
--- a/log4j-core-its/pom.xml
+++ b/log4j-core-its/pom.xml
@@ -96,14 +96,13 @@
<artifactId>jackson-dataformat-xml</artifactId>
<optional>true</optional>
</dependency>
- <!-- POM for jackson-dataformat-xml 2.9.2 depends on woodstox-core 5.0.3
-->
+ <!-- POM for jackson-dataformat-xml depends on woodstox-core -->
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
- <version>5.0.3</version>
+ <version>${woodstox.version}</version>
<optional>true</optional>
</dependency>
-
<!-- TEST DEPENDENCIES -->
<!-- Log4j 1.2 tests -->
<dependency>
diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml
index 24e4e58..dfe53ed 100644
--- a/log4j-core/pom.xml
+++ b/log4j-core/pom.xml
@@ -95,11 +95,11 @@
<artifactId>jackson-dataformat-xml</artifactId>
<optional>true</optional>
</dependency>
- <!-- POM for jackson-dataformat-xml 2.9.2 depends on woodstox-core 5.0.3
-->
+ <!-- POM for jackson-dataformat-xml depends on woodstox-core -->
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
- <version>5.0.3</version>
+ <version>${woodstox.version}</version>
<optional>true</optional>
</dependency>
<!-- Required for console color support in Windows -->
diff --git a/pom.xml b/pom.xml
index 12b0cdf..023aa67 100644
--- a/pom.xml
+++ b/pom.xml
@@ -198,6 +198,8 @@
<elastic.version>7.6.2</elastic.version>
<mongodb3.version>3.12.7</mongodb3.version>
<mongodb4.version>4.2.0</mongodb4.version>
+ <!-- POM for jackson-dataformat-xml 2.12.1 depends on woodstox-core 6.2.3
-->
+ <woodstox.version>6.2.3</woodstox.version>
<groovy.version>3.0.7</groovy.version>
<compiler.plugin.version>3.8.1</compiler.plugin.version>
<pmd.plugin.version>3.10.0</pmd.plugin.version>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 59a6f31..b3d3e30 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -156,6 +156,9 @@
<action dev="ggregory" type="update">
Update net.javacrumbs.json-unit:json-unit 2.22.0 -> 2.23.0.
</action>
+ <action dev="ggregory" type="update">
+ Update Woodstox 5.0.3 -> 6.2.3 to match Jackson 2.12.1.
+ </action>
</release>
<release version="2.14.0" date="2020-11-06" description="GA Release
2.14.0">
<action issue="LOG4J2-2925" dev="rgoers" type="fix">
