Fixed conflicting commons-logging and spring jcl
Change-Id: I0a87d100c04ff8032ee425a1d2c349779dd57579
diff --git a/full/Changes b/full/Changes
index fc6b2c9..ad63867 100644
--- a/full/Changes
+++ b/full/Changes
@@ -5,7 +5,9 @@
- Updated Spring 5.x to 6.x and jetty 9.x to 11.x (#645)
- Replaced javax.persistence with jakarta.persistence (#648)
- Migrate Hibernate 5 to 6 (#649)
-- Fix missing placeholders
+- Fix missing placeholders
+- Fixed conflicting jackson-jarxrs
+- Fixed conflicting commons-logging and spring jcl
# version 0.71
diff --git a/full/pom.xml b/full/pom.xml
index bf4085c..5ddf970 100644
--- a/full/pom.xml
+++ b/full/pom.xml
@@ -429,12 +429,24 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
<version>2.9.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
<version>1.7</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -602,6 +614,12 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.14</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -745,6 +763,12 @@
<groupId>org.apache.velocity.tools</groupId>
<artifactId>velocity-tools-generic</artifactId>
<version>3.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- Mail -->