Skip to content

Commit 5317d8f

Browse files
authored
NIFI-14510 Bump Azure SDK to 1.2.34, parquet to 1.15.2, commons config to 2.12.0, and others (#9913)
- Microsoft Azure Kusto from 5.2.0 to 6.0.2 - https://github.com/Azure/azure-kusto-java/releases/tag/v6.0.2 - Azure SDK from 1.2.33 to 1.2.34 - https://github.com/Azure/azure-sdk-for-java/releases/tag/azure-sdk-bom_1.2.34 - Box SDK from 4.16.0 to 4.16.1 - https://github.com/box/box-java-sdk/releases/tag/v4.16.1 - Google Drive from v3-rev20250329-2.0.0 to v3-rev20250427-2.0.0 - https://github.com/googleapis/google-api-java-client-services/blob/main/clients/google-api-services-drive/v3/2.0.0/README.md - parquet-avro from 1.15.1 to 1.15.2 - https://github.com/apache/parquet-java/releases/tag/apache-parquet-1.15.2 - Spring Data Redis from 3.4.1 to 3.4.5 - https://github.com/spring-projects/spring-data-redis/releases/tag/3.4.5 - Nimbus JWT from 10.0.2 to 10.2 - https://bitbucket.org/connect2id/nimbus-jose-jwt/src/master/CHANGELOG.txt - Apache Lucene from 10.2.0 to 10.2.1 - https://github.com/apache/lucene/releases/tag/releases%2Flucene%2F10.2.1 - MySQL Connector from 9.2.0 to 9.3.0 - https://dev.mysql.com/doc/relnotes/connector-j/en/news-9-3-0.html - AWS SDK v1 from 1.12.782 to 1.12.783 - https://github.com/aws/aws-sdk-java-v2/blob/master/CHANGELOG.md - AWS SDK v2 from 2.31.30 to 2.31.34 - https://github.com/aws/aws-sdk-java-v2/blob/master/CHANGELOG.md - io fabric8 k8s from 7.1.0 to 7.2.0 - https://github.com/fabric8io/kubernetes-client/blob/main/CHANGELOG.md#720-2025-04-30 - Apache Commons Configuration from 2.11.0 to 2.12.0 - https://commons.apache.org/proper/commons-configuration/changes.html#a2.12.0 - jsoup from 1.19.1 to 1.20.1 - https://github.com/jhy/jsoup/blob/master/CHANGES.md#1201-2025-04-29 Signed-off-by: David Handermann <[email protected]>
1 parent 83af643 commit 5317d8f

File tree

13 files changed

+30
-32
lines changed

13 files changed

+30
-32
lines changed

nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
<dependency>
5252
<groupId>org.apache.nifi</groupId>
5353
<artifactId>nifi-record</artifactId>
54-
<version>2.5.0-SNAPSHOT</version>
5554
</dependency>
5655
<dependency>
5756
<groupId>org.apache.nifi</groupId>
@@ -128,12 +127,12 @@
128127
<dependency>
129128
<groupId>com.microsoft.azure.kusto</groupId>
130129
<artifactId>kusto-data</artifactId>
131-
<version>5.2.0</version>
130+
<version>6.0.2</version>
132131
</dependency>
133132
<dependency>
134133
<groupId>com.microsoft.azure.kusto</groupId>
135134
<artifactId>kusto-ingest</artifactId>
136-
<version>5.2.0</version>
135+
<version>6.0.2</version>
137136
</dependency>
138137
<dependency>
139138
<groupId>com.fasterxml.jackson.core</groupId>

nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/data/explorer/StandardKustoIngestService.java

+7-10
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import com.microsoft.azure.kusto.data.Client;
2020
import com.microsoft.azure.kusto.data.ClientFactory;
21+
import com.microsoft.azure.kusto.data.KustoOperationResult;
2122
import com.microsoft.azure.kusto.data.KustoResultColumn;
2223
import com.microsoft.azure.kusto.data.KustoResultSetTable;
2324
import com.microsoft.azure.kusto.data.auth.ConnectionStringBuilder;
@@ -164,13 +165,7 @@ public final void onStopped() {
164165
}
165166
}
166167
if (this.executionClient != null) {
167-
try {
168-
this.executionClient.close();
169-
} catch (IOException e) {
170-
getLogger().error("Closing Azure Data Explorer Execution Client failed", e);
171-
} finally {
172-
this.executionClient = null;
173-
}
168+
this.executionClient = null;
174169
}
175170
}
176171

