You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by pv...@apache.org on 2021/07/27 08:21:41 UTC
[nifi] branch main updated: NIFI-8948 Upgraded Spring to 5.3.9 and
Security to 5.5.1
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 e16bf64 NIFI-8948 Upgraded Spring to 5.3.9 and Security to 5.5.1
e16bf64 is described below
commit e16bf644e3d51c737f9a08c3f5c6795ed631e4b3
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Mon Jul 26 13:56:18 2021 -0500
NIFI-8948 Upgraded Spring to 5.3.9 and Security to 5.5.1
- Upgrades Spring Framework from 5.3.8 to 5.3.9
- Upgrades Spring Security from 5.4.6 to 5.5.1
- Upgrades Spring Boot from 2.5.1 to 2.5.2 in Registry
- Upgrades Spring Data Redis from 2.5.1 to 2.5.3
Signed-off-by: Pierre Villard <pi...@gmail.com>
This closes #5252.
---
minifi/pom.xml | 4 ++--
nifi-commons/nifi-vault-utils/pom.xml | 17 +++++++++++++++--
nifi-nar-bundles/nifi-atlas-bundle/pom.xml | 2 +-
nifi-nar-bundles/nifi-easyrules-bundle/pom.xml | 2 +-
.../nifi-email-bundle/nifi-email-processors/pom.xml | 2 +-
nifi-nar-bundles/nifi-email-bundle/pom.xml | 2 +-
nifi-nar-bundles/nifi-framework-bundle/pom.xml | 4 ++--
nifi-nar-bundles/nifi-ignite-bundle/pom.xml | 2 +-
.../nifi-jms-bundle/nifi-jms-processors/pom.xml | 2 +-
.../nifi-kerberos-iaa-providers-bundle/pom.xml | 4 ++--
.../nifi-ldap-iaa-providers/pom.xml | 2 +-
nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/pom.xml | 2 +-
nifi-nar-bundles/nifi-redis-bundle/pom.xml | 6 +++---
.../nifi-rules-action-handler-service/pom.xml | 2 +-
.../nifi-spring-bundle/nifi-spring-processors/pom.xml | 4 ++--
.../nifi-hwx-schema-registry-bundle/pom.xml | 4 ++--
nifi-registry/pom.xml | 6 +++---
17 files changed, 40 insertions(+), 27 deletions(-)
diff --git a/minifi/pom.xml b/minifi/pom.xml
index 76f3539..9a24ac0 100644
--- a/minifi/pom.xml
+++ b/minifi/pom.xml
@@ -42,8 +42,8 @@ limitations under the License.
</modules>
<properties>
<jersey.version>2.29</jersey.version>
- <spring.version>5.3.8</spring.version>
- <spring.security.version>5.4.6</spring.security.version>
+ <spring.version>5.3.9</spring.version>
+ <spring.security.version>5.5.1</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>
diff --git a/nifi-commons/nifi-vault-utils/pom.xml b/nifi-commons/nifi-vault-utils/pom.xml
index f73e4cb..cea7597 100644
--- a/nifi-commons/nifi-vault-utils/pom.xml
+++ b/nifi-commons/nifi-vault-utils/pom.xml
@@ -21,7 +21,8 @@
</parent>
<artifactId>nifi-vault-utils</artifactId>
<properties>
- <spring.version>5.3.8</spring.version>
+ <spring.version>5.3.9</spring.version>
+ <spring.vault.version>2.3.2</spring.vault.version>
</properties>
<dependencyManagement>
<dependencies>
@@ -38,13 +39,25 @@
<dependency>
<groupId>org.springframework.vault</groupId>
<artifactId>spring-vault-core</artifactId>
- <version>2.3.2</version>
+ <version>${spring.vault.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
<version>1.15.0-SNAPSHOT</version>
diff --git a/nifi-nar-bundles/nifi-atlas-bundle/pom.xml b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml
index 9cf4e34..2a3b7ed 100644
--- a/nifi-nar-bundles/nifi-atlas-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml
@@ -27,7 +27,7 @@
<properties>
<atlas.version>2.1.0</atlas.version>
- <spring.version>5.3.8</spring.version>
+ <spring.version>5.3.9</spring.version>
</properties>
<modules>
diff --git a/nifi-nar-bundles/nifi-easyrules-bundle/pom.xml b/nifi-nar-bundles/nifi-easyrules-bundle/pom.xml
index 36e563a..0e2cf13 100644
--- a/nifi-nar-bundles/nifi-easyrules-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-easyrules-bundle/pom.xml
@@ -24,7 +24,7 @@
<artifactId>nifi-easyrules-bundle</artifactId>
<packaging>pom</packaging>
<properties>
- <spring.version>5.3.8</spring.version>
+ <spring.version>5.3.9</spring.version>
</properties>
<modules>
<module>nifi-easyrules-service</module>
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 3b5d386..cdc936b 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.4.6</spring.integration.version>
+ <spring.integration.version>5.5.2</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 09c192f..ca4a667 100644
--- a/nifi-nar-bundles/nifi-email-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-email-bundle/pom.xml
@@ -25,7 +25,7 @@
<packaging>pom</packaging>
<description>NiFi Email Processor Set</description>
<properties>
- <spring.version>5.3.8</spring.version>
+ <spring.version>5.3.9</spring.version>
</properties>
<modules>
<module>nifi-email-processors</module>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
index b295a54..75980b0 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
@@ -23,8 +23,8 @@
<packaging>pom</packaging>
<description>NiFi: Framework Bundle</description>
<properties>
- <spring.version>5.3.8</spring.version>
- <spring.security.version>5.4.6</spring.security.version>
+ <spring.version>5.3.9</spring.version>
+ <spring.security.version>5.5.1</spring.security.version>
</properties>
<modules>
<module>nifi-framework</module>
diff --git a/nifi-nar-bundles/nifi-ignite-bundle/pom.xml b/nifi-nar-bundles/nifi-ignite-bundle/pom.xml
index 5b9543e..b7e6514 100644
--- a/nifi-nar-bundles/nifi-ignite-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-ignite-bundle/pom.xml
@@ -30,7 +30,7 @@
<module>nifi-ignite-nar</module>
</modules>
<properties>
- <spring.version>5.3.8</spring.version>
+ <spring.version>5.3.9</spring.version>
</properties>
<dependencyManagement>
<dependencies>
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 d76d12c..74e8d9a 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
@@ -18,7 +18,7 @@
<artifactId>nifi-jms-processors</artifactId>
<packaging>jar</packaging>
<properties>
- <spring.version>5.3.8</spring.version>
+ <spring.version>5.3.9</spring.version>
</properties>
<dependencies>
<dependency>
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 2fa001c..cd802e2 100644
--- a/nifi-nar-bundles/nifi-kerberos-iaa-providers-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-kerberos-iaa-providers-bundle/pom.xml
@@ -27,8 +27,8 @@
<module>nifi-kerberos-iaa-providers-nar</module>
</modules>
<properties>
- <spring.version>5.3.8</spring.version>
- <spring.security.version>5.4.6</spring.security.version>
+ <spring.version>5.3.9</spring.version>
+ <spring.security.version>5.5.1</spring.security.version>
</properties>
<dependencyManagement>
<dependencies>
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 fbf179d..8fdd56f 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
@@ -23,7 +23,7 @@
<artifactId>nifi-ldap-iaa-providers</artifactId>
<packaging>jar</packaging>
<properties>
- <spring.security.version>5.4.6</spring.security.version>
+ <spring.security.version>5.5.1</spring.security.version>
</properties>
<dependencies>
<dependency>
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 2b0cb61..424941e 100644
--- a/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/pom.xml
@@ -27,7 +27,7 @@
<module>nifi-ldap-iaa-providers-nar</module>
</modules>
<properties>
- <spring.version>5.3.8</spring.version>
+ <spring.version>5.3.9</spring.version>
</properties>
<dependencyManagement>
<dependencies>
diff --git a/nifi-nar-bundles/nifi-redis-bundle/pom.xml b/nifi-nar-bundles/nifi-redis-bundle/pom.xml
index 98b50a5..63340f9 100644
--- a/nifi-nar-bundles/nifi-redis-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-redis-bundle/pom.xml
@@ -27,9 +27,9 @@
<packaging>pom</packaging>
<properties>
- <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>
+ <spring.data.redis.version>2.5.3</spring.data.redis.version>
+ <spring.version>5.3.9</spring.version>
+ <jedis.version>3.6.2</jedis.version>
</properties>
<modules>
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 d8c53eb..02ef955 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
@@ -24,7 +24,7 @@
<artifactId>nifi-rules-action-handler-service</artifactId>
<packaging>jar</packaging>
<properties>
- <spring.version>5.3.8</spring.version>
+ <spring.version>5.3.9</spring.version>
</properties>
<dependencies>
<dependency>
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 a1596a1..0535357 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,8 +18,8 @@
<artifactId>nifi-spring-processors</artifactId>
<packaging>jar</packaging>
<properties>
- <spring.version>5.3.8</spring.version>
- <spring.integration.version>5.4.6</spring.integration.version>
+ <spring.version>5.3.9</spring.version>
+ <spring.integration.version>5.5.2</spring.integration.version>
</properties>
<dependencies>
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 4a3df9f..6bc6e14 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
@@ -26,8 +26,8 @@
<properties>
<hwx.registry.version>0.9.1</hwx.registry.version>
<!-- Override Spring Framework version from com.hortonworks.registries:common-auth -->
- <spring.version>5.3.8</spring.version>
- <spring.security.version>5.4.6</spring.security.version>
+ <spring.version>5.3.9</spring.version>
+ <spring.security.version>5.5.1</spring.security.version>
</properties>
<dependencyManagement>
<dependencies>
diff --git a/nifi-registry/pom.xml b/nifi-registry/pom.xml
index fd92ad0..cddd69d 100644
--- a/nifi-registry/pom.xml
+++ b/nifi-registry/pom.xml
@@ -37,9 +37,9 @@
</modules>
<properties>
<jax.rs.api.version>2.1</jax.rs.api.version>
- <spring.boot.version>2.5.1</spring.boot.version>
- <spring.version>5.3.8</spring.version>
- <spring.security.version>5.4.6</spring.security.version>
+ <spring.boot.version>2.5.2</spring.boot.version>
+ <spring.version>5.3.9</spring.version>
+ <spring.security.version>5.5.1</spring.security.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>