NIFI-13438 Upgraded Spring to 6.1.10 along with other dependencies

- Upgraded sshd from 2.12.1 to 2.13.1
- Upgraded reactor-netty-http from 1.1.19 to 1.1.20
- Upgraded guava from 33.2.0-jre to 33.2.1-jre
- Upgraded maven-artifact from 3.9.7 to 3.9.8
- Upgraded spring-integrations from 6.3.0 to 6.3.1
- Upgraded jjwt from 0.12.5 to 0.12.6
- Upgraded unboundid from 7.0.0 to 7.0.1
- Upgraded json-schema-validator from 1.4.0 to 1.4.2
- Upgraded Spring Boot from 3.3.0 to 3.3.1
- Upgraded jline from 3.26.1 to 3.26.2
- Upgraded com.amazonaws from 1.12.742 to 1.12.748
- Upgraded AWS SDK from 2.26.1 from 2.26.8
- Upgraded Spring from 6.1.9 to 6.1.10
- Upgraded Spring Security from 6.3.0 to 6.3.1

This closes #9001

Signed-off-by: David Handermann <exceptionfactory@apache.org>
This commit is contained in:
Joseph Witt 2024-06-24 17:26:45 -07:00 committed by exceptionfactory
parent 238b5249c4
commit 87107b311a
No known key found for this signature in database
29 changed files with 39 additions and 39 deletions

View File

@ -28,7 +28,7 @@
<properties>
<ant.version>1.10.14</ant.version>
<org.apache.sshd.version>2.12.1</org.apache.sshd.version>
<org.apache.sshd.version>2.13.1</org.apache.sshd.version>
<mime4j.version>0.8.11</mime4j.version>
</properties>
@ -89,7 +89,7 @@
<dependency>
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty-http</artifactId>
<version>1.1.19</version>
<version>1.1.20</version>
</dependency>
<!-- SSHD from Registry and other modules -->
<dependency>

View File

@ -73,7 +73,7 @@
</modules>
<properties>
<gcp.sdk.version>26.38.0</gcp.sdk.version>
<guava.version>33.2.0-jre</guava.version>
<guava.version>33.2.1-jre</guava.version>
</properties>
<dependencyManagement>
<dependencies>

View File

@ -47,7 +47,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.2.0-jre</version>
<version>33.2.1-jre</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>

View File

@ -55,7 +55,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.2.0-jre</version>
<version>33.2.1-jre</version>
</dependency>
<!-- Override Apache Qpid Proton J for Azure EventHubs to resolve PROTON-2347 -->
<dependency>

View File

@ -159,7 +159,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>3.9.7</version>
<version>3.9.8</version>
<scope>test</scope>
</dependency>
</dependencies>

View File

@ -25,7 +25,7 @@
<artifactId>nifi-email-processors</artifactId>
<packaging>jar</packaging>
<properties>
<spring.integration.version>6.3.0</spring.integration.version>
<spring.integration.version>6.3.1</spring.integration.version>
<poi.version>5.2.5</poi.version>
</properties>

View File

@ -31,7 +31,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.2.0-jre</version>
<version>33.2.1-jre</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>

View File

@ -41,7 +41,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.2.0-jre</version>
<version>33.2.1-jre</version>
</dependency>
</dependencies>
</dependencyManagement>

View File

@ -22,7 +22,7 @@
<artifactId>nifi-github-extensions</artifactId>
<packaging>jar</packaging>
<properties>
<jjwt.version>0.12.5</jjwt.version>
<jjwt.version>0.12.6</jjwt.version>
</properties>
<dependencies>
<dependency>

View File

@ -27,7 +27,7 @@
<properties>
<gremlin.version>3.7.2</gremlin.version>
<janusgraph.version>1.0.0</janusgraph.version>
<guava.version>33.2.0-jre</guava.version>
<guava.version>33.2.1-jre</guava.version>
<amqp-client.version>5.21.0</amqp-client.version>
</properties>
<dependencyManagement>

View File

@ -47,7 +47,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.2.0-jre</version>
<version>33.2.1-jre</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>

View File

@ -43,7 +43,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.2.0-jre</version>
<version>33.2.1-jre</version>
</dependency>
</dependencies>
</dependencyManagement>

View File

@ -160,7 +160,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.2.0-jre</version>
<version>33.2.1-jre</version>
</dependency>
<!-- Override Groovy from hive-exec -->
<dependency>

View File

@ -88,7 +88,7 @@
<dependency>
<groupId>com.unboundid</groupId>
<artifactId>unboundid-ldapsdk</artifactId>
<version>7.0.0</version>
<version>7.0.1</version>
<scope>test</scope>
</dependency>
</dependencies>

View File

@ -40,7 +40,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.2.0-jre</version>
<version>33.2.1-jre</version>
</dependency>
</dependencies>
</dependencyManagement>

View File

@ -56,7 +56,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.2.0-jre</version>
<version>33.2.1-jre</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>

View File

@ -37,7 +37,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.2.0-jre</version>
<version>33.2.1-jre</version>
</dependency>
</dependencies>
</dependencyManagement>

View File

@ -57,7 +57,7 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>com.networknt</groupId>
<artifactId>json-schema-validator</artifactId>
<version>1.4.0</version>
<version>1.4.2</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>

View File

@ -23,7 +23,7 @@
<artifactId>nifi-sql-reporting-bundle</artifactId>
<packaging>pom</packaging>
<properties>
<guava.version>33.2.0-jre</guava.version>
<guava.version>33.2.1-jre</guava.version>
</properties>
<modules>
<module>nifi-sql-reporting-tasks</module>

View File

@ -27,7 +27,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.2.0-jre</version>
<version>33.2.1-jre</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-common</artifactId>
<version>2.12.1</version>
<version>2.13.1</version>
<scope>test</scope>
</dependency>
<dependency>

View File

@ -34,7 +34,7 @@
</modules>
<properties>
<yammer.metrics.version>2.2.0</yammer.metrics.version>
<org.apache.sshd.version>2.12.1</org.apache.sshd.version>
<org.apache.sshd.version>2.13.1</org.apache.sshd.version>
<tika.version>2.9.2</tika.version>
</properties>
<dependencyManagement>
@ -232,12 +232,12 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.2.0-jre</version>
<version>33.2.1-jre</version>
</dependency>
<dependency>
<groupId>com.networknt</groupId>
<artifactId>json-schema-validator</artifactId>
<version>1.4.0</version>
<version>1.4.2</version>
</dependency>
</dependencies>
</dependencyManagement>

View File

@ -50,7 +50,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.2.0-jre</version>
<version>33.2.1-jre</version>
</dependency>
</dependencies>
</dependencyManagement>

View File

@ -25,7 +25,7 @@
<description>NiFi: Framework Bundle</description>
<properties>
<curator.version>5.7.0</curator.version>
<guava.version>33.2.0-jre</guava.version>
<guava.version>33.2.1-jre</guava.version>
<tika.version>2.9.2</tika.version>
<org.opensaml.version>4.3.2</org.opensaml.version>
</properties>

View File

@ -406,7 +406,7 @@
<dependency>
<groupId>com.unboundid</groupId>
<artifactId>unboundid-ldapsdk</artifactId>
<version>7.0.0</version>
<version>7.0.1</version>
<scope>test</scope>
</dependency>
<dependency>

View File

@ -295,7 +295,7 @@
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>0.12.5</version>
<version>0.12.6</version>
</dependency>
<!-- Test Dependencies -->
<dependency>
@ -319,7 +319,7 @@
<dependency>
<groupId>com.unboundid</groupId>
<artifactId>unboundid-ldapsdk</artifactId>
<version>7.0.0</version>
<version>7.0.1</version>
<scope>test</scope>
</dependency>
<dependency>

View File

@ -114,7 +114,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.2.0-jre</version>
<version>33.2.1-jre</version>
</dependency>
</dependencies>
</dependencyManagement>

View File

@ -35,12 +35,12 @@
<module>nifi-registry-docker-maven</module>
</modules>
<properties>
<spring.boot.version>3.3.0</spring.boot.version>
<spring.boot.version>3.3.1</spring.boot.version>
<flyway.version>10.15.0</flyway.version>
<flyway.tests.version>10.0.0</flyway.tests.version>
<swagger.ui.version>3.12.0</swagger.ui.version>
<jgit.version>6.10.0.202406032230-r</jgit.version>
<org.apache.sshd.version>2.12.1</org.apache.sshd.version>
<org.apache.sshd.version>2.13.1</org.apache.sshd.version>
</properties>
<dependencyManagement>
<dependencies>

View File

@ -24,8 +24,8 @@
<description>Tooling to make tls configuration easier</description>
<properties>
<guava.version>33.2.0-jre</guava.version>
<jline.version>3.26.1</jline.version>
<guava.version>33.2.1-jre</guava.version>
<jline.version>3.26.2</jline.version>
</properties>
<build>

View File

@ -110,8 +110,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<inceptionYear>2014</inceptionYear>
<com.amazonaws.version>1.12.742</com.amazonaws.version>
<software.amazon.awssdk.version>2.26.1</software.amazon.awssdk.version>
<com.amazonaws.version>1.12.748</com.amazonaws.version>
<software.amazon.awssdk.version>2.26.8</software.amazon.awssdk.version>
<gson.version>2.10.1</gson.version>
<io.fabric8.kubernetes.client.version>6.13.0</io.fabric8.kubernetes.client.version>
<kotlin.version>1.9.24</kotlin.version>
@ -155,8 +155,8 @@
<snakeyaml.version>2.2</snakeyaml.version>
<netty.4.version>4.1.111.Final</netty.4.version>
<servlet-api.version>6.0.0</servlet-api.version>
<spring.version>6.1.9</spring.version>
<spring.security.version>6.3.0</spring.security.version>
<spring.version>6.1.10</spring.version>
<spring.security.version>6.3.1</spring.security.version>
<swagger.annotations.version>2.2.22</swagger.annotations.version>
<h2.version>2.2.224</h2.version>
<zookeeper.version>3.9.2</zookeeper.version>