This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 61ae065c9b Upgrading WoodStox and Gson
61ae065c9b is described below
commit 61ae065c9b98fc6c8dd5d551d76d010d5324565c
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Tue Aug 23 09:23:26 2022 +0200
Upgrading WoodStox and Gson
---
client/console/pom.xml | 6 +++++-
core/rest-cxf/pom.xml | 6 +++++-
pom.xml | 26 +++++++++++++++++++++++++-
3 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/client/console/pom.xml b/client/console/pom.xml
index 67ab9993c5..5bdcac3b46 100644
--- a/client/console/pom.xml
+++ b/client/console/pom.xml
@@ -94,7 +94,11 @@ under the License.
<groupId>de.agilecoders.wicket</groupId>
<artifactId>wicket-bootstrap-extensions</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.syncope.client</groupId>
<artifactId>syncope-client-lib</artifactId>
diff --git a/core/rest-cxf/pom.xml b/core/rest-cxf/pom.xml
index b041a9bc90..c08ea4b165 100644
--- a/core/rest-cxf/pom.xml
+++ b/core/rest-cxf/pom.xml
@@ -99,13 +99,17 @@ under the License.
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.woodstox</groupId>
+ <artifactId>woodstox-core</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.syncope.common</groupId>
<artifactId>syncope-common-rest-api</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
</dependency>
-
+
<dependency>
<groupId>org.apache.syncope.core</groupId>
<artifactId>syncope-core-logic</artifactId>
diff --git a/pom.xml b/pom.xml
index 8a76361ecd..25241081a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -623,6 +623,12 @@ under the License.
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>${cxf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.woodstox</groupId>
+ <artifactId>woodstox-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -679,6 +685,11 @@ under the License.
<artifactId>cxf-rt-rs-extension-providers</artifactId>
<version>${cxf.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.woodstox</groupId>
+ <artifactId>woodstox-core</artifactId>
+ <version>5.3.0</version>
+ </dependency>
<!-- /CXF -->
<!-- Swagger -->
@@ -797,10 +808,14 @@ under the License.
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>woodstox-core-asl</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- /OpenSAML -->
-
+
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>elasticsearch-rest-high-level-client</artifactId>
@@ -1373,8 +1388,17 @@ under the License.
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>2.8.9</version>
+ </dependency>
<!-- /Wicket -->
<dependency>