@@ -319,14 +314,16 @@ private KustoIngestQueryResponse executeQuery(final String databaseName, final S
319314

320315
KustoIngestQueryResponse kustoIngestQueryResponse;
321316
try {
322-
KustoResultSetTable kustoResultSetTable = this.executionClient.execute(databaseName, query).getPrimaryResults();
323-
Map<Integer, List<String>> response = new HashMap<>();
317+
final KustoOperationResult kustoOperationResult = this.executionClient.executeQuery(databaseName, query);
318+
final KustoResultSetTable kustoResultSetTable = kustoOperationResult.getPrimaryResults();
319+
320+
final Map<Integer, List<String>> response = new HashMap<>();
324321
int rowCount = 0;
325322

326323
// Add the received values to the new ingestion resources
327324
while (kustoResultSetTable.hasNext()) {
328325
kustoResultSetTable.next();
329-
List<String> rowData = new ArrayList<>();
326+
final List<String> rowData = new ArrayList<>();
330327
for (KustoResultColumn columnName : kustoResultSetTable.getColumns()) {
331328
String data = kustoResultSetTable.getString(columnName.getOrdinal());
332329
rowData.add(data);

nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/data/explorer/StandardKustoQueryService.java

-5
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,6 @@ public final void onStopped() {
112112
if (this.kustoClient == null) {
113113
getLogger().debug("Kusto Client not configured");
114114
} else {
115-
try {
116-
this.kustoClient.close();
117-
} catch (final Exception e) {
118-
getLogger().error("Kusto Client close failed", e);
119-
}
120115
this.kustoClient = null;
121116
}
122117
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
<properties>
3030
<!-- when changing the Azure SDK version, also update msal4j to the version that is required by azure-identity -->
31-
<azure.sdk.bom.version>1.2.33</azure.sdk.bom.version>
31+
<azure.sdk.bom.version>1.2.34</azure.sdk.bom.version>
3232
<msal4j.version>1.19.1</msal4j.version>
3333
<qpid.proton.version>0.34.1</qpid.proton.version>
3434
</properties>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<dependency>
4040
<groupId>com.box</groupId>
4141
<artifactId>box-java-sdk</artifactId>
42-
<version>4.16.0</version>
42+
<version>4.16.1</version>
4343
</dependency>
4444
</dependencies>
4545
</dependencyManagement>

nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
<dependency>
128128
<groupId>com.google.apis</groupId>
129129
<artifactId>google-api-services-drive</artifactId>
130-
<version>v3-rev20250329-2.0.0</version>
130+
<version>v3-rev20250427-2.0.0</version>
131131
</dependency>
132132
<dependency>
133133
<groupId>com.tdunning</groupId>

nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-processors/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
<dependency>
7979
<groupId>org.apache.parquet</groupId>
8080
<artifactId>parquet-avro</artifactId>
81-
<version>1.15.1</version>
81+
<version>1.15.2</version>
8282
<exclusions>
8383
<exclusion>
8484
<groupId>org.xerial.snappy</groupId>

nifi-extension-bundles/nifi-redis-bundle/nifi-redis-utils/src/main/java/org/apache/nifi/redis/util/RedisUtils.java

+8-1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.apache.nifi.util.StringUtils;
3030
import org.slf4j.Logger;
3131
import org.slf4j.LoggerFactory;
32+
import org.springframework.data.redis.connection.PoolException;
3233
import org.springframework.data.redis.connection.RedisClusterConfiguration;
3334
import org.springframework.data.redis.connection.RedisConfiguration;
3435
import org.springframework.data.redis.connection.RedisConnectionFactory;
@@ -46,6 +47,7 @@
4647
import redis.clients.jedis.JedisPoolConfig;
4748

4849
import javax.net.ssl.SSLContext;
50+
4951
import java.time.Duration;
5052
import java.util.ArrayList;
5153
import java.util.HashSet;
@@ -425,7 +427,12 @@ public static JedisConnectionFactory createConnectionFactory(final RedisConfig r
425427
}
426428

427429
// need to call this to initialize the pool/connections
428-
connectionFactory.afterPropertiesSet();
430+
try {
431+
connectionFactory.afterPropertiesSet();
432+
} catch (PoolException e) {
433+
LOGGER.warn("Could not pre-warm Redis pool (no Redis running?) – will connect lazily", e);
434+
}
435+
429436
return connectionFactory;
430437
}
431438

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<packaging>pom</packaging>
2626

2727
<properties>
28-
<spring.data.redis.version>3.4.1</spring.data.redis.version>
28+
<spring.data.redis.version>3.4.5</spring.data.redis.version>
2929
<jedis.version>5.2.0</jedis.version>
3030
</properties>
3131

nifi-extension-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/nifi-oauth2-provider-service/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<dependency>
5555
<groupId>com.nimbusds</groupId>
5656
<artifactId>nimbus-jose-jwt</artifactId>
57-
<version>10.0.2</version>
57+
<version>10.2</version>
5858
<exclusions>
5959
<exclusion>
6060
<groupId>com.google.crypto.tink</groupId>

nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<module>nifi-provenance-repository-nar</module>
2828
</modules>
2929
<properties>
30-
<lucene.version>10.2.0</lucene.version>
30+
<lucene.version>10.2.1</lucene.version>
3131
</properties>
3232
<dependencyManagement>
3333
<dependencies>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<dependency>
6363
<groupId>com.mysql</groupId>
6464
<artifactId>mysql-connector-j</artifactId>
65-
<version>9.2.0</version>
65+
<version>9.3.0</version>
6666
<exclusions>
6767
<!-- Exclude unused protobuf-java -->
6868
<exclusion>

pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,10 @@
109109
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
110110
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
111111
<inceptionYear>2014</inceptionYear>
112-
<com.amazonaws.version>1.12.782</com.amazonaws.version>
113-
<software.amazon.awssdk.version>2.31.30</software.amazon.awssdk.version>
112+
<com.amazonaws.version>1.12.783</com.amazonaws.version>
113+
<software.amazon.awssdk.version>2.31.34</software.amazon.awssdk.version>
114114
<gson.version>2.13.1</gson.version>
115-
<io.fabric8.kubernetes.client.version>7.1.0</io.fabric8.kubernetes.client.version>
115+
<io.fabric8.kubernetes.client.version>7.2.0</io.fabric8.kubernetes.client.version>
116116
<kotlin.version>2.1.20</kotlin.version>
117117
<okhttp.version>4.12.0</okhttp.version>
118118
<okio.version>3.11.0</okio.version>
@@ -121,7 +121,7 @@
121121
<org.apache.commons.collections4.version>4.5.0</org.apache.commons.collections4.version>
122122
<org.apache.commons.compress.version>1.27.1</org.apache.commons.compress.version>
123123
<com.github.luben.zstd-jni.version>1.5.7-2</com.github.luben.zstd-jni.version>
124-
<org.apache.commons.configuration.version>2.11.0</org.apache.commons.configuration.version>
124+
<org.apache.commons.configuration.version>2.12.0</org.apache.commons.configuration.version>
125125
<org.apache.commons.lang3.version>3.17.0</org.apache.commons.lang3.version>
126126
<org.apache.commons.net.version>3.11.1</org.apache.commons.net.version>
127127
<org.apache.commons.io.version>2.19.0</org.apache.commons.io.version>
@@ -539,7 +539,7 @@
539539
<dependency>
540540
<groupId>org.jsoup</groupId>
541541
<artifactId>jsoup</artifactId>
542-
<version>1.19.1</version>
542+
<version>1.20.1</version>
543543
</dependency>
544544
<dependency>
545545
<groupId>com.github.ben-manes.caffeine</groupId>

0 commit comments

Comments
 (0)