From c8a6e5059c933e93130115bfcd96150216b28efc Mon Sep 17 00:00:00 2001
From: Morris Estepa <estepamo@amazon.com>
Date: Mon, 8 Aug 2022 17:46:04 +0000
Subject: [PATCH] Merge branch 'aws-integration' into 'master'
spring-webmvc upgrade
Closes #38
See merge request osdu/platform/system/notification!239
(cherry picked from commit 0497d7a44c2dde2abec87b11fe7167df79d7fa9b)
b77f4e57 Squashed commit of the following
3574d19c Merge remote-tracking branch 'origin/master' into dev
3cd5c5c3 Merge remote-tracking branch 'origin/master' into...
8a61c705 Merge remote-tracking branch 'origin/master' into dev
9b9dff42 Merge remote-tracking branch 'origin/master' into...
7e767948 Update os-core-lib-aws version to 0.14.0-rc2
87dc64a1 Merge from master to dev
bfb02472 Merge branch 'master' into master-dev-merge
b56468e0 Merge branch 'master' into master-dev-merge
6ba21deb Merge branch 'master' into master-dev-merge
0d1999d6 Merge branch 'master' into master-dev-merge
3f3db46a Squashed commit of the following:
bb36944d Merge remote-tracking branch 'origin/master' into...
6653a353 Merge branch 'master' into master-dev-merge
ce3d4649 Squashed commit of the following
---
provider/notification-aws/pom.xml | 7 +++++++
provider/notification-azure/pom.xml | 7 +++++++
2 files changed, 14 insertions(+)
diff --git a/provider/notification-aws/pom.xml b/provider/notification-aws/pom.xml
index ddbc7390d..10044013e 100644
--- a/provider/notification-aws/pom.xml
+++ b/provider/notification-aws/pom.xml
@@ -40,6 +40,7 @@
<os-core-common.version>0.14.0</os-core-common.version>
<jackson-databind.version>2.13.2.2</jackson-databind.version>
<jackson.version>2.13.2</jackson.version>
+ <spring-webmvc.version>5.3.22</spring-webmvc.version>
</properties>
<dependencyManagement>
@@ -93,6 +94,12 @@
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>${spring-webmvc.version}</version>
+ </dependency>
+
<!-- unit test dependencies -->
<dependency>
<groupId>org.powermock</groupId>
diff --git a/provider/notification-azure/pom.xml b/provider/notification-azure/pom.xml
index ab56aba3f..a345b6f9f 100644
--- a/provider/notification-azure/pom.xml
+++ b/provider/notification-azure/pom.xml
@@ -52,6 +52,7 @@
<woodstox-core.version>5.3.0</woodstox-core.version>
<jackson-databind.version>2.13.2.2</jackson-databind.version>
<jackson.version>2.13.2</jackson.version>
+ <spring-webmvc.version>5.3.22</spring-webmvc.version>
</properties>
<dependencyManagement>
@@ -149,6 +150,12 @@
<version>${jackson.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>${spring-webmvc.version}</version>
+ </dependency>
+
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
--
GitLab