From 9be9b9dbe2ba574ab71321bdbb70defcfb59078b Mon Sep 17 00:00:00 2001
From: exceptionfactory <exceptionfactory@apache.org>
Date: Tue, 15 Jun 2021 16:32:39 -0500
Subject: [PATCH] NIFI-8708 Upgraded Spring Framework to 5.3.8 for several
 extensions

- nifi-vault-utils
- nifi-email-bundle
- nifi-redis-bundle

Signed-off-by: Pierre Villard <pierre.villard.fr@gmail.com>

This closes #5163.
---
 nifi-commons/nifi-vault-utils/pom.xml      | 15 ++++++++++++++-
 nifi-nar-bundles/nifi-email-bundle/pom.xml | 13 +++++++++++--
 nifi-nar-bundles/nifi-redis-bundle/pom.xml | 13 ++++++++++++-
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/nifi-commons/nifi-vault-utils/pom.xml b/nifi-commons/nifi-vault-utils/pom.xml
index 190388908c..987e4a79a5 100644
--- a/nifi-commons/nifi-vault-utils/pom.xml
+++ b/nifi-commons/nifi-vault-utils/pom.xml
@@ -20,6 +20,20 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-vault-utils</artifactId>
+    <properties>
+        <spring.version>5.3.8</spring.version>
+    </properties>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-framework-bom</artifactId>
+                <version>${spring.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
         <dependency>
             <groupId>org.springframework.vault</groupId>
@@ -29,7 +43,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>5.3.6</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
diff --git a/nifi-nar-bundles/nifi-email-bundle/pom.xml b/nifi-nar-bundles/nifi-email-bundle/pom.xml
index 1a64b63331..807d9e44f8 100644
--- a/nifi-nar-bundles/nifi-email-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-email-bundle/pom.xml
@@ -24,12 +24,14 @@
     <artifactId>nifi-email-bundle</artifactId>
     <packaging>pom</packaging>
     <description>NiFi Email Processor Set</description>
-	
+    <properties>
+        <spring.version>5.3.8</spring.version>
+    </properties>
     <modules>
         <module>nifi-email-processors</module>
         <module>nifi-email-nar</module>
     </modules>
-	
+
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -37,6 +39,13 @@
                 <artifactId>nifi-email-processors</artifactId>
                 <version>1.14.0-SNAPSHOT</version>
             </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-framework-bom</artifactId>
+                <version>${spring.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>
diff --git a/nifi-nar-bundles/nifi-redis-bundle/pom.xml b/nifi-nar-bundles/nifi-redis-bundle/pom.xml
index 67f27092b5..1319e21dda 100644
--- a/nifi-nar-bundles/nifi-redis-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-redis-bundle/pom.xml
@@ -27,7 +27,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <spring.data.redis.version>2.5.0</spring.data.redis.version>
+        <spring.data.redis.version>2.5.1</spring.data.redis.version>
         <spring.version>5.3.8</spring.version>
         <jedis.version>3.6.0</jedis.version>
     </properties>
@@ -39,4 +39,15 @@
         <module>nifi-redis-nar</module>
     </modules>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-framework-bom</artifactId>
+                <version>${spring.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 </project>