You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2023/11/10 11:33:15 UTC
(cxf) branch 3.5.x-fixes updated: Updating Johnzon to 1.2.21 to fix CVE-2023-33008 (#1511) (#1515)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.5.x-fixes by this push:
new cac0396188 Updating Johnzon to 1.2.21 to fix CVE-2023-33008 (#1511) (#1515)
cac0396188 is described below
commit cac0396188038974522356b7d47e208fab755163
Author: Colm O hEigeartaigh <co...@users.noreply.github.com>
AuthorDate: Fri Nov 10 11:33:10 2023 +0000
Updating Johnzon to 1.2.21 to fix CVE-2023-33008 (#1511) (#1515)
(cherry picked from commit 3288448e4bbc838b7e4d6461c59b4ebb8aaf6d96)
# Conflicts:
# parent/pom.xml
(cherry picked from commit 68acd8632245c4c80eda297bbd55c2f278ce1c0d)
---
.gitmergeinfo | 2 ++
parent/pom.xml | 2 +-
systests/jaxrs/pom.xml | 5 +++++
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index cfc2d196c5..bcf37cc74e 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -284,6 +284,7 @@ B b9214b2ffe3233abf7774332ec689e797e66e4ec
B b95a78da9fbee0dafee5c50cfa86d0965e680355
B b9666d75e27125006796ae9799b35c5577eb996f
B ba1352fa40ed0c7c5a1fbeca8c26364c5e28508e
+B ba461cfb01b4f222863061fcc0c85dad7fc091db
B ba48072b39a32d22b2d1323767cfd26daebd430d
B ba839e6b1f3ee5c26fd600834ea10227dd4cc317
B baa236c1b3cea938aecb29c5d4aaa704e08c79f9
@@ -552,6 +553,7 @@ M 65fd67d7e3d9ad8ed211c1fdeca91c4e75d81149
M 6618c5404b2a84ae9e40180dffbf90061026dc62
M 66afbe72d25741389d362bfb0c8bec9f5dbb5ee4
M 67d98fdc015ec4abba00cfac833e41481617c394
+M 68acd8632245c4c80eda297bbd55c2f278ce1c0d
M 6a30d229f487a9446431a4c254c46d74be26a200
M 6a469f8387d05c95f66d0d2ad44831d3c727be23
M 6ae75647f08feeec514f343845d9f394d7fa5553
diff --git a/parent/pom.xml b/parent/pom.xml
index ea242c8ee3..f9c74cd4d3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -158,7 +158,7 @@
<cxf.jetty.version>${cxf.jetty9.version}</cxf.jetty.version>
<cxf.jexl.version>3.3</cxf.jexl.version>
<cxf.joda.time.version>2.10.10</cxf.joda.time.version>
- <cxf.johnzon.version>1.2.20</cxf.johnzon.version>
+ <cxf.johnzon.version>1.2.21</cxf.johnzon.version>
<cxf.json.api.version>1.1.6</cxf.json.api.version>
<cxf.json.bind-api.version>1.0.2</cxf.json.bind-api.version>
<cxf.jsr250.api.version>1.0</cxf.jsr250.api.version>
diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml
index 56f41bf530..7ce88c941e 100644
--- a/systests/jaxrs/pom.xml
+++ b/systests/jaxrs/pom.xml
@@ -551,6 +551,11 @@
<artifactId>jakarta.json.bind-api</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.johnzon</groupId>
+ <artifactId>johnzon-core</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-jsonb</artifactId>