Skip to content

CAMEL-21960: camel-jbang - Auto-detect application.properties in run and export #22192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gnodet wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −0
Open

CAMEL-21960: camel-jbang - Auto-detect application.properties in run and export #22192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions ...jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,21 @@ protected Integer doExport() throws Exception {
}
}

// auto-detect application.properties and include it
{
String name = baseDir.resolve("application.properties").toString();
if (Files.exists(Paths.get(name)) && !files.contains(name)) {
files.add(name);
}
}
if (profile != null) {
// need to include profile application properties if exists
String name = baseDir.resolve("application-" + profile + ".properties").toString();
if (Files.exists(Paths.get(name)) && !files.contains(name)) {
files.add(name);
}
}

// application.properties
doLoadAndInitProfileProperties(baseDir.resolve("application.properties"));
if (profile != null) {
Expand Down
7 changes: 7 additions & 0 deletions ...el-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,6 +728,13 @@ private int run() throws Exception {
addDependencies(pomDependencies.toArray(new String[0]));
}

// auto-detect application.properties and include it
if (!empty && sourceDir == null) {
String appProps = baseDir.resolve("application.properties").toString();
if (Files.exists(Paths.get(appProps)) && !files.contains(appProps)) {
files.add(appProps);
}
}
if (profile != null) {
// need to include profile application properties if exists
String name = baseDir + "/application-" + profile + ".properties";
Expand Down
Loading