Skip to content

Commit

Permalink
NIFI-13401 Upgraded Spring to 6.1.9 and Jetty to 12.0.10 and others
Browse files Browse the repository at this point in the history
- Upgraded com.amazonaws from 1.12.733 to 1.12.742
- Upgraded software.amazon.awssdk from 2.25.63 to 2.26.1
- Upgraded com.box SDK from 4.9.1 to 4.10.0
- Upgraded commons-net from 3.11.0 to 3.11.1
- Upgraded io.dropwizard.metrics from 4.2.25 to 4.2.26
- Upgraded Netty from 4.1.110.Final to 4.1.111.Final
- Upgraded Commons Configuration2 from 2.10.1 to 2.11.0
- Upgraded Lucene from 9.10.0 to 9.11.0
- Upgraded org.checkerframework from 3.43.0 to 3.44.0
- Upgraded org.eclipse.jdt ecj from 3.37.0 to 3.38.0
- Upgraded Jetty from 12.0.9 to 12.0.10
- Upgraded Elasticsearch Client from 8.13.4 to 8.14.1
- Upgraded Spring Framework from 6.1.8 to 6.1.9
- Upgraded com.slack.api from 1.39.3 to 1.40.0
- Upgraded io.projectreactor from 3.6.6 to 3.6.7
- Upgraded JGit from 6.9.0.202403050737-r to 6.10.0.202406032230-r
- Upgraded Flyway from 10.13.0 to 10.15.0
- Upgraded Spring Integration from 6.2.5 to 6.3.0

This closes #8966

Signed-off-by: David Handermann <exceptionfactory@apache.org>
  • Loading branch information
joewitt authored and exceptionfactory committed Jun 14, 2024
1 parent c6fbd86 commit bf637e0
Show file tree
Hide file tree
Showing 12 changed files with 22 additions and 22 deletions.
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.25</version>
<version>4.2.26</version>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>4.2.25</version>
<version>4.2.26</version>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion nifi-extension-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>ecj</artifactId>
<version>3.37.0</version>
<version>3.38.0</version>
<scope>provided</scope>
</dependency>
<!-- Jetty EE10 Glassfish JSTL and deps -->
Expand Down
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.6.6</version>
<version>3.6.7</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.6.6</version>
<version>3.6.7</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.9.1</version>
<version>4.10.0</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
4 changes: 2 additions & 2 deletions nifi-extension-bundles/nifi-elasticsearch-bundle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ language governing permissions and limitations under the License. -->
</modules>

<properties>
<elasticsearch.client.version>8.13.4</elasticsearch.client.version>
<elasticsearch.client.version>8.14.1</elasticsearch.client.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -88,7 +88,7 @@ language governing permissions and limitations under the License. -->
</activation>
<properties>
<!-- also update the default Elasticsearch version in nifi-elasticsearch-test-utils#src/main/java/org/apache/nifi/elasticsearch/integration/AbstractElasticsearchITBase.java-->
<elasticsearch_docker_image>8.13.4</elasticsearch_docker_image>
<elasticsearch_docker_image>8.14.1</elasticsearch_docker_image>
<elasticsearch.elastic.password>s3cret</elasticsearch.elastic.password>
</properties>
<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<artifactId>nifi-email-processors</artifactId>
<packaging>jar</packaging>
<properties>
<spring.integration.version>6.2.5</spring.integration.version>
<spring.integration.version>6.3.0</spring.integration.version>
<poi.version>5.2.5</poi.version>
</properties>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<module>nifi-provenance-repository-nar</module>
</modules>
<properties>
<lucene.version>9.10.0</lucene.version>
<lucene.version>9.11.0</lucene.version>
</properties>
<dependencyManagement>
<dependencies>
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.39.3</version>
<version>1.40.0</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 @@ -121,7 +121,7 @@
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
<version>3.43.0</version>
<version>3.44.0</version>
<scope>provided</scope>
</dependency>
<dependency>
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 @@ -317,7 +317,7 @@
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>4.2.25</version>
<version>4.2.26</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
Expand Down
4 changes: 2 additions & 2 deletions nifi-registry/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@
</modules>
<properties>
<spring.boot.version>3.3.0</spring.boot.version>
<flyway.version>10.13.0</flyway.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.9.0.202403050737-r</jgit.version>
<jgit.version>6.10.0.202406032230-r</jgit.version>
<org.apache.sshd.version>2.12.1</org.apache.sshd.version>
</properties>
<dependencyManagement>
Expand Down
14 changes: 7 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.733</com.amazonaws.version>
<software.amazon.awssdk.version>2.25.63</software.amazon.awssdk.version>
<com.amazonaws.version>1.12.742</com.amazonaws.version>
<software.amazon.awssdk.version>2.26.1</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>
Expand All @@ -121,9 +121,9 @@
<org.apache.commons.codec.version>1.17.0</org.apache.commons.codec.version>
<org.apache.commons.compress.version>1.26.2</org.apache.commons.compress.version>
<com.github.luben.zstd-jni.version>1.5.6-3</com.github.luben.zstd-jni.version>
<org.apache.commons.configuration.version>2.10.1</org.apache.commons.configuration.version>
<org.apache.commons.configuration.version>2.11.0</org.apache.commons.configuration.version>
<org.apache.commons.lang3.version>3.14.0</org.apache.commons.lang3.version>
<org.apache.commons.net.version>3.11.0</org.apache.commons.net.version>
<org.apache.commons.net.version>3.11.1</org.apache.commons.net.version>
<org.apache.commons.io.version>2.16.1</org.apache.commons.io.version>
<org.apache.commons.text.version>1.12.0</org.apache.commons.text.version>
<org.apache.httpcomponents.httpclient.version>4.5.14</org.apache.httpcomponents.httpclient.version>
Expand All @@ -133,7 +133,7 @@
<org.slf4j.version>2.0.13</org.slf4j.version>
<com.jayway.jsonpath.version>2.9.0</com.jayway.jsonpath.version>
<derby.version>10.17.1.0</derby.version>
<jetty.version>12.0.9</jetty.version>
<jetty.version>12.0.10</jetty.version>
<jackson.bom.version>2.17.1</jackson.bom.version>
<avro.version>1.11.3</avro.version>
<jaxb.runtime.version>4.0.5</jaxb.runtime.version>
Expand All @@ -153,9 +153,9 @@
<mockito.version>5.12.0</mockito.version>
<netty.3.version>3.10.6.Final</netty.3.version>
<snakeyaml.version>2.2</snakeyaml.version>
<netty.4.version>4.1.110.Final</netty.4.version>
<netty.4.version>4.1.111.Final</netty.4.version>
<servlet-api.version>6.0.0</servlet-api.version>
<spring.version>6.1.8</spring.version>
<spring.version>6.1.9</spring.version>
<spring.security.version>6.3.0</spring.security.version>
<swagger.annotations.version>2.2.22</swagger.annotations.version>
<h2.version>2.2.224</h2.version>
Expand Down

0 comments on commit bf637e0

Please sign in to comment.