Skip to content

Commit

Permalink
NIFI-14187 Upgraded Spring to 6.2.2 along with AWS SDK and others (#9658
Browse files Browse the repository at this point in the history
)

- AWS SDK v2 from 2.29.48 to 2.30.3 - https://github.com/aws/aws-sdk-java-v2/blob/master/CHANGELOG.md
- Spring Framework from 6.2.1 to 6.2.2 - https://github.com/spring-projects/spring-framework/releases
- PostgreSQL from 42.7.4 to 42.7.5 - https://jdbc.postgresql.org/changelogs/2025-01-14-42.7.5-release/
- MIME4J from 0.8.11 to 0.8.12 - apache/james-mime4j@apache-mime4j-project-0.8.11...apache-mime4j-project-0.8.12
- Reactor Netty HTTP from 1.2.1 to 1.2.2 - https://github.com/reactor/reactor-netty/releases
- Reactor Core from 3.7.1 to 3.7.2 - https://github.com/reactor/reactor-core/releases
- Dropwizard Metrics from 4.2.29 to 4.2.30 - https://github.com/dropwizard/metrics/releases/tag/v4.2.30
- Box SDK from 4.13.1 to 4.14.0 - https://developer.box.com/changelog/#2025-01-22-box-java-sdk-v4140-released
- Commons CSV from 1.12.0 to 1.13.0 - https://commons.apache.org/proper/commons-csv/changes.html#a1.13.0
- GCP from 26.52.0 to 26.53.0 - https://github.com/googleapis/java-cloud-bom/releases/tag/v26.53.0
- ActiveMQ from 6.1.4 to 6.1.5 - https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&version=12355276
- JSON Schema Validator from 1.5.4 to 1.5.5 - https://github.com/networknt/json-schema-validator/blob/master/CHANGELOG.md
- Camel Salesforce from 4.8.2 to 4.9.0 - apache/camel@camel-4.8.2...camel-4.9.0
- Slack Bolt from 1.45.0 to 1.45.1 - https://github.com/slackapi/java-slack-sdk/releases/tag/v1.45.1
- PY4J from 0.10.9.8 to 0.10.9.9 - https://www.py4j.org/changelog.html#py4j-0-10-9-9
- MySQL from 9.1.0 to 9.2.0 - https://dev.mysql.com/doc/relnotes/connector-j/en/news-9-2-0.html
- Flyway from 11.1.1 to 11.2.0 - https://documentation.red-gate.com/flyway/release-notes-and-older-versions/release-notes-for-flyway-engine
- OpenCSV from 5.9 to 5.10 - https://sourceforge.net/p/opencsv/wiki/What%27s%20new/
- Netty from 4.1.116.Final to 4.1.117.Final - https://netty.io/news/2025/01/14/4-1-117-Final.html
- Swagger annotations from 2.2.27 to 2.2.28 - https://github.com/swagger-api/swagger-core/releases/tag/v2.2.28

Signed-off-by: David Handermann <exceptionfactory@apache.org>
  • Loading branch information
pvillard31 authored Jan 23, 2025
1 parent 9d835e0 commit 5fb208e
Show file tree
Hide file tree
Showing 21 changed files with 30 additions and 30 deletions.
4 changes: 2 additions & 2 deletions nifi-code-coverage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<properties>
<ant.version>1.10.15</ant.version>
<org.apache.sshd.version>2.14.0</org.apache.sshd.version>
<mime4j.version>0.8.11</mime4j.version>
<mime4j.version>0.8.12</mime4j.version>
</properties>

<!-- Managed Dependency Versions for referenced modules required based on different parent bundle project -->
Expand Down Expand Up @@ -89,7 +89,7 @@
<dependency>
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty-http</artifactId>
<version>1.2.1</version>
<version>1.2.2</version>
</dependency>
<!-- SSHD from Registry and other modules -->
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions nifi-commons/nifi-metrics/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-jvm</artifactId>
<version>4.2.29</version>
<version>4.2.30</version>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>4.2.29</version>
<version>4.2.30</version>
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
<version>3.7.1</version>
<version>3.7.2</version>
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down Expand Up @@ -191,7 +191,7 @@
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
<version>3.7.1</version>
<version>3.7.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion nifi-extension-bundles/nifi-box-bundle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<dependency>
<groupId>com.box</groupId>
<artifactId>box-java-sdk</artifactId>
<version>4.13.1</version>
<version>4.14.0</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
<version>1.12.0</version>
<version>1.13.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
2 changes: 1 addition & 1 deletion nifi-extension-bundles/nifi-gcp-bundle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<packaging>pom</packaging>

<properties>
<google.libraries.version>26.52.0</google.libraries.version>
<google.libraries.version>26.53.0</google.libraries.version>
</properties>

<dependencyManagement>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<packaging>jar</packaging>

<properties>
<activemq.version>6.1.4</activemq.version>
<activemq.version>6.1.5</activemq.version>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion nifi-extension-bundles/nifi-media-bundle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<properties>
<poi.version>5.4.0</poi.version>
<mime4j.version>0.8.11</mime4j.version>
<mime4j.version>0.8.12</mime4j.version>
</properties>

<modules>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>com.networknt</groupId>
<artifactId>json-schema-validator</artifactId>
<version>1.5.4</version>
<version>1.5.5</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-salesforce</artifactId>
<version>4.8.2</version>
<version>4.9.0</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<dependency>
<groupId>com.slack.api</groupId>
<artifactId>bolt-socket-mode</artifactId>
<version>1.45.0</version>
<version>1.45.1</version>
</dependency>
<!-- Required by bolt-socket-mode but the library itself doesn't have the dependency. -->
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.7.4</version>
<version>42.7.5</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion nifi-extension-bundles/nifi-standard-bundle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@
<dependency>
<groupId>com.networknt</groupId>
<artifactId>json-schema-validator</artifactId>
<version>1.5.4</version>
<version>1.5.5</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
<version>1.12.0</version>
<version>1.13.0</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
<version>1.12.0</version>
<version>1.13.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
<artifactId>nifi-python-framework</artifactId>

<properties>
<py4j.version>0.10.9.8</py4j.version>
<py4j.url>https://files.pythonhosted.org/packages/53/75/15967ccc1a9bb2c85364a4eceb64116fbf8734528315338f16efd4191f35/py4j-${py4j.version}-py2.py3-none-any.whl</py4j.url>
<py4j.version>0.10.9.9</py4j.version>
<py4j.url>https://files.pythonhosted.org/packages/bd/db/ea0203e495be491c85af87b66e37acfd3bf756fd985f87e46fc5e3bf022c/py4j-${py4j.version}-py2.py3-none-any.whl</py4j.url>
</properties>

<build>
Expand All @@ -46,7 +46,7 @@
<outputFileName>py4j-${py4j.version}.zip</outputFileName>
<unpack>true</unpack>
<outputDirectory>${project.build.directory}/py4j-${py4j.version}</outputDirectory>
<sha256>84226a9d382448c36af1ca4bc2ab7ab9df49ec54fc83f033f620e00c8a6da0ca</sha256>
<sha256>c7c26e4158defb37b0bb124933163641a2ff6e3a3913f7811b0ddbe07ed61533</sha256>
</configuration>
</execution>
</executions>
Expand Down
2 changes: 1 addition & 1 deletion nifi-framework-bundle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>4.2.29</version>
<version>4.2.30</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
Expand Down
4 changes: 2 additions & 2 deletions nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>9.1.0</version>
<version>9.2.0</version>
<exclusions>
<!-- Exclude unused protobuf-java -->
<exclusion>
Expand All @@ -79,7 +79,7 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.7.4</version>
<version>42.7.5</version>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion nifi-registry/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</modules>
<properties>
<spring.boot.version>3.4.1</spring.boot.version>
<flyway.version>11.1.1</flyway.version>
<flyway.version>11.2.0</flyway.version>
<flyway.tests.version>10.0.0</flyway.tests.version>
<swagger.ui.version>3.12.0</swagger.ui.version>
<jgit.version>7.1.0.202411261347-r</jgit.version>
Expand Down
2 changes: 1 addition & 1 deletion nifi-toolkit/nifi-toolkit-cli/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
<dependency>
<groupId>com.opencsv</groupId>
<artifactId>opencsv</artifactId>
<version>5.9</version>
<version>5.10</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<inceptionYear>2014</inceptionYear>
<com.amazonaws.version>1.12.780</com.amazonaws.version>
<software.amazon.awssdk.version>2.29.48</software.amazon.awssdk.version>
<software.amazon.awssdk.version>2.30.3</software.amazon.awssdk.version>
<gson.version>2.11.0</gson.version>
<io.fabric8.kubernetes.client.version>7.0.1</io.fabric8.kubernetes.client.version>
<kotlin.version>2.1.0</kotlin.version>
Expand Down Expand Up @@ -153,11 +153,11 @@
<mockito.version>5.15.2</mockito.version>
<netty.3.version>3.10.6.Final</netty.3.version>
<snakeyaml.version>2.3</snakeyaml.version>
<netty.4.version>4.1.116.Final</netty.4.version>
<netty.4.version>4.1.117.Final</netty.4.version>
<servlet-api.version>6.1.0</servlet-api.version>
<spring.version>6.2.1</spring.version>
<spring.version>6.2.2</spring.version>
<spring.security.version>6.4.2</spring.security.version>
<swagger.annotations.version>2.2.27</swagger.annotations.version>
<swagger.annotations.version>2.2.28</swagger.annotations.version>
<h2.version>2.3.232</h2.version>
<zookeeper.version>3.9.3</zookeeper.version>
<caffeine.version>3.1.8</caffeine.version>
Expand Down

0 comments on commit 5fb208e

Please sign in to comment.