This is an automated email from the ASF dual-hosted git repository.
squakez 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 b9c2a98ac28a CAMEL-27028: move shutdown hook
b9c2a98ac28a is described below
commit b9c2a98ac28acbbb25112858c9bcf4487e00c7bb
Author: Pasquale Congiusti <[email protected]>
AuthorDate: Tue Nov 17 09:41:45 2026 +0100
CAMEL-27028: move shutdown hook
It is not honored as it should when exporting the app for main. Likely
because there is some missing configuration during repackage.
Closes CAMEL-27028
---
.../test/resources/golden/expected/deps.export.txt | 1 -
.../resources/golden/expected/excludes.export.txt | 1 -
.../test/resources/golden/expected/groovy.export.txt | 1 -
.../test/resources/golden/expected/java.export.txt | 1 -
.../test/resources/golden/expected/kamelet.export.txt | 1 -
.../golden/expected/local-kamelet-dir.export.txt | 1 -
.../golden/expected/maven-main-chaos.maven.txt | 1 -
.../golden/expected/maven-main-mixed.maven.txt | 1 -
.../resources/golden/expected/maven-main.maven.txt | 1 -
.../test/resources/golden/expected/mixed.export.txt | 1 -
.../test/resources/golden/expected/openapi.export.txt | 1 -
.../test/resources/golden/expected/options.export.txt | 1 -
.../resources/golden/expected/pom-project.export.txt | 1 -
.../resources/golden/expected/profile-prod.export.txt | 1 -
.../test/resources/golden/expected/profile.export.txt | 1 -
.../resources/golden/expected/resource-dir.export.txt | 1 -
.../resources/golden/expected/run-settings.export.txt | 1 -
.../src/test/resources/golden/expected/xml.export.txt | 1 -
.../resources/golden/expected/yaml-deps.export.txt | 1 -
.../test/resources/golden/expected/yaml.export.txt | 1 -
.../camel/dsl/jbang/run/export/CamelMainExporter.java | 2 --
.../main/resources/camel-main-run-log4j2.properties | 3 +++
.../main/resources/export/log4j2.component.properties | 19 -------------------
.../src/main/resources/log4j2-main.properties | 2 ++
.../camel/dsl/jbang/run/RunExistingProjectTest.java | 2 ++
25 files changed, 7 insertions(+), 41 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/deps.export.txt
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/deps.export.txt
index 95e3dd96bdfd..7e7b141aff21 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/deps.export.txt
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/deps.export.txt
@@ -39,7 +39,6 @@ src/main/docker/Dockerfile
src/main/java/org/example/golden/deps/CamelApplication.java
src/main/java/org/example/golden/deps/Deps.java
src/main/resources/application.properties
-src/main/resources/log4j2.component.properties
src/main/resources/log4j2.properties
# pom.xml
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/excludes.export.txt
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/excludes.export.txt
index 55216ddbfe3b..52897e26775d 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/excludes.export.txt
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/excludes.export.txt
@@ -35,7 +35,6 @@ src/main/docker/Dockerfile
src/main/java/org/example/golden/excludes/CamelApplication.java
src/main/resources/application.properties
src/main/resources/camel/hello.camel.yaml
-src/main/resources/log4j2.component.properties
src/main/resources/log4j2.properties
# pom.xml
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/groovy.export.txt
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/groovy.export.txt
index 55d469ff5fd0..c45f557864b9 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/groovy.export.txt
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/groovy.export.txt
@@ -38,7 +38,6 @@ src/main/java/org/example/golden/groovy/CamelApplication.java
src/main/resources/application.properties
src/main/resources/camel-groovy/Greeting.groovy
src/main/resources/camel/route.camel.yaml
-src/main/resources/log4j2.component.properties
src/main/resources/log4j2.properties
# pom.xml
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/java.export.txt
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/java.export.txt
index f0113945af1f..50b9dc2bc71e 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/java.export.txt
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/java.export.txt
@@ -36,7 +36,6 @@ src/main/docker/Dockerfile
src/main/java/com/acme/Hello.java
src/main/java/org/example/golden/java/CamelApplication.java
src/main/resources/application.properties
-src/main/resources/log4j2.component.properties
src/main/resources/log4j2.properties
# pom.xml
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/kamelet.export.txt
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/kamelet.export.txt
index 8b2d36f0bd35..b86ca9ecde62 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/kamelet.export.txt
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/kamelet.export.txt
@@ -37,7 +37,6 @@ src/main/java/org/example/golden/kamelet/CamelApplication.java
src/main/resources/application.properties
src/main/resources/camel/route.camel.yaml
src/main/resources/kamelets/greeting-source.kamelet.yaml
-src/main/resources/log4j2.component.properties
src/main/resources/log4j2.properties
# pom.xml
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/local-kamelet-dir.export.txt
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/local-kamelet-dir.export.txt
index 5adeb10e9532..fa4adc88fa30 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/local-kamelet-dir.export.txt
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/local-kamelet-dir.export.txt
@@ -38,7 +38,6 @@
src/main/java/org/example/golden/localkameletdir/CamelApplication.java
src/main/resources/application.properties
src/main/resources/camel/route.camel.yaml
src/main/resources/kamelets/greeting-source.kamelet.yaml
-src/main/resources/log4j2.component.properties
src/main/resources/log4j2.properties
# pom.xml
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/maven-main-chaos.maven.txt
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/maven-main-chaos.maven.txt
index f8bdb10b5935..ce67743e6fbf 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/maven-main-chaos.maven.txt
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/maven-main-chaos.maven.txt
@@ -28,7 +28,6 @@ src/main/docker/Dockerfile
src/main/java/org/example/project/cameljbang/CamelApplication.java
src/main/resources/application.properties
src/main/resources/camel/hello.camel.yaml
-src/main/resources/log4j2.component.properties
src/main/resources/log4j2.properties
target/runner.jar
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/maven-main-mixed.maven.txt
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/maven-main-mixed.maven.txt
index c4f4ff3b7d13..19e946261a65 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/maven-main-mixed.maven.txt
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/maven-main-mixed.maven.txt
@@ -38,7 +38,6 @@ src/main/resources/README.md
src/main/resources/application.properties
src/main/resources/camel/route.camel.yaml
src/main/resources/data.json
-src/main/resources/log4j2.component.properties
src/main/resources/log4j2.properties
src/main/scripts/setup.sh
src/main/tls/server.crt
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/maven-main.maven.txt
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/maven-main.maven.txt
index b960f34db8ee..09fb78a8174d 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/maven-main.maven.txt
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/maven-main.maven.txt
@@ -27,7 +27,6 @@ src/main/docker/Dockerfile
src/main/java/org/example/project/cameljbang/CamelApplication.java
src/main/resources/application.properties
src/main/resources/camel/hello.camel.yaml
-src/main/resources/log4j2.component.properties
src/main/resources/log4j2.properties
target/runner.jar
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/mixed.export.txt
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/mixed.export.txt
index af681bb2e231..5eb1fbb22104 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/mixed.export.txt
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/mixed.export.txt
@@ -50,7 +50,6 @@ src/main/resources/README.md
src/main/resources/application.properties
src/main/resources/camel/route.camel.yaml
src/main/resources/data.json
-src/main/resources/log4j2.component.properties
src/main/resources/log4j2.properties
src/main/scripts/setup.sh
src/main/tls/server.crt
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/openapi.export.txt
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/openapi.export.txt
index b1cf361d4135..d7e1d134838f 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/openapi.export.txt
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/openapi.export.txt
@@ -42,7 +42,6 @@ src/main/resources/api.yaml
src/main/resources/application.properties
src/main/resources/camel/generated-openapi.yaml
src/main/resources/camel/greeting.camel.yaml
-src/main/resources/log4j2.component.properties
src/main/resources/log4j2.properties
# pom.xml
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/options.export.txt
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/options.export.txt
index b97bd8c2da98..51a49ef07d9c 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/options.export.txt
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/options.export.txt
@@ -49,7 +49,6 @@ src/main/java/com/acme/golden/CamelApplication.java
src/main/resources/application-dev.properties
src/main/resources/application.properties
src/main/resources/camel/hello.camel.yaml
-src/main/resources/log4j2.component.properties
src/main/resources/log4j2.properties
# pom.xml
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/pom-project.export.txt
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/pom-project.export.txt
index 80e17313e023..c31c32af7d55 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/pom-project.export.txt
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/pom-project.export.txt
@@ -40,7 +40,6 @@ src/main/docker/Dockerfile
src/main/java/com/acme/PomRoute.java
src/main/java/org/example/golden/pomproject/CamelApplication.java
src/main/resources/application.properties
-src/main/resources/log4j2.component.properties
src/main/resources/log4j2.properties
# pom.xml
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/profile-prod.export.txt
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/profile-prod.export.txt
index 6fa82ed8a30f..95e408f25d96 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/profile-prod.export.txt
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/profile-prod.export.txt
@@ -36,7 +36,6 @@
src/main/java/org/example/golden/profileprod/CamelApplication.java
src/main/resources/application-prod.properties
src/main/resources/application.properties
src/main/resources/camel/route.camel.yaml
-src/main/resources/log4j2.component.properties
src/main/resources/log4j2.properties
# pom.xml
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/profile.export.txt
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/profile.export.txt
index 9568ad206bc6..d305829b2256 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/profile.export.txt
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/profile.export.txt
@@ -38,7 +38,6 @@ src/main/java/org/example/golden/profile/CamelApplication.java
src/main/resources/application-dev.properties
src/main/resources/application.properties
src/main/resources/camel/route.camel.yaml
-src/main/resources/log4j2.component.properties
src/main/resources/log4j2.properties
# pom.xml
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/resource-dir.export.txt
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/resource-dir.export.txt
index 8d05f585a583..604e61fabd81 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/resource-dir.export.txt
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/resource-dir.export.txt
@@ -37,7 +37,6 @@ src/main/docker/Dockerfile
src/main/java/org/example/golden/resourcedir/CamelApplication.java
src/main/resources/application.properties
src/main/resources/camel/hello.camel.yaml
-src/main/resources/log4j2.component.properties
src/main/resources/log4j2.properties
src/main/resources/schemas/api.yaml
src/main/resources/schemas/common/types.json
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/run-settings.export.txt
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/run-settings.export.txt
index 1457fd91232c..22747d0a6ece 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/run-settings.export.txt
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/run-settings.export.txt
@@ -36,7 +36,6 @@ src/main/docker/Dockerfile
src/main/java/org/example/golden/runsettings/CamelApplication.java
src/main/resources/application.properties
src/main/resources/camel/hello.camel.yaml
-src/main/resources/log4j2.component.properties
src/main/resources/log4j2.properties
# pom.xml
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/xml.export.txt
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/xml.export.txt
index def1a5c76b31..119d81552c5b 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/xml.export.txt
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/xml.export.txt
@@ -34,7 +34,6 @@ src/main/docker/Dockerfile
src/main/java/org/example/golden/xml/CamelApplication.java
src/main/resources/application.properties
src/main/resources/camel/hello.camel.xml
-src/main/resources/log4j2.component.properties
src/main/resources/log4j2.properties
# pom.xml
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/yaml-deps.export.txt
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/yaml-deps.export.txt
index 02305a360a58..95dc7703e49f 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/yaml-deps.export.txt
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/yaml-deps.export.txt
@@ -35,7 +35,6 @@ src/main/docker/Dockerfile
src/main/java/org/example/golden/yamldeps/CamelApplication.java
src/main/resources/application.properties
src/main/resources/camel/deps.camel.yaml
-src/main/resources/log4j2.component.properties
src/main/resources/log4j2.properties
# pom.xml
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/yaml.export.txt
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/yaml.export.txt
index 3c84d8d0fba5..c0b477038fbe 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/yaml.export.txt
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/yaml.export.txt
@@ -35,7 +35,6 @@ src/main/docker/Dockerfile
src/main/java/org/example/golden/yaml/CamelApplication.java
src/main/resources/application.properties
src/main/resources/camel/hello.camel.yaml
-src/main/resources/log4j2.component.properties
src/main/resources/log4j2.properties
# pom.xml
diff --git
a/dsl/camel-jbang/camel-jbang-run/src/main/java/org/apache/camel/dsl/jbang/run/export/CamelMainExporter.java
b/dsl/camel-jbang/camel-jbang-run/src/main/java/org/apache/camel/dsl/jbang/run/export/CamelMainExporter.java
index 924e4c2e12f3..5cd8151e755e 100644
---
a/dsl/camel-jbang/camel-jbang-run/src/main/java/org/apache/camel/dsl/jbang/run/export/CamelMainExporter.java
+++
b/dsl/camel-jbang/camel-jbang-run/src/main/java/org/apache/camel/dsl/jbang/run/export/CamelMainExporter.java
@@ -379,8 +379,6 @@ class CamelMainExporter extends Exporter {
// log4j configuration
InputStream is =
CamelMainExporter.class.getResourceAsStream("/log4j2-main.properties");
ExportHelper.safeCopy(is,
srcResourcesDir.resolve("log4j2.properties"));
- is =
CamelMainExporter.class.getResourceAsStream("/export/log4j2.component.properties");
- ExportHelper.safeCopy(is,
srcResourcesDir.resolve("log4j2.component.properties"));
}
protected void copyGroovyPrecompiled(Path srcResourcesDir) throws
Exception {
diff --git
a/dsl/camel-jbang/camel-jbang-run/src/main/resources/camel-main-run-log4j2.properties
b/dsl/camel-jbang/camel-jbang-run/src/main/resources/camel-main-run-log4j2.properties
index 046c8699a491..7ac2b7844677 100644
---
a/dsl/camel-jbang/camel-jbang-run/src/main/resources/camel-main-run-log4j2.properties
+++
b/dsl/camel-jbang/camel-jbang-run/src/main/resources/camel-main-run-log4j2.properties
@@ -32,3 +32,6 @@ appender.file.layout.pattern = %style{%d{yyyy-MM-dd
HH:mm:ss.SSS}}{Dim} %highlig
rootLogger = {{level}},out,file
rootLogger.level = {{level}}
+
+# camel-main handled JVM shutdown so disable log4j hook
+shutdownHook = disable
diff --git
a/dsl/camel-jbang/camel-jbang-run/src/main/resources/export/log4j2.component.properties
b/dsl/camel-jbang/camel-jbang-run/src/main/resources/export/log4j2.component.properties
deleted file mode 100644
index 49624d8d120f..000000000000
---
a/dsl/camel-jbang/camel-jbang-run/src/main/resources/export/log4j2.component.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-# camel-main handled JVM shutdown so disable log4j hook
-log4j.shutdownHookEnabled = false
\ No newline at end of file
diff --git
a/dsl/camel-jbang/camel-jbang-run/src/main/resources/log4j2-main.properties
b/dsl/camel-jbang/camel-jbang-run/src/main/resources/log4j2-main.properties
index c755a6b14edc..e6960078de7e 100644
--- a/dsl/camel-jbang/camel-jbang-run/src/main/resources/log4j2-main.properties
+++ b/dsl/camel-jbang/camel-jbang-run/src/main/resources/log4j2-main.properties
@@ -26,3 +26,5 @@ appender.stdout.layout.pattern = %style{%d{yyyy-MM-dd
HH:mm:ss.SSS}}{Dim} %highl
rootLogger = INFO,out
rootLogger.level = INFO
+# camel-main handled JVM shutdown so disable log4j hook
+shutdownHook = disable
diff --git
a/dsl/camel-jbang/camel-jbang-run/src/test/java/org/apache/camel/dsl/jbang/run/RunExistingProjectTest.java
b/dsl/camel-jbang/camel-jbang-run/src/test/java/org/apache/camel/dsl/jbang/run/RunExistingProjectTest.java
index 6d8e1add666a..13b637a82281 100644
---
a/dsl/camel-jbang/camel-jbang-run/src/test/java/org/apache/camel/dsl/jbang/run/RunExistingProjectTest.java
+++
b/dsl/camel-jbang/camel-jbang-run/src/test/java/org/apache/camel/dsl/jbang/run/RunExistingProjectTest.java
@@ -108,6 +108,8 @@ class RunExistingProjectTest {
assertThat(content).contains("rootLogger.level = debug");
assertThat(content).doesNotContain("{{");
+ assertThat(content).contains("shutdownHook = disable");
+
RunRequest request = request();
request.port = 9090;
request.maxSeconds = 30;