Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NIFI-14187 - Dep Upgrades - Spring, Netty, Flyway, AWS, GCP, etc #9658

Merged
merged 3 commits into from
Jan 23, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading