Skip to content

Commit 9ddfef7

Browse files
authored
NIFI-15796 Bump NiFi API to 2.8.0, Jetty to 12.1.8, FastCSV to 4.2.0, and others (#11106)
- AWS Kinesis Client from 3.4.1 to 3.4.2 - https://github.com/awslabs/amazon-kinesis-client/releases/tag/v3.4.2 - Jedis from 7.4.0 to 7.4.1 - https://github.com/redis/jedis/releases/tag/v7.4.1 - FastCSV from 4.1.1 to 4.2.0 - https://github.com/osiegmar/FastCSV/releases/tag/v4.2.0 - checker-qual from 3.54.0 to 3.55.1 - https://github.com/typetools/checker-framework/releases/tag/checker-framework-3.55.1 - MariaDB Java Client from 3.5.7 to 3.5.8 - https://github.com/mariadb-corporation/mariadb-connector-j/releases/tag/3.5.8 - JLine from 4.0.9 to 4.0.10 - https://github.com/jline/jline3/releases/tag/4.0.10 - NiFi API from 2.7.0 to 2.8.0 - https://cwiki.apache.org/confluence/display/NIFI/Release+Notes#ReleaseNotes-NiFiAPIVersion2.8.0 - AWS SDK BOM from 2.42.25 to 2.42.28 - https://github.com/aws/aws-sdk-java-v2/blob/master/CHANGELOG.md - Apache Hadoop from 3.4.3 to 3.5.0 - https://hadoop.apache.org/docs/r3.5.0/hadoop-project-dist/hadoop-common/release/3.5.0/RELEASENOTES.3.5.0.html - Nimbus Jose JWT from 10.8 to 10.9 - https://bitbucket.org/connect2id/nimbus-jose-jwt/src/master/CHANGELOG.txt - Jetty from 12.1.7 to 12.1.8 - https://github.com/jetty/jetty.project/releases/tag/jetty-12.1.8 Signed-off-by: David Handermann <exceptionfactory@apache.org>
1 parent 1d2c25f commit 9ddfef7

8 files changed

Lines changed: 14 additions & 13 deletions

File tree

  • nifi-extension-bundles
    • nifi-aws-bundle/nifi-aws-kinesis
    • nifi-redis-bundle
    • nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services
    • nifi-standard-shared-bundle/nifi-standard-shared-bom
  • nifi-registry/nifi-registry-core/nifi-registry-test
  • nifi-toolkit/nifi-toolkit-cli

nifi-extension-bundles/nifi-aws-bundle/nifi-aws-kinesis/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
<dependency>
8383
<groupId>software.amazon.kinesis</groupId>
8484
<artifactId>amazon-kinesis-client</artifactId>
85-
<version>3.4.1</version>
85+
<version>3.4.2</version>
8686
<scope>test</scope>
8787
<exclusions>
8888
<exclusion>

nifi-extension-bundles/nifi-redis-bundle/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<properties>
2828
<spring.data.redis.version>4.0.4</spring.data.redis.version>
29-
<jedis.version>7.4.0</jedis.version>
29+
<jedis.version>7.4.1</jedis.version>
3030
</properties>
3131

3232
<modules>

nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
<dependency>
8989
<groupId>de.siegmar</groupId>
9090
<artifactId>fastcsv</artifactId>
91-
<version>4.1.1</version>
91+
<version>4.2.0</version>
9292
</dependency>
9393
<dependency>
9494
<groupId>com.github.palindromicity</groupId>

nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/csv/FastCSVRecordReader.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import de.siegmar.fastcsv.reader.CommentStrategy;
2121
import de.siegmar.fastcsv.reader.CsvReader;
2222
import de.siegmar.fastcsv.reader.CsvRecord;
23+
import de.siegmar.fastcsv.reader.FieldMismatchStrategy;
2324
import org.apache.commons.csv.CSVFormat;
2425
import org.apache.nifi.logging.ComponentLog;
2526
import org.apache.nifi.serialization.MalformedRecordException;
@@ -77,8 +78,8 @@ public FastCSVRecordReader(final InputStream in,
7778
.quoteCharacter(csvFormat.getQuoteCharacter())
7879
.commentStrategy(CommentStrategy.SKIP)
7980
.skipEmptyLines(csvFormat.getIgnoreEmptyLines())
80-
.allowExtraFields(csvFormat.getAllowMissingColumnNames())
81-
.allowMissingFields(csvFormat.getAllowMissingColumnNames());
81+
.extraFieldStrategy(csvFormat.getAllowMissingColumnNames() ? FieldMismatchStrategy.IGNORE : FieldMismatchStrategy.STRICT)
82+
.missingFieldStrategy(csvFormat.getAllowMissingColumnNames() ? FieldMismatchStrategy.IGNORE : FieldMismatchStrategy.STRICT);
8283

8384
if (csvFormat.getCommentMarker() != null) {
8485
builder.commentCharacter(csvFormat.getCommentMarker());

nifi-extension-bundles/nifi-standard-shared-bundle/nifi-standard-shared-bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
<dependency>
122122
<groupId>org.checkerframework</groupId>
123123
<artifactId>checker-qual</artifactId>
124-
<version>3.54.0</version>
124+
<version>3.55.1</version>
125125
<scope>provided</scope>
126126
</dependency>
127127
<dependency>

nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<dependency>
8080
<groupId>org.mariadb.jdbc</groupId>
8181
<artifactId>mariadb-java-client</artifactId>
82-
<version>3.5.7</version>
82+
<version>3.5.8</version>
8383
</dependency>
8484
<dependency>
8585
<groupId>org.postgresql</groupId>

nifi-toolkit/nifi-toolkit-cli/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<description>Tooling to make tls configuration easier</description>
2525

2626
<properties>
27-
<jline.version>4.0.9</jline.version>
27+
<jline.version>4.0.10</jline.version>
2828
</properties>
2929

3030
<build>

pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,11 @@
118118
<node.version>v22.19.0</node.version>
119119

120120
<!-- NiFi build -->
121-
<nifi-api.version>2.7.0</nifi-api.version>
121+
<nifi-api.version>2.8.0</nifi-api.version>
122122
<nifi.nar.maven.plugin.version>2.3.0</nifi.nar.maven.plugin.version>
123123

124124
<!-- CSPs SDK -->
125-
<software.amazon.awssdk.version>2.42.25</software.amazon.awssdk.version>
125+
<software.amazon.awssdk.version>2.42.28</software.amazon.awssdk.version>
126126
<software.amazon.encryption.s3.version>4.0.1</software.amazon.encryption.s3.version>
127127
<azure.sdk.bom.version>1.3.5</azure.sdk.bom.version> <!-- when changing this version, also update msal4j to the version that is required by azure-identity -->
128128

@@ -139,7 +139,7 @@
139139
<org.apache.commons.text.version>1.15.0</org.apache.commons.text.version>
140140

141141
<!-- Big data platforms -->
142-
<hadoop.version>3.4.3</hadoop.version>
142+
<hadoop.version>3.5.0</hadoop.version>
143143
<ozone.version>1.4.1</ozone.version>
144144

145145
<!-- Kubernetes -->
@@ -182,7 +182,7 @@
182182
<org.apache.sshd.version>2.17.1</org.apache.sshd.version>
183183

184184
<!-- Security -->
185-
<nimbus-jose-jwt.version>10.8</nimbus-jose-jwt.version>
185+
<nimbus-jose-jwt.version>10.9</nimbus-jose-jwt.version>
186186
<nimbus-oauth2-oidc.version>11.37</nimbus-oauth2-oidc.version>
187187
<org.bouncycastle.version>1.83</org.bouncycastle.version>
188188

@@ -198,7 +198,7 @@
198198
<jakarta.activation-api.version>2.1.4</jakarta.activation-api.version>
199199
<jaxb.runtime.version>4.0.7</jaxb.runtime.version>
200200
<jersey.bom.version>4.0.2</jersey.bom.version>
201-
<jetty.version>12.1.7</jetty.version>
201+
<jetty.version>12.1.8</jetty.version>
202202
<servlet-api.version>6.1.0</servlet-api.version>
203203
<spring.security.version>7.0.4</spring.security.version>
204204
<spring.version>7.0.6</spring.version>

0 commit comments

Comments
 (0)