This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 051445e325 NIFI-14818 Bump GCP SDK to 26.65.0, Azure SDK to 1.2.37 and
others (#10168)
051445e325 is described below
commit 051445e3255582d6921c787977a3ea0e6a845ec5
Author: Pierre Villard <pierre.villard...@gmail.com>
AuthorDate: Tue Aug 5 22:51:10 2025 +0200
NIFI-14818 Bump GCP SDK to 26.65.0, Azure SDK to 1.2.37 and others (#10168)
- Azure SDK from 1.2.36 to 1.2.37 -
https://github.com/Azure/azure-sdk-for-java/releases/tag/azure-sdk-bom_1.2.37
- Google Cloud SDK from 26.64.0 to 26.65.0 -
https://github.com/googleapis/java-cloud-bom/releases/tag/v26.65.0
- AWS v2 SDK from 2.32.13 to 2.32.14 -
https://github.com/aws/aws-sdk-java-v2/blob/master/CHANGELOG.md
- Apache Commons CLI from 1.9.0 to 1.10.0 -
https://github.com/apache/commons-cli/blob/master/RELEASE-NOTES.txt
- Apache Commons Net from 3.11.1 to 3.12.0 -
https://downloads.apache.org/commons/net/RELEASE-NOTES.txt
- JSON Smart from 2.5.2 to 2.6.0 -
https://github.com/netplex/json-smart-v2/releases/tag/v2.6.0
Signed-off-by: David Handermann <exceptionfact...@apache.org>
* review
* review
---------
Signed-off-by: Pierre Villard <pierre.villard...@gmail.com>
---
nifi-extension-bundles/nifi-azure-bundle/pom.xml | 2 +-
nifi-extension-bundles/nifi-gcp-bundle/pom.xml | 2 +-
.../FlowPersistenceProviderMigrator.java | 13 ++++---
.../toolkit/cli/impl/command/AbstractCommand.java | 42 ++++++++++++----------
.../cli/impl/command/AbstractCommandGroup.java | 29 +++++++--------
.../toolkit/cli/impl/command/CommandOption.java | 4 +--
pom.xml | 8 ++---
7 files changed, 54 insertions(+), 46 deletions(-)
diff --git a/nifi-extension-bundles/nifi-azure-bundle/pom.xml
b/nifi-extension-bundles/nifi-azure-bundle/pom.xml
index afecdf29c2..5dc3160655 100644
--- a/nifi-extension-bundles/nifi-azure-bundle/pom.xml
+++ b/nifi-extension-bundles/nifi-azure-bundle/pom.xml
@@ -28,7 +28,7 @@
<properties>
<!-- when changing the Azure SDK version, also update msal4j to the
version that is required by azure-identity -->
- <azure.sdk.bom.version>1.2.36</azure.sdk.bom.version>
+ <azure.sdk.bom.version>1.2.37</azure.sdk.bom.version>
<msal4j.version>1.21.0</msal4j.version>
<qpid.proton.version>0.34.1</qpid.proton.version>
</properties>
diff --git a/nifi-extension-bundles/nifi-gcp-bundle/pom.xml
b/nifi-extension-bundles/nifi-gcp-bundle/pom.xml
index 976f91a3cf..2d41ce5bff 100644
--- a/nifi-extension-bundles/nifi-gcp-bundle/pom.xml
+++ b/nifi-extension-bundles/nifi-gcp-bundle/pom.xml
@@ -25,7 +25,7 @@
<packaging>pom</packaging>
<properties>
- <google.libraries.version>26.64.0</google.libraries.version>
+ <google.libraries.version>26.65.0</google.libraries.version>
</properties>
<dependencyManagement>
diff --git
a/nifi-registry/nifi-registry-toolkit/nifi-registry-toolkit-persistence/src/main/java/org/apache/nifi/registry/toolkit/persistence/FlowPersistenceProviderMigrator.java
b/nifi-registry/nifi-registry-toolkit/nifi-registry-toolkit-persistence/src/main/java/org/apache/nifi/registry/toolkit/persistence/FlowPersistenceProviderMigrator.java
index 99cb9a3f54..7676f9b1c9 100644
---
a/nifi-registry/nifi-registry-toolkit/nifi-registry-toolkit-persistence/src/main/java/org/apache/nifi/registry/toolkit/persistence/FlowPersistenceProviderMigrator.java
+++
b/nifi-registry/nifi-registry-toolkit/nifi-registry-toolkit-persistence/src/main/java/org/apache/nifi/registry/toolkit/persistence/FlowPersistenceProviderMigrator.java
@@ -19,9 +19,9 @@ package org.apache.nifi.registry.toolkit.persistence;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.DefaultParser;
-import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
+import org.apache.commons.cli.help.HelpFormatter;
import org.apache.nifi.registry.NiFiRegistry;
import org.apache.nifi.registry.db.DataSourceFactory;
import org.apache.nifi.registry.db.DatabaseMetadataService;
@@ -41,6 +41,8 @@ import org.slf4j.LoggerFactory;
import org.springframework.jdbc.core.JdbcTemplate;
import javax.sql.DataSource;
+
+import java.io.IOException;
import java.util.Properties;
public class FlowPersistenceProviderMigrator {
@@ -66,7 +68,7 @@ public class FlowPersistenceProviderMigrator {
}
}
- public static void main(String[] args) {
+ public static void main(String[] args) throws IOException {
Options options = new Options();
options.addOption("t", "to", true, "Providers xml to migrate to.");
CommandLineParser parser = new DefaultParser();
@@ -76,9 +78,10 @@ public class FlowPersistenceProviderMigrator {
commandLine = parser.parse(options, args);
} catch (ParseException e) {
log.error("Unable to parse command line.", e);
-
- new HelpFormatter().printHelp("persistence-toolkit [args]",
options);
-
+ HelpFormatter.builder()
+ .setShowSince(false)
+ .get()
+ .printHelp("persistence-toolkit [args]", null, options,
null, false);
System.exit(PARSE_EXCEPTION);
}
diff --git
a/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/AbstractCommand.java
b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/AbstractCommand.java
index 17fd78a6a1..c04293a3e7 100644
---
a/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/AbstractCommand.java
+++
b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/AbstractCommand.java
@@ -16,10 +16,11 @@
*/
package org.apache.nifi.toolkit.cli.impl.command;
-import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.MissingOptionException;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
+import org.apache.commons.cli.help.HelpFormatter;
+import org.apache.commons.cli.help.TextHelpAppendable;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.nifi.toolkit.cli.api.Command;
@@ -130,25 +131,28 @@ public abstract class AbstractCommand<R extends Result>
implements Command<R> {
output.println();
}
- final PrintWriter printWriter = new PrintWriter(output);
-
- final int width = 80;
- final HelpFormatter hf = new HelpFormatter();
- hf.setWidth(width);
-
- hf.printWrapped(printWriter, width, getDescription());
- hf.printWrapped(printWriter, width, "");
-
- if (isReferencable()) {
- hf.printWrapped(printWriter, width, "PRODUCES BACK-REFERENCES");
- hf.printWrapped(printWriter, width, "");
+ try {
+ final PrintWriter printWriter = new PrintWriter(output);
+ final TextHelpAppendable appendable = new
TextHelpAppendable(printWriter);
+ appendable.setMaxWidth(80);
+
+ appendable.appendParagraph(getDescription());
+
+ if (isReferencable()) {
+ appendable.appendParagraph("PRODUCES BACK-REFERENCES");
+ }
+
+ HelpFormatter.builder()
+ .setHelpAppendable(appendable)
+ .setShowSince(false)
+ .get()
+ .printHelp(getName(), null, getOptions(), null, false);
+
+ printWriter.println();
+ printWriter.flush();
+ } catch (IOException e) {
+ throw new RuntimeException("Unable to print command usage for " +
getName(), e);
}
-
- hf.printHelp(printWriter, hf.getWidth(), getName(), null, getOptions(),
- hf.getLeftPadding(), hf.getDescPadding(), null, false);
-
- printWriter.println();
- printWriter.flush();
}
diff --git
a/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/AbstractCommandGroup.java
b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/AbstractCommandGroup.java
index 9a3a7dad0d..05d275b2b2 100644
---
a/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/AbstractCommandGroup.java
+++
b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/AbstractCommandGroup.java
@@ -16,12 +16,13 @@
*/
package org.apache.nifi.toolkit.cli.impl.command;
-import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.help.TextHelpAppendable;
import org.apache.commons.lang3.Validate;
import org.apache.nifi.toolkit.cli.api.Command;
import org.apache.nifi.toolkit.cli.api.CommandGroup;
import org.apache.nifi.toolkit.cli.api.Context;
+import java.io.IOException;
import java.io.PrintStream;
import java.io.PrintWriter;
import java.util.Collections;
@@ -70,22 +71,22 @@ public abstract class AbstractCommandGroup implements
CommandGroup {
@Override
public void printUsage(final boolean verbose) {
if (verbose) {
- final PrintWriter printWriter = new PrintWriter(output);
- final int width = 80;
- final HelpFormatter hf = new HelpFormatter();
- hf.setWidth(width);
+ final PrintWriter printWriter = new PrintWriter(output);
+ final TextHelpAppendable appendable = new
TextHelpAppendable(printWriter);
+ appendable.setMaxWidth(80);
commands.stream().forEach(c -> {
- hf.printWrapped(printWriter, width,
"-------------------------------------------------------------------------------");
- hf.printWrapped(printWriter, width, "COMMAND: " + getName() +
" " + c.getName());
- hf.printWrapped(printWriter, width, "");
- hf.printWrapped(printWriter, width, "- " + c.getDescription());
- hf.printWrapped(printWriter, width, "");
-
- if (c.isReferencable()) {
- hf.printWrapped(printWriter, width, "PRODUCES
BACK-REFERENCES");
- hf.printWrapped(printWriter, width, "");
+ try {
+
appendable.appendParagraph("-------------------------------------------------------------------------------");
+ appendable.appendParagraph("COMMAND: " + getName() + " " +
c.getName());
+ appendable.appendParagraph("- " + c.getDescription());
+
+ if (c.isReferencable()) {
+ appendable.appendParagraph("PRODUCES BACK-REFERENCES");
+ }
+ } catch (IOException e) {
+ throw new RuntimeException("Unable to print command usage
for " + c.getName(), e);
}
});
diff --git
a/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/CommandOption.java
b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/CommandOption.java
index 84da0839cf..17f86d01c6 100644
---
a/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/CommandOption.java
+++
b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/CommandOption.java
@@ -234,10 +234,10 @@ public enum CommandOption {
}
public Option createOption() {
- return
Option.builder(shortName).longOpt(longName).desc(description).hasArg(hasArg).build();
+ return
Option.builder(shortName).longOpt(longName).desc(description).hasArg(hasArg).get();
}
public Option createOption(final String description) {
- return
Option.builder(shortName).longOpt(longName).desc(description).hasArg(hasArg).build();
+ return
Option.builder(shortName).longOpt(longName).desc(description).hasArg(hasArg).get();
}
}
diff --git a/pom.xml b/pom.xml
index b8f8c177d3..34ac0cf11c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,20 +110,20 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<inceptionYear>2014</inceptionYear>
<com.amazonaws.version>1.12.788</com.amazonaws.version>
-
<software.amazon.awssdk.version>2.32.13</software.amazon.awssdk.version>
+
<software.amazon.awssdk.version>2.32.14</software.amazon.awssdk.version>
<gson.version>2.13.1</gson.version>
<io.fabric8.kubernetes.client.version>7.3.1</io.fabric8.kubernetes.client.version>
<kotlin.version>2.2.0</kotlin.version>
<okhttp.version>5.1.0</okhttp.version>
<okio.version>3.16.0</okio.version>
- <org.apache.commons.cli.version>1.9.0</org.apache.commons.cli.version>
+ <org.apache.commons.cli.version>1.10.0</org.apache.commons.cli.version>
<org.apache.commons.codec.version>1.19.0</org.apache.commons.codec.version>
<org.apache.commons.collections4.version>4.5.0</org.apache.commons.collections4.version>
<org.apache.commons.compress.version>1.28.0</org.apache.commons.compress.version>
<com.github.luben.zstd-jni.version>1.5.7-4</com.github.luben.zstd-jni.version>
<org.apache.commons.configuration.version>2.12.0</org.apache.commons.configuration.version>
<org.apache.commons.lang3.version>3.18.0</org.apache.commons.lang3.version>
- <org.apache.commons.net.version>3.11.1</org.apache.commons.net.version>
+ <org.apache.commons.net.version>3.12.0</org.apache.commons.net.version>
<org.apache.commons.io.version>2.20.0</org.apache.commons.io.version>
<org.apache.commons.text.version>1.14.0</org.apache.commons.text.version>
<org.apache.commons.csv.version>1.14.1</org.apache.commons.csv.version>
@@ -142,7 +142,7 @@
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
<jakarta.xml.bind-api.version>4.0.2</jakarta.xml.bind-api.version>
<jakarta.ws.rs-api.version>3.1.0</jakarta.ws.rs-api.version>
- <json.smart.version>2.5.2</json.smart.version>
+ <json.smart.version>2.6.0</json.smart.version>
<groovy.version>4.0.28</groovy.version>
<surefire.version>3.5.1</surefire.version>
<hadoop.version>3.4.1</hadoop.version>
