This is an automated email from the ASF dual-hosted git repository.
acosentino 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 e514be75127 Camel-Jbang SBOM generator command: adapt to make it works
in Windows too (#11611)
e514be75127 is described below
commit e514be75127d7f9b5a776b0411745df5d539d831
Author: Andrea Cosentino <[email protected]>
AuthorDate: Fri Sep 29 13:03:48 2023 +0200
Camel-Jbang SBOM generator command: adapt to make it works in Windows too
(#11611)
Signed-off-by: Andrea Cosentino <[email protected]>
---
.../org/apache/camel/dsl/jbang/core/commands/SBOMGenerator.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
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 859bd7a4e94..10f0b06cb1a 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
@@ -65,8 +65,14 @@ public class SBOMGenerator extends Export {
} else {
outputDirectoryParameter += "../../" + outputDirectory;
}
+ String mvnProgramCall;
+ if (FileUtil.isWindows()) {
+ mvnProgramCall = "cmd /c mvn";
+ } else {
+ mvnProgramCall = "mvn";
+ }
Process p = Runtime.getRuntime()
- .exec("mvn org.cyclonedx:cyclonedx-maven-plugin:" +
pluginVersion + ":makeAggregateBom "
+ .exec(mvnProgramCall + "
org.cyclonedx:cyclonedx-maven-plugin:" + pluginVersion + ":makeAggregateBom "
+ outputDirectoryParameter
+ " -DoutputName="
+ outputName,