This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 17af6ba346d camel-jbang - Fix dependency list not printing out
17af6ba346d is described below
commit 17af6ba346df5387c57862264f3887683cefc790
Author: Claus Ibsen <[email protected]>
AuthorDate: Thu Feb 6 07:36:32 2025 +0100
camel-jbang - Fix dependency list not printing out
---
.../dsl/jbang/core/commands/DependencyCopy.java | 7 ++++---
.../dsl/jbang/core/commands/DependencyList.java | 20 ++++++++++----------
.../dsl/jbang/core/commands/DependencyUpdate.java | 6 +++---
.../apache/camel/dsl/jbang/core/commands/Export.java | 6 +++---
.../dsl/jbang/core/commands/ExportBaseCommand.java | 8 ++++++--
.../dsl/jbang/core/commands/ExportCamelMain.java | 6 +++---
.../camel/dsl/jbang/core/commands/ExportQuarkus.java | 4 ++--
.../dsl/jbang/core/commands/ExportSpringBoot.java | 4 ++--
.../apache/camel/dsl/jbang/core/commands/Run.java | 4 ++--
.../camel/dsl/jbang/core/commands/SBOMGenerator.java | 6 +++---
.../core/commands/action/TransformMessageAction.java | 10 +++++-----
.../jbang/core/commands/catalog/CatalogKamelet.java | 2 +-
.../dsl/jbang/core/commands/process/Hawtio.java | 8 ++++----
.../dsl/jbang/core/commands/process/Jolokia.java | 2 +-
14 files changed, 49 insertions(+), 44 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyCopy.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyCopy.java
index 328c7be50e3..e7140a42fd7 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyCopy.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyCopy.java
@@ -36,6 +36,7 @@ import picocli.CommandLine;
description = "Copies all Camel dependencies required to
run to a specific directory", sortOptions = false,
showDefaultValues = true)
public class DependencyCopy extends DependencyList {
+
private static final Set<String> EXCLUDED_GROUP_IDS =
Set.of("org.fusesource.jansi", "org.apache.logging.log4j");
private MavenDownloader downloader;
@@ -54,7 +55,7 @@ public class DependencyCopy extends DependencyList {
if (Files.isDirectory(outputDirectoryPath)) {
FileUtil.removeDir(outputDirectoryPath.toFile());
} else {
- System.err.println("Error creating the output directory: " +
outputDirectory
+ printer().printErr("Error creating the output directory: " +
outputDirectory
+ " is not a directory");
return;
}
@@ -79,9 +80,9 @@ public class DependencyCopy extends DependencyList {
Files.copy(artifact.getFile().toPath(), target);
}
} catch (MavenResolutionException e) {
- System.err.println("Error resolving the artifact: " + gav + " due
to: " + e.getMessage());
+ printer().printErr("Error resolving the artifact: " + gav + " due
to: " + e.getMessage());
} catch (IOException e) {
- System.err.println("Error copying the artifact: " + gav + " due
to: " + e.getMessage());
+ printer().printErr("Error copying the artifact: " + gav + " due
to: " + e.getMessage());
}
}
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyList.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyList.java
index 68ee6f189a7..92e98b07f89 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyList.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyList.java
@@ -60,7 +60,7 @@ public class DependencyList extends Export {
@Override
protected Integer export() throws Exception {
if (!"gav".equals(output) && !"maven".equals(output) &&
!"jbang".equals(output)) {
- System.err.println("--output must be either gav or maven, was: " +
output);
+ printer().printErr("--output must be either gav or maven, was: " +
output);
return 1;
}
@@ -162,22 +162,22 @@ public class DependencyList extends Export {
protected void outputGav(MavenGav gav, int index, int total) {
if ("gav".equals(output)) {
- printer().println(String.valueOf(gav));
+ outPrinter().println(String.valueOf(gav));
} else if ("maven".equals(output)) {
- printer().println("<dependency>");
- printer().printf(" <groupId>%s</groupId>%n", gav.getGroupId());
- printer().printf(" <artifactId>%s</artifactId>%n",
gav.getArtifactId());
- printer().printf(" <version>%s</version>%n", gav.getVersion());
- printer().println("</dependency>");
+ outPrinter().println("<dependency>");
+ outPrinter().printf(" <groupId>%s</groupId>%n",
gav.getGroupId());
+ outPrinter().printf(" <artifactId>%s</artifactId>%n",
gav.getArtifactId());
+ outPrinter().printf(" <version>%s</version>%n",
gav.getVersion());
+ outPrinter().println("</dependency>");
} else if ("jbang".equals(output)) {
if (index == 0) {
- printer().println("//DEPS org.apache.camel:camel-bom:" +
gav.getVersion() + "@pom");
+ outPrinter().println("//DEPS org.apache.camel:camel-bom:" +
gav.getVersion() + "@pom");
}
if (gav.getGroupId().equals("org.apache.camel")) {
// jbang has version in @pom so we should remove this
gav.setVersion(null);
}
- printer().println("//DEPS " + gav);
+ outPrinter().println("//DEPS " + gav);
}
}
@@ -225,7 +225,7 @@ public class DependencyList extends Export {
return export(new ExportCamelMain(getMain()));
}
default -> {
- System.err.println("Unknown runtime: " + runtime);
+ printer().printErr("Unknown runtime: " + runtime);
return 1;
}
}
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyUpdate.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyUpdate.java
index 1dd90acfaa9..d4b8f0dbf33 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyUpdate.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyUpdate.java
@@ -49,10 +49,10 @@ public class DependencyUpdate extends DependencyList {
@Override
public Integer doCall() throws Exception {
- // source file must exists
+ // source file must exist
target = new File(source);
if (!target.exists()) {
- System.err.println("Source file does not exist: " + target);
+ printer().printErr("Source file does not exist: " + target);
return -1;
}
@@ -119,7 +119,7 @@ public class DependencyUpdate extends DependencyList {
String text = String.join(System.lineSeparator(), answer);
IOHelper.writeText(text, target);
} catch (Exception e) {
- System.err.println("Error updating source file: " + target + " due
to: " + e.getMessage());
+ printer().printErr("Error updating source file: " + target + " due
to: " + e.getMessage());
}
}
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java
index 4884a23a4d1..90b0c4a3af4 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java
@@ -52,14 +52,14 @@ public class Export extends ExportBaseCommand {
}
if (runtime == null) {
- System.err.println("The runtime option must be specified");
+ printer().printErr("The runtime option must be specified");
return 1;
}
if (gav == null) {
String pn = getProjectName();
if (pn == null) {
- System.err.println("Failed to resolve project name: Please
provide --name, --gav or source file");
+ printer().printErr("Failed to resolve project name: Please
provide --name, --gav or source file");
return 1;
}
gav = "org.example.project:%s:%s".formatted(pn, getVersion());
@@ -76,7 +76,7 @@ public class Export extends ExportBaseCommand {
return export(new ExportCamelMain(getMain()));
}
default -> {
- System.err.println("Unknown runtime: " + runtime);
+ printer().printErr("Unknown runtime: " + runtime);
return 1;
}
}
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
index 8741b0a8192..203cc9a6bc1 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
@@ -1116,9 +1116,9 @@ public abstract class ExportBaseCommand extends
CamelCommand {
Files.copy(artifact.getFile().toPath(), target);
}
} catch (MavenResolutionException e) {
- System.err.println("Error resolving the artifact: " + gav + " due
to: " + e.getMessage());
+ printer().printErr("Error resolving the artifact: " + gav + " due
to: " + e.getMessage());
} catch (IOException e) {
- System.err.println("Error copying the artifact: " + gav + " due
to: " + e.getMessage());
+ printer().printErr("Error copying the artifact: " + gav + " due
to: " + e.getMessage());
}
}
@@ -1163,6 +1163,10 @@ public abstract class ExportBaseCommand extends
CamelCommand {
((MavenDownloaderImpl) downloader).build();
}
+ protected Printer outPrinter() {
+ return super.printer();
+ }
+
@Override
protected Printer printer() {
if (quiet) {
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
index aa80cc808fc..c41f3432f84 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
@@ -47,15 +47,15 @@ class ExportCamelMain extends Export {
public Integer export() throws Exception {
String[] ids = gav.split(":");
if (ids.length != 3) {
- System.err.println("--gav must be in syntax:
groupId:artifactId:version");
+ printer().printErr("--gav must be in syntax:
groupId:artifactId:version");
return 1;
}
if (!buildTool.equals("maven") && !buildTool.equals("gradle")) {
- System.err.println("--build-tool must either be maven or gradle,
was: " + buildTool);
+ printer().printErr("--build-tool must either be maven or gradle,
was: " + buildTool);
return 1;
}
if (buildTool.equals("gradle")) {
- System.err.println("--build-tool=gradle is not support yet for
camel-main runtime.");
+ printer().printErr("--build-tool=gradle is not support yet for
camel-main runtime.");
}
// the settings file has information what to export
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
index 7fc6ebbe004..24555910910 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
@@ -53,11 +53,11 @@ class ExportQuarkus extends Export {
public Integer export() throws Exception {
String[] ids = gav.split(":");
if (ids.length != 3) {
- System.err.println("--gav must be in syntax:
groupId:artifactId:version");
+ printer().printErr("--gav must be in syntax:
groupId:artifactId:version");
return 1;
}
if (!buildTool.equals("maven") && !buildTool.equals("gradle")) {
- System.err.println("--build-tool must either be maven or gradle,
was: " + buildTool);
+ printer().printErr("--build-tool must either be maven or gradle,
was: " + buildTool);
return 1;
}
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
index 133e671d589..75b1660491f 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
@@ -51,11 +51,11 @@ class ExportSpringBoot extends Export {
public Integer export() throws Exception {
String[] ids = gav.split(":");
if (ids.length != 3) {
- System.err.println("--gav must be in syntax:
groupId:artifactId:version");
+ printer().printErr("--gav must be in syntax:
groupId:artifactId:version");
return 1;
}
if (!buildTool.equals("maven") && !buildTool.equals("gradle")) {
- System.err.println("--build-tool must either be maven or gradle,
was: " + buildTool);
+ printer().printErr("--build-tool must either be maven or gradle,
was: " + buildTool);
return 1;
}
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index 93f9677d0be..215a2213fa4 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -733,7 +733,7 @@ public class Run extends CamelCommand {
// check if file exist
File inputFile = new File(file.substring(5));
if (!inputFile.exists() && !inputFile.isFile()) {
- System.err.println("File does not exist: " + file);
+ printer().printErr("File does not exist: " + file);
return 1;
}
}
@@ -778,7 +778,7 @@ public class Run extends CamelCommand {
// must be an existing directory
File dir = new File(sourceDir);
if (!dir.exists() && !dir.isDirectory()) {
- System.err.println("Directory does not exist: " + sourceDir);
+ printer().printErr("Directory does not exist: " + sourceDir);
return 1;
}
// make it a pattern as we load all files from this directory
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/SBOMGenerator.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/SBOMGenerator.java
index 81bfcc99b11..6697fb21146 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/SBOMGenerator.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/SBOMGenerator.java
@@ -49,8 +49,8 @@ public class SBOMGenerator extends Export {
protected String outputName = "sbom";
@CommandLine.Option(names = { "--cyclonedx-plugin-version" }, description
= "The CycloneDX Maven Plugin version",
- defaultValue = "2.9.0")
- protected String cyclonedxPluginVersion = "2.9.0";
+ defaultValue = "2.9.1")
+ protected String cyclonedxPluginVersion = "2.9.1";
@CommandLine.Option(names = { "--spdx-plugin-version" }, description =
"The SPDX Maven Plugin version",
defaultValue = "0.7.4")
@@ -188,7 +188,7 @@ public class SBOMGenerator extends Export {
return export(new ExportCamelMain(getMain()));
}
default -> {
- System.err.println("Unknown runtime: " + runtime);
+ printer().printErr("Unknown runtime: " + runtime);
return 1;
}
}
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/TransformMessageAction.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/TransformMessageAction.java
index 3e57c3bffa2..42b53462c7c 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/TransformMessageAction.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/TransformMessageAction.java
@@ -129,11 +129,11 @@ public class TransformMessageAction extends
ActionWatchCommand {
if (dataformat == null) {
// either source or language/template is required
if (source == null && template == null && language == null &&
component == null) {
- System.err.println("Either source or template and one of
language/component must be configured");
+ printer().printErr("Either source or template and one of
language/component must be configured");
return -1;
}
if (source == null && (template == null || language == null &&
component == null)) {
- System.err.println("Both template and one of
language/component must be configured");
+ printer().printErr("Both template and one of
language/component must be configured");
return -1;
}
}
@@ -144,14 +144,14 @@ public class TransformMessageAction extends
ActionWatchCommand {
s = StringHelper.beforeLast(s, ":", s); // remove line number
File f = new File(s);
if (!f.exists()) {
- System.err.println("Source file does not exist: " + f);
+ printer().printErr("Source file does not exist: " + f);
return -1;
}
}
if (template != null && template.startsWith("file:")) {
File f = new File(template.substring(5));
if (!f.exists()) {
- System.err.println("Template file does not exist: " + f);
+ printer().printErr("Template file does not exist: " + f);
return -1;
}
}
@@ -162,7 +162,7 @@ public class TransformMessageAction extends
ActionWatchCommand {
Run run = new Run(getMain());
// requires camel 4.3 onwards
if (camelVersion != null && VersionHelper.isLE(camelVersion,
"4.2.0")) {
- System.err.println("This requires Camel version 4.3 or newer");
+ printer().printErr("This requires Camel version 4.3 or newer");
return -1;
}
exit = run.runTransformMessage(camelVersion);
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogKamelet.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogKamelet.java
index 7131433b61c..8635abf0ee6 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogKamelet.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogKamelet.java
@@ -83,7 +83,7 @@ public class CatalogKamelet extends CamelCommand {
Method m = clazz.getMethod("getKamelets");
kamelets = (Map<String, Object>) ObjectHelper.invokeMethod(m,
catalog);
} catch (Exception e) {
- System.err.println("Cannot download camel-kamelets-catalog due to
" + e.getMessage());
+ printer().printErr("Cannot download camel-kamelets-catalog due to
" + e.getMessage());
return 1;
} finally {
Thread.currentThread().setContextClassLoader(tccLoader);
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java
index fa50a59fcaa..e117188e7e0 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java
@@ -101,7 +101,7 @@ public class Hawtio extends CamelCommand {
// download war that has the web-console
MavenArtifact ma = downloader.downloadArtifact("io.hawt",
"hawtio-war:war", version);
if (ma == null) {
- System.err.println("Cannot download io.hawt:hawtio-war:war:" +
version);
+ printer().printErr("Cannot download io.hawt:hawtio-war:war:" +
version);
return 1;
}
@@ -131,7 +131,7 @@ public class Hawtio extends CamelCommand {
try {
Desktop.getDesktop().browse(new URI(url));
} catch (Exception e) {
- System.err.println("Failed to open browser session, to
access Hawtio open url: " + url);
+ printer().printErr("Failed to open browser session, to
access Hawtio open url: " + url);
}
}
}
@@ -141,10 +141,10 @@ public class Hawtio extends CamelCommand {
shutdownLatch.await();
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
- System.err.println("Interrupted while launching Hawtio");
+ printer().printErr("Interrupted while launching Hawtio");
return 1;
} catch (Exception e) {
- System.err.println("Cannot launch Hawtio due to: " +
e.getMessage());
+ printer().printErr("Cannot launch Hawtio due to: " +
e.getMessage());
return 1;
} finally {
downloader.close();
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Jolokia.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Jolokia.java
index 7cbdafd92d5..74a78dc8a38 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Jolokia.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Jolokia.java
@@ -85,7 +85,7 @@ public class Jolokia extends ProcessBaseCommand {
}
}
} catch (Exception e) {
- System.err.println("Cannot execute jolokia command due: " +
e.getMessage());
+ printer().printErr("Cannot execute jolokia command due: " +
e.getMessage());
exitCode = 1;
}
