Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-8513 Upgraded Spring Framework to 4.3.30 

- Upgraded direct Spring Framework references to 4.3.30.RELEASE
- Upgraded direct Spring Security references to 4.2.20.RELEASE

NIFI-8513 Updated Spring Framework and Security Notices with major version

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

This closes #5054.
This commit is contained in:
exceptionfactory 2021-05-03 22:12:26 -05:00 committed by Pierre Villard
parent 5bcfcf42bb
commit 328b9e540b
No known key found for this signature in database
GPG Key ID: F92A93B30C07C6D5
23 changed files with 68 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
minifi/minifi-c2/minifi-c2-assembly/NOTICE
View File

@ -157,13 +157,13 @@ The following binary components are provided under the Apache Software License v
(ASLv2) Spring Security
The following NOTICE information applies:
Spring Framework 4.0.3.RELEASE
Copyright (c) 2002-2015 Pivotal, Inc.
Spring Security 4
Copyright (c) 2002-2021 Pivotal, Inc.
(ASLv2) Spring Framework
The following NOTICE information applies:
Spring Framework 4.1.4.RELEASE
Copyright (c) 2002-2015 Pivotal, Inc.
Spring Framework 4
Copyright (c) 2002-2021 Pivotal, Inc.
(ASLv2) Quartz
The following NOTICE information applies:

8
minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/src/main/resources/META-INF/NOTICE
View File

@ -88,13 +88,13 @@ The following binary components are provided under the Apache Software License v
(ASLv2) Spring Framework
The following NOTICE information applies:
Spring Framework 4.1.6.RELEASE
Copyright (c) 2002-2015 Pivotal, Inc.
Spring Framework 4
Copyright (c) 2002-2021 Pivotal, Inc.
(ASLv2) Spring Security
The following NOTICE information applies:
Spring Framework 4.0.3.RELEASE
Copyright (c) 2002-2015 Pivotal, Inc.
Spring Security 4
Copyright (c) 2002-2021 Pivotal, Inc.
(ASLv2) Swagger Core
The following NOTICE information applies:

8
minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-server/src/main/resources/META-INF/NOTICE
View File

@ -95,13 +95,13 @@ The following binary components are provided under the Apache Software License v
(ASLv2) Spring Framework
The following NOTICE information applies:
Spring Framework 4.1.6.RELEASE
Copyright (c) 2002-2015 Pivotal, Inc.
Spring Framework 4
Copyright (c) 2002-2021 Pivotal, Inc.
(ASLv2) Spring Security
The following NOTICE information applies:
Spring Framework 4.0.3.RELEASE
Copyright (c) 2002-2015 Pivotal, Inc.
Spring Security 4
Copyright (c) 2002-2021 Pivotal, Inc.
(ASLv2) Swagger Core
The following NOTICE information applies:

8
minifi/minifi-toolkit/minifi-toolkit-assembly/NOTICE
View File

@ -106,13 +106,13 @@ The following binary components are provided under the Apache Software License v
(ASLv2) Spring Security
The following NOTICE information applies:
Spring Framework 4.0.3.RELEASE
Copyright (c) 2002-2015 Pivotal, Inc.
Spring Security 4
Copyright (c) 2002-2021 Pivotal, Inc.
(ASLv2) Spring Framework
The following NOTICE information applies:
Spring Framework 4.1.4.RELEASE
Copyright (c) 2002-2015 Pivotal, Inc.
Spring Framework 4
Copyright (c) 2002-2021 Pivotal, Inc.
(ASLv2) Quartz
The following NOTICE information applies:

4
minifi/pom.xml
View File

@ -91,8 +91,8 @@ limitations under the License.
<properties>
<inceptionYear>2016</inceptionYear>
<jersey.version>2.29</jersey.version>
<spring.version>4.3.19.RELEASE</spring.version>
<spring.security.version>4.2.13.RELEASE</spring.security.version>
<spring.version>4.3.30.RELEASE</spring.version>
<spring.security.version>4.2.20.RELEASE</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>

8
nifi-assembly/NOTICE
View File

@ -345,13 +345,13 @@ The following binary components are provided under the Apache Software License v
(ASLv2) Spring Framework
The following NOTICE information applies:
Spring Framework 4.x,5.x.RELEASE
Copyright (c) 2002-2015 Pivotal, Inc.
Spring Framework 4 and 5
Copyright (c) 2002-2021 Pivotal, Inc.
(ASLv2) Spring Security
The following NOTICE information applies:
Spring Framework 4.0.3.RELEASE
Copyright (c) 2002-2015 Pivotal, Inc.
Spring Security 4
Copyright (c) 2002-2021 Pivotal, Inc.
(ASLv2) Apache Flume
The following NOTICE information applies:

4
nifi-external/nifi-kafka-connect/nifi-kafka-connector-assembly/NOTICE
View File

@ -100,8 +100,8 @@ The following binary components are provided under the Apache Software License v
(ASLv2) Spring Security
The following NOTICE information applies:
Spring Framework 4.0.3.RELEASE
Copyright (c) 2002-2015 Pivotal, Inc.
Spring Security 4
Copyright (c) 2002-2021 Pivotal, Inc.
(ASLv2) ASM Based Accessors Helper Used By JSON Smart (net.minidev:accessors-smart:jar:1.2 - http://www.minidev.net/)
The following NOTICE information applies:

8
nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/NOTICE
View File

@ -108,13 +108,13 @@ The following binary components are provided under the Apache Software License v
(ASLv2) Spring Framework
The following NOTICE information applies:
Spring Framework 4.1.6.RELEASE
Copyright (c) 2002-2015 Pivotal, Inc.
Spring Framework 4
Copyright (c) 2002-2021 Pivotal, Inc.
(ASLv2) Spring Security
The following NOTICE information applies:
Spring Framework 4.0.3.RELEASE
Copyright (c) 2002-2015 Pivotal, Inc.
Spring Security 4
Copyright (c) 2002-2021 Pivotal, Inc.
(ASLv2) Swagger Core
The following NOTICE information applies:

8
nifi-nar-bundles/nifi-framework-bundle/nifi-headless-server-nar/src/main/resources/META-INF/NOTICE
View File

@ -95,13 +95,13 @@ The following binary components are provided under the Apache Software License v
(ASLv2) Spring Framework
The following NOTICE information applies:
Spring Framework 4.1.6.RELEASE
Copyright (c) 2002-2015 Pivotal, Inc.
Spring Framework 4
Copyright (c) 2002-2021 Pivotal, Inc.
(ASLv2) Spring Security
The following NOTICE information applies:
Spring Framework 4.0.3.RELEASE
Copyright (c) 2002-2015 Pivotal, Inc.
Spring Security 4
Copyright (c) 2002-2021 Pivotal, Inc.
(ASLv2) Swagger Core
The following NOTICE information applies:

8
nifi-nar-bundles/nifi-framework-bundle/nifi-server-nar/src/main/resources/META-INF/NOTICE
View File

@ -95,13 +95,13 @@ The following binary components are provided under the Apache Software License v
(ASLv2) Spring Framework
The following NOTICE information applies:
Spring Framework 4.1.6.RELEASE
Copyright (c) 2002-2015 Pivotal, Inc.
Spring Framework 4
Copyright (c) 2002-2021 Pivotal, Inc.
(ASLv2) Spring Security
The following NOTICE information applies:
Spring Framework 4.0.3.RELEASE
Copyright (c) 2002-2015 Pivotal, Inc.
Spring Security 4
Copyright (c) 2002-2021 Pivotal, Inc.
(ASLv2) Swagger Core
The following NOTICE information applies:

4
nifi-nar-bundles/nifi-framework-bundle/nifi-stateless-bundle/nifi-stateless-nar/src/main/resources/META-INF/NOTICE
View File

@ -100,8 +100,8 @@ The following binary components are provided under the Apache Software License v
(ASLv2) Spring Security
The following NOTICE information applies:
Spring Framework 4.0.3.RELEASE
Copyright (c) 2002-2015 Pivotal, Inc.
Spring Security 4
Copyright (c) 2002-2021 Pivotal, Inc.
(ASLv2) ASM Based Accessors Helper Used By JSON Smart (net.minidev:accessors-smart:jar:1.2 - http://www.minidev.net/)
The following NOTICE information applies:

4
nifi-nar-bundles/nifi-framework-bundle/pom.xml
View File

@ -23,8 +23,8 @@
<packaging>pom</packaging>
<description>NiFi: Framework Bundle</description>
<properties>
<spring.version>4.3.19.RELEASE</spring.version>
<spring.security.version>4.2.13.RELEASE</spring.security.version>
<spring.version>4.3.30.RELEASE</spring.version>
<spring.security.version>4.2.20.RELEASE</spring.security.version>
</properties>
<modules>
<module>nifi-framework</module>

2
nifi-nar-bundles/nifi-ignite-bundle/pom.xml
View File

@ -30,7 +30,7 @@
<module>nifi-ignite-nar</module>
</modules>
<properties>
<spring.version>4.3.24.RELEASE</spring.version>
<spring.version>4.3.30.RELEASE</spring.version>
</properties>
<dependencyManagement>
<dependencies>

5
nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml
View File

@ -17,6 +17,9 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>nifi-jms-processors</artifactId>
<packaging>jar</packaging>
<properties>
<spring.version>4.3.30.RELEASE</spring.version>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
@ -41,7 +44,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
<version>4.3.19.RELEASE</version>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>

8
nifi-nar-bundles/nifi-kerberos-iaa-providers-bundle/nifi-kerberos-iaa-providers-nar/src/main/resources/META-INF/NOTICE
View File

@ -12,13 +12,13 @@ The following binary components are provided under the Apache Software License v
(ASLv2) Spring Framework
The following NOTICE information applies:
Spring Framework 4.1.6.RELEASE
Copyright (c) 2002-2015 Pivotal, Inc.
Spring Framework 4
Copyright (c) 2002-2021 Pivotal, Inc.
(ASLv2) Spring Security
The following NOTICE information applies:
Spring Framework 4.0.3.RELEASE
Copyright (c) 2002-2015 Pivotal, Inc.
Spring Security 4
Copyright (c) 2002-2021 Pivotal, Inc.
(ASLv2) Apache Commons Lang
The following NOTICE information applies:

2
nifi-nar-bundles/nifi-kerberos-iaa-providers-bundle/nifi-kerberos-iaa-providers/pom.xml
View File

@ -23,7 +23,7 @@
<artifactId>nifi-kerberos-iaa-providers</artifactId>
<packaging>jar</packaging>
<properties>
<spring.security.version>4.2.13.RELEASE</spring.security.version>
<spring.security.version>4.2.20.RELEASE</spring.security.version>
</properties>
<dependencies>
<dependency>

2
nifi-nar-bundles/nifi-kerberos-iaa-providers-bundle/pom.xml
View File

@ -27,7 +27,7 @@
<module>nifi-kerberos-iaa-providers-nar</module>
</modules>
<properties>
<spring.version>4.3.24.RELEASE</spring.version>
<spring.version>4.3.30.RELEASE</spring.version>
</properties>
<dependencyManagement>
<dependencies>

8
nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers-nar/src/main/resources/META-INF/NOTICE
View File

@ -12,13 +12,13 @@ The following binary components are provided under the Apache Software License v
(ASLv2) Spring Framework
The following NOTICE information applies:
Spring Framework 4.1.6.RELEASE
Copyright (c) 2002-2015 Pivotal, Inc.
Spring Framework 4
Copyright (c) 2002-2021 Pivotal, Inc.
(ASLv2) Spring Security
The following NOTICE information applies:
Spring Framework 4.0.3.RELEASE
Copyright (c) 2002-2015 Pivotal, Inc.
Spring Security 4
Copyright (c) 2002-2021 Pivotal, Inc.
(ASLv2) Apache Commons Lang
The following NOTICE information applies:

2
nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/pom.xml
View File

@ -23,7 +23,7 @@
<artifactId>nifi-ldap-iaa-providers</artifactId>
<packaging>jar</packaging>
<properties>
<spring.security.version>4.2.13.RELEASE</spring.security.version>
<spring.security.version>4.2.20.RELEASE</spring.security.version>
</properties>
<dependencies>
<dependency>

2
nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/pom.xml
View File

@ -27,7 +27,7 @@
<module>nifi-ldap-iaa-providers-nar</module>
</modules>
<properties>
<spring.version>4.3.19.RELEASE</spring.version>
<spring.version>4.3.30.RELEASE</spring.version>
</properties>
<dependencyManagement>
<dependencies>

2
nifi-nar-bundles/nifi-rules-action-handler-bundle/nifi-rules-action-handler-service/pom.xml
View File

@ -24,7 +24,7 @@
<artifactId>nifi-rules-action-handler-service</artifactId>
<packaging>jar</packaging>
<properties>
<spring.version>4.3.19.RELEASE</spring.version>
<spring.version>4.3.30.RELEASE</spring.version>
</properties>
<dependencies>
<dependency>

7
nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/pom.xml
View File

@ -18,7 +18,8 @@
<artifactId>nifi-spring-processors</artifactId>
<packaging>jar</packaging>
<properties>
<spring.version>4.3.19.RELEASE</spring.version>
<spring.version>4.3.30.RELEASE</spring.version>
<spring.integration.version>4.3.23.RELEASE</spring.integration.version>
</properties>
<dependencies>
@ -62,13 +63,13 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-core</artifactId>
<version>${spring.version}</version>
<version>${spring.integration.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-event</artifactId>
<version>${spring.version}</version>
<version>${spring.integration.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

6
pom.xml
View File

@ -146,6 +146,12 @@
<id>Shibboleth</id>
<name>Shibboleth</name>
<url>https://build.shibboleth.net/nexus/content/repositories/releases/</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
<releases>
<enabled>true</enabled>
</releases>
</repository>
</repositories>