This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch fix-conflict-deps
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 39f81575f9c18784d0ae90edb6daed45b6a0fb84
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Sun Oct 15 13:48:23 2023 +1100
Upgrade Jackson and remove unnecessary transitive override
---
pom.xml | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index d0a5aed20..7865fb7af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,7 +110,7 @@
<!-- dependency versions in alphanumeric order -->
<asm.version>9.5</asm.version>
- <jackson.version>2.15.2</jackson.version>
+ <jackson.version>2.15.3</jackson.version>
<log4j2.version>2.20.0</log4j2.version>
<ognl.version>3.3.4</ognl.version>
<slf4j.version>2.0.7</slf4j.version>
@@ -1102,14 +1102,6 @@
<version>${jackson.version}</version>
</dependency>
- <!-- FIXME: Workaround for jackson-dataformat-xml issue #340 of
forgetting to update stax2-api -->
- <!--
https://github.com/FasterXML/jackson-dataformat-xml/issues/340 -->
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>stax2-api</artifactId>
- <version>4.2.1</version>
- </dependency>
-
<dependency>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-marshall</artifactId>
