This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 81e57c9 NIFI-9535 Upgraded Spring Framework to 5.3.14
81e57c9 is described below
commit 81e57c9651b8ebc1bc2cfe612e18161c8feabade
Author: exceptionfactory <[email protected]>
AuthorDate: Tue Jan 4 19:06:20 2022 -0600
NIFI-9535 Upgraded Spring Framework to 5.3.14
- Centralized Spring Framework and Spring Security versions using BOM
dependencies
- Upgraded Spring Security from 5.5.2 to 5.6.1
- Upgraded Spring Boot from 2.5.5 to 2.5.8 in Registry
- Upgraded Spring Integration from 5.5.2 to 5.5.7
Signed-off-by: Pierre Villard <[email protected]>
This closes #5631.
---
minifi/pom.xml | 53 ---------------------
nifi-commons/nifi-vault-utils/pom.xml | 12 -----
nifi-nar-bundles/nifi-atlas-bundle/pom.xml | 11 -----
nifi-nar-bundles/nifi-easyrules-bundle/pom.xml | 9 ----
.../nifi-email-processors/pom.xml | 2 +-
nifi-nar-bundles/nifi-email-bundle/pom.xml | 10 ----
.../nifi-framework/nifi-headless-server/pom.xml | 1 -
.../nifi-framework/nifi-web/nifi-jetty/pom.xml | 1 -
.../nifi-framework/nifi-web/nifi-web-api/pom.xml | 1 -
.../nifi-web/nifi-web-security/pom.xml | 1 -
.../nifi-framework-bundle/nifi-server-nar/pom.xml | 8 ----
nifi-nar-bundles/nifi-framework-bundle/pom.xml | 55 ----------------------
nifi-nar-bundles/nifi-ignite-bundle/pom.xml | 10 ----
.../nifi-jms-bundle/nifi-jms-processors/pom.xml | 4 --
.../nifi-kerberos-iaa-providers/pom.xml | 1 -
.../nifi-kerberos-iaa-providers-bundle/pom.xml | 16 -------
.../nifi-ldap-iaa-providers/pom.xml | 3 --
.../nifi-ldap-iaa-providers-bundle/pom.xml | 10 ----
.../nifi-redis-extensions/pom.xml | 1 -
nifi-nar-bundles/nifi-redis-bundle/pom.xml | 13 -----
.../nifi-rules-action-handler-service/pom.xml | 6 ---
.../nifi-spring-processors/pom.xml | 5 +-
.../nifi-hwx-schema-registry-service/pom.xml | 1 -
.../nifi-hwx-schema-registry-bundle/pom.xml | 38 ---------------
.../nifi-registry-revision-spring-jdbc/pom.xml | 2 -
nifi-registry/nifi-registry-core/pom.xml | 1 -
nifi-registry/pom.xml | 4 +-
pom.xml | 16 +++++++
28 files changed, 19 insertions(+), 276 deletions(-)
diff --git a/minifi/pom.xml b/minifi/pom.xml
index e01dabc..e288dad 100644
--- a/minifi/pom.xml
+++ b/minifi/pom.xml
@@ -42,8 +42,6 @@ limitations under the License.
</modules>
<properties>
<jersey.version>2.29</jersey.version>
- <spring.version>5.3.11</spring.version>
- <spring.security.version>5.5.2</spring.security.version>
<system.rules.version>1.16.1</system.rules.version>
<aws.sdk.version>1.11.172</aws.sdk.version>
<yammer.metrics.version>2.2.0</yammer.metrics.version>
@@ -571,57 +569,6 @@ limitations under the License.
<version>2.3.2</version>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-expression</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
<version>${spring.security.version}</version>
diff --git a/nifi-commons/nifi-vault-utils/pom.xml
b/nifi-commons/nifi-vault-utils/pom.xml
index a950e58..639be11 100644
--- a/nifi-commons/nifi-vault-utils/pom.xml
+++ b/nifi-commons/nifi-vault-utils/pom.xml
@@ -21,20 +21,8 @@
</parent>
<artifactId>nifi-vault-utils</artifactId>
<properties>
- <spring.version>5.3.11</spring.version>
<spring.vault.version>2.3.2</spring.vault.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>
diff --git a/nifi-nar-bundles/nifi-atlas-bundle/pom.xml
b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml
index fe1a494..f583927 100644
--- a/nifi-nar-bundles/nifi-atlas-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml
@@ -27,7 +27,6 @@
<properties>
<atlas.version>2.2.0</atlas.version>
- <spring.version>5.3.11</spring.version>
</properties>
<modules>
@@ -81,16 +80,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
- </dependency>
<!-- Override commons-compress -->
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/nifi-nar-bundles/nifi-easyrules-bundle/pom.xml
b/nifi-nar-bundles/nifi-easyrules-bundle/pom.xml
index d19b638..a7cbf84 100644
--- a/nifi-nar-bundles/nifi-easyrules-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-easyrules-bundle/pom.xml
@@ -23,9 +23,6 @@
<artifactId>nifi-easyrules-bundle</artifactId>
<packaging>pom</packaging>
- <properties>
- <spring.version>5.3.11</spring.version>
- </properties>
<modules>
<module>nifi-easyrules-service</module>
<module>nifi-easyrules-nar</module>
@@ -38,12 +35,6 @@
<artifactId>nifi-easyrules-service</artifactId>
<version>1.16.0-SNAPSHOT</version>
</dependency>
- <!-- Set Spring Expression version for easy-rules-spel -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-expression</artifactId>
- <version>${spring.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
</project>
\ No newline at end of file
diff --git a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
index 6225600..048adab 100644
--- a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
@@ -25,7 +25,7 @@
<artifactId>nifi-email-processors</artifactId>
<packaging>jar</packaging>
<properties>
- <spring.integration.version>5.5.2</spring.integration.version>
+ <spring.integration.version>5.5.7</spring.integration.version>
</properties>
<dependencies>
diff --git a/nifi-nar-bundles/nifi-email-bundle/pom.xml
b/nifi-nar-bundles/nifi-email-bundle/pom.xml
index c1f311e..fe53140 100644
--- a/nifi-nar-bundles/nifi-email-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-email-bundle/pom.xml
@@ -24,9 +24,6 @@
<artifactId>nifi-email-bundle</artifactId>
<packaging>pom</packaging>
<description>NiFi Email Processor Set</description>
- <properties>
- <spring.version>5.3.11</spring.version>
- </properties>
<modules>
<module>nifi-email-processors</module>
<module>nifi-email-nar</module>
@@ -39,13 +36,6 @@
<artifactId>nifi-email-processors</artifactId>
<version>1.16.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-framework-bundle/nifi-framework/nifi-headless-server/pom.xml
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-headless-server/pom.xml
index 57d24ab..bcbb49b 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-headless-server/pom.xml
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-headless-server/pom.xml
@@ -67,7 +67,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>${spring.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
index 077a8f0..d03e8ab 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
@@ -206,7 +206,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>${spring.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
index 4c855b2..29ad217 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
@@ -404,7 +404,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>${spring.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/pom.xml
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/pom.xml
index f24b7d7..861f0ec 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/pom.xml
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/pom.xml
@@ -251,7 +251,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>${spring.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-server-nar/pom.xml
b/nifi-nar-bundles/nifi-framework-bundle/nifi-server-nar/pom.xml
index ea17b9d..39f3e67 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-server-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-server-nar/pom.xml
@@ -113,49 +113,41 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
- <version>${spring.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>${spring.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
- <version>${spring.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
- <version>${spring.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
- <version>${spring.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml
b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
index 0c032ea..303c302 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
@@ -24,8 +24,6 @@
<description>NiFi: Framework Bundle</description>
<properties>
<curator.version>5.2.0</curator.version>
- <spring.version>5.3.11</spring.version>
- <spring.security.version>5.5.2</spring.security.version>
<zookeeper.version>3.5.9</zookeeper.version>
</properties>
<modules>
@@ -355,16 +353,6 @@
<version>1.3.7</version>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
<version>${spring.security.version}</version>
@@ -537,49 +525,6 @@
<version>1.0.1.RELEASE</version>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <!-- <artifactId>jcl-over-slf4j</artifactId> is used
- in dependencies section -->
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-resource-server</artifactId>
- <version>${spring.security.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-core</artifactId>
- <version>${spring.security.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-jose</artifactId>
- <version>${spring.security.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
<version>4.4</version>
diff --git a/nifi-nar-bundles/nifi-ignite-bundle/pom.xml
b/nifi-nar-bundles/nifi-ignite-bundle/pom.xml
index b5f02e1..a10e62b 100644
--- a/nifi-nar-bundles/nifi-ignite-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-ignite-bundle/pom.xml
@@ -29,19 +29,9 @@
<module>nifi-ignite-processors</module>
<module>nifi-ignite-nar</module>
</modules>
- <properties>
- <spring.version>5.3.11</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>
- <dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ignite-processors</artifactId>
<version>1.16.0-SNAPSHOT</version>
diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml
index 2775762..49c5645 100644
--- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml
@@ -17,9 +17,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>nifi-jms-processors</artifactId>
<packaging>jar</packaging>
- <properties>
- <spring.version>5.3.11</spring.version>
- </properties>
<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
@@ -44,7 +41,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git
a/nifi-nar-bundles/nifi-kerberos-iaa-providers-bundle/nifi-kerberos-iaa-providers/pom.xml
b/nifi-nar-bundles/nifi-kerberos-iaa-providers-bundle/nifi-kerberos-iaa-providers/pom.xml
index 3f9e0a0..9748d87 100644
---
a/nifi-nar-bundles/nifi-kerberos-iaa-providers-bundle/nifi-kerberos-iaa-providers/pom.xml
+++
b/nifi-nar-bundles/nifi-kerberos-iaa-providers-bundle/nifi-kerberos-iaa-providers/pom.xml
@@ -45,7 +45,6 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-crypto</artifactId>
- <version>${spring.security.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git a/nifi-nar-bundles/nifi-kerberos-iaa-providers-bundle/pom.xml
b/nifi-nar-bundles/nifi-kerberos-iaa-providers-bundle/pom.xml
index 9f79e8c..034e537 100644
--- a/nifi-nar-bundles/nifi-kerberos-iaa-providers-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-kerberos-iaa-providers-bundle/pom.xml
@@ -26,25 +26,9 @@
<module>nifi-kerberos-iaa-providers</module>
<module>nifi-kerberos-iaa-providers-nar</module>
</modules>
- <properties>
- <spring.version>5.3.11</spring.version>
- <spring.security.version>5.5.2</spring.security.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>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- <version>${spring.security.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-kerberos-iaa-providers</artifactId>
<version>1.16.0-SNAPSHOT</version>
diff --git
a/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/pom.xml
b/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/pom.xml
index 45dfff5..e8e9ef3 100644
---
a/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/pom.xml
+++
b/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/pom.xml
@@ -22,9 +22,6 @@
</parent>
<artifactId>nifi-ldap-iaa-providers</artifactId>
<packaging>jar</packaging>
- <properties>
- <spring.security.version>5.5.2</spring.security.version>
- </properties>
<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
diff --git a/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/pom.xml
b/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/pom.xml
index b5a7035..15c2ea3 100644
--- a/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/pom.xml
@@ -26,19 +26,9 @@
<module>nifi-ldap-iaa-providers</module>
<module>nifi-ldap-iaa-providers-nar</module>
</modules>
- <properties>
- <spring.version>5.3.11</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>
- <dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ldap-iaa-providers</artifactId>
<version>1.16.0-SNAPSHOT</version>
diff --git a/nifi-nar-bundles/nifi-redis-bundle/nifi-redis-extensions/pom.xml
b/nifi-nar-bundles/nifi-redis-bundle/nifi-redis-extensions/pom.xml
index d3e1ae6..0deff7f 100644
--- a/nifi-nar-bundles/nifi-redis-bundle/nifi-redis-extensions/pom.xml
+++ b/nifi-nar-bundles/nifi-redis-bundle/nifi-redis-extensions/pom.xml
@@ -47,7 +47,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>redis.clients</groupId>
diff --git a/nifi-nar-bundles/nifi-redis-bundle/pom.xml
b/nifi-nar-bundles/nifi-redis-bundle/pom.xml
index 9d637c8..7e7173c 100644
--- a/nifi-nar-bundles/nifi-redis-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-redis-bundle/pom.xml
@@ -28,7 +28,6 @@
<properties>
<spring.data.redis.version>2.5.5</spring.data.redis.version>
- <spring.version>5.3.11</spring.version>
<jedis.version>3.6.3</jedis.version>
</properties>
@@ -38,16 +37,4 @@
<module>nifi-redis-extensions</module>
<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>
diff --git
a/nifi-nar-bundles/nifi-rules-action-handler-bundle/nifi-rules-action-handler-service/pom.xml
b/nifi-nar-bundles/nifi-rules-action-handler-bundle/nifi-rules-action-handler-service/pom.xml
index c301f1e..1e024c9 100644
---
a/nifi-nar-bundles/nifi-rules-action-handler-bundle/nifi-rules-action-handler-service/pom.xml
+++
b/nifi-nar-bundles/nifi-rules-action-handler-bundle/nifi-rules-action-handler-service/pom.xml
@@ -23,9 +23,6 @@
<artifactId>nifi-rules-action-handler-service</artifactId>
<packaging>jar</packaging>
- <properties>
- <spring.version>5.3.11</spring.version>
- </properties>
<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
@@ -69,7 +66,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.jeasy</groupId>
@@ -82,6 +78,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
-
</project>
diff --git a/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/pom.xml
b/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/pom.xml
index be2e8fc..20f9d03 100644
--- a/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/pom.xml
@@ -18,21 +18,18 @@
<artifactId>nifi-spring-processors</artifactId>
<packaging>jar</packaging>
<properties>
- <spring.version>5.3.11</spring.version>
- <spring.integration.version>5.5.2</spring.integration.version>
+ <spring.integration.version>5.5.7</spring.integration.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-messaging</artifactId>
- <version>${spring.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/pom.xml
b/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/pom.xml
index 6c9d544..16c8505 100644
---
a/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/pom.xml
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/pom.xml
@@ -96,7 +96,6 @@ limitations under the License.
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-crypto</artifactId>
- <version>${spring.security.version}</version>
</dependency>
<dependency>
<groupId>com.github.stephenc.findbugs</groupId>
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/pom.xml
b/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/pom.xml
index d1ee56a..b631d57 100644
---
a/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/pom.xml
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/pom.xml
@@ -25,47 +25,9 @@
<properties>
<hwx.registry.version>0.9.1</hwx.registry.version>
- <!-- Override Spring Framework version from
com.hortonworks.registries:common-auth -->
- <spring.version>5.3.11</spring.version>
- <spring.security.version>5.5.2</spring.security.version>
</properties>
<dependencyManagement>
<dependencies>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-expression</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jcl</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- <version>${spring.security.version}</version>
- </dependency>
<!-- Override commons-compress -->
<dependency>
<groupId>org.apache.commons</groupId>
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-spring-jdbc/pom.xml
b/nifi-registry/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-spring-jdbc/pom.xml
index 4c0ace9..9d26641 100644
---
a/nifi-registry/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-spring-jdbc/pom.xml
+++
b/nifi-registry/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-spring-jdbc/pom.xml
@@ -32,9 +32,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
- <version>${spring.version}</version>
</dependency>
- <!-- Test Deps -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
diff --git a/nifi-registry/nifi-registry-core/pom.xml
b/nifi-registry/nifi-registry-core/pom.xml
index 83647f2..661d785 100644
--- a/nifi-registry/nifi-registry-core/pom.xml
+++ b/nifi-registry/nifi-registry-core/pom.xml
@@ -107,7 +107,6 @@
<artifactId>javax.el</artifactId>
<version>3.0.1-b08</version>
</dependency>
- <!-- Spring Boot 2.0 Requires Jackson 2.9.x -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
diff --git a/nifi-registry/pom.xml b/nifi-registry/pom.xml
index f61fcdc..47fc310 100644
--- a/nifi-registry/pom.xml
+++ b/nifi-registry/pom.xml
@@ -37,9 +37,7 @@
</modules>
<properties>
<jax.rs.api.version>2.1</jax.rs.api.version>
- <spring.boot.version>2.5.5</spring.boot.version>
- <spring.version>5.3.11</spring.version>
- <spring.security.version>5.5.2</spring.security.version>
+ <spring.boot.version>2.5.8</spring.boot.version>
<flyway.version>6.5.7</flyway.version>
<flyway.tests.version>6.4.0</flyway.tests.version>
<swagger.ui.version>3.12.0</swagger.ui.version>
diff --git a/pom.xml b/pom.xml
index a33d5f5..5d3bc7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,6 +116,8 @@
<mockito.version>3.11.2</mockito.version>
<netty.3.version>3.10.6.Final</netty.3.version>
<netty.4.version>4.1.69.Final</netty.4.version>
+ <spring.version>5.3.14</spring.version>
+ <spring.security.version>5.6.1</spring.security.version>
</properties>
<repositories>
@@ -494,6 +496,20 @@
<scope>import</scope>
<type>pom</type>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-framework-bom</artifactId>
+ <version>${spring.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-bom</artifactId>
+ <version>${spring.security.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
</dependencies>
</dependencyManagement>
