From f02cd6b4267ebd0fb65f221a587bb9ed6b1345a6 Mon Sep 17 00:00:00 2001
From: Brindaban Das <brindaban.das@ibm.com>
Date: Thu, 13 Oct 2022 12:53:34 +0000
Subject: [PATCH] Merge branch 'IBM-spring-version-upgrade' into 'master'
upgrading spring version for avoiding issue related of "org/springframework/core/log/logmessage "
See merge request osdu/platform/system/notification!278
(cherry picked from commit 2cb78f8e79b67bc92b08b2517fadebafd87572d2)
5e990372 spring version upgrade
fcd82ce8 upgrading spring version to 5.7.3
---
provider/notification-ibm/pom.xml | 30 ++++++++++++++++++------------
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/provider/notification-ibm/pom.xml b/provider/notification-ibm/pom.xml
index 42d890fe8..0c6eb834d 100644
--- a/provider/notification-ibm/pom.xml
+++ b/provider/notification-ibm/pom.xml
@@ -38,6 +38,18 @@
<jackson.version>2.13.2</jackson.version>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>2.5.6</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<!-- <dependency>
<groupId>org.opengroup.osdu</groupId>
@@ -128,19 +140,13 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
- <version>5.3.8.RELEASE</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- </exclusion>
- </exclusions>
+ <version>5.7.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-config</artifactId>
+ <version>5.7.3</version>
</dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- <version>5.7.3</version>
- </dependency>
<dependency>
<groupId>io.undertow</groupId>
<artifactId>undertow-core</artifactId>
--
GitLab