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 c17345b4b9a CAMEL-18117: camel-jbang - Use profile for commands such
as run, uber-jar, which allows the profile to control which properties file to
use with settings.
c17345b4b9a is described below
commit c17345b4b9a2cbfe4a1d24a49c380d501e36e212
Author: Claus Ibsen <[email protected]>
AuthorDate: Mon May 23 11:53:07 2022 +0200
CAMEL-18117: camel-jbang - Use profile for commands such as run, uber-jar,
which allows the profile to control which properties file to use with settings.
---
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 1 -
.../main/java/org/apache/camel/dsl/jbang/core/commands/UberJar.java | 3 ++-
2 files changed, 2 insertions(+), 2 deletions(-)
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 f7469387d45..8576f6cd5d5 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
@@ -23,7 +23,6 @@ import java.awt.datatransfer.UnsupportedFlavorException;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
-import java.io.FilenameFilter;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.FileSystems;
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/UberJar.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/UberJar.java
index ef14f4322f5..81e555285d5 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/UberJar.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/UberJar.java
@@ -351,7 +351,8 @@ class UberJar extends CamelCommand {
if (files != null) {
for (File source : files) {
// only copy files and skip settings/profile file as we do
this later specially
- if (source.isDirectory() ||
source.getName().equals(Run.RUN_SETTINGS_FILE) ||
source.getName().equals(profile)) {
+ if (source.isDirectory() ||
source.getName().equals(Run.RUN_SETTINGS_FILE)
+ || source.getName().equals(profile)) {
continue;
}
File out = new File(target, source.getName());