This is an automated email from the ASF dual-hosted git repository.

JiriOndrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git


The following commit(s) were added to refs/heads/camel-main by this push:
     new fa60a5719d2 Fix camel-main build for controlbus allowedLanguages and 
hapi-fhir-core 7.0.5
fa60a5719d2 is described below

commit fa60a5719d2cde0ad1183ef14ff67ddbab3da55e
Author: jiriOndrusek-agent <[email protected]>
AuthorDate: Mon Nov 16 14:39:04 2026 +0000

    Fix camel-main build for controlbus allowedLanguages and hapi-fhir-core 
7.0.5
    
    * CAMEL-25978 turned the controlbus language command off by default:
      set allowedLanguages on the controlbus:language endpoints of the
      controlbus tests and the usage doc.
    * hapi-fhir-core 7.0.5 adds jsr305 to org.hl7.fhir.utilities: exclude it
      in the BOM (banned by the enforcer).
    
    Co-Authored-By: Claude Opus 5.5 <[email protected]>
---
 .../ROOT/pages/reference/extensions/controlbus.adoc    |  6 +++++-
 extensions/controlbus/runtime/src/main/doc/usage.adoc  |  6 +++++-
 .../controlbus/it/ControlbusLanguageResource.java      |  4 ++--
 .../controlbus/it/ControlbusLanguageRoute.java         |  4 ++--
 poms/bom/pom.xml                                       |  6 ++++++
 poms/bom/src/main/generated/flattened-full-pom.xml     | 18 ++++++++++++------
 poms/bom/src/main/generated/flattened-reduced-pom.xml  | 18 ++++++++++++------
 .../main/generated/flattened-reduced-verbose-pom.xml   | 18 ++++++++++++------
 8 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/docs/modules/ROOT/pages/reference/extensions/controlbus.adoc 
b/docs/modules/ROOT/pages/reference/extensions/controlbus.adoc
index 2165d9edc62..bddcc2686c9 100644
--- a/docs/modules/ROOT/pages/reference/extensions/controlbus.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/controlbus.adoc
@@ -69,6 +69,10 @@ ifeval::[{doc-show-extra-content} == true]
 include::camel-quarkus-extensions/controlbus-supported-languages.adoc[]
 endif::[]
 
+The language command is off by default. List the languages it may use in the 
`allowedLanguages` option of the endpoint
+(e.g. `controlbus:language:simple?allowedLanguages=simple`) or of the component
+(e.g. `camel.component.controlbus.allowed-languages = simple,bean`).
+
 [id="extensions-controlbus-usage-bean"]
 ==== Bean
 
@@ -92,7 +96,7 @@ The Simple language can be used to control the state of 
routes. The following ex
 [source,java]
 ----
 template.sendBody(
-    "controlbus:language:simple", 
+    "controlbus:language:simple?allowedLanguages=simple",
     "${camelContext.getRouteController().stopRoute('foo')}"
 );
 ----
diff --git a/extensions/controlbus/runtime/src/main/doc/usage.adoc 
b/extensions/controlbus/runtime/src/main/doc/usage.adoc
index 1fd229a485a..966551ec9f0 100644
--- a/extensions/controlbus/runtime/src/main/doc/usage.adoc
+++ b/extensions/controlbus/runtime/src/main/doc/usage.adoc
@@ -18,6 +18,10 @@ ifeval::[{doc-show-extra-content} == true]
 include::camel-quarkus-extensions/controlbus-supported-languages.adoc[]
 endif::[]
 
+The language command is off by default. List the languages it may use in the 
`allowedLanguages` option of the endpoint
+(e.g. `controlbus:language:simple?allowedLanguages=simple`) or of the component
+(e.g. `camel.component.controlbus.allowed-languages = simple,bean`).
+
 ==== Bean
 
 The Bean language can be used to invoke a method on a bean to control the 
state of routes. The `org.apache.camel.quarkus:camel-quarkus-bean` extension 
must be added to the classpath. Maven users must add the following dependency 
to the POM:
@@ -39,7 +43,7 @@ The Simple language can be used to control the state of 
routes. The following ex
 [source,java]
 ----
 template.sendBody(
-    "controlbus:language:simple", 
+    "controlbus:language:simple?allowedLanguages=simple",
     "${camelContext.getRouteController().stopRoute('foo')}"
 );
 ----
diff --git 
a/integration-test-groups/foundation/controlbus/src/main/java/org/apache/camel/quarkus/component/controlbus/it/ControlbusLanguageResource.java
 
b/integration-test-groups/foundation/controlbus/src/main/java/org/apache/camel/quarkus/component/controlbus/it/ControlbusLanguageResource.java
index b11b76c5d37..717b87d7d28 100644
--- 
a/integration-test-groups/foundation/controlbus/src/main/java/org/apache/camel/quarkus/component/controlbus/it/ControlbusLanguageResource.java
+++ 
b/integration-test-groups/foundation/controlbus/src/main/java/org/apache/camel/quarkus/component/controlbus/it/ControlbusLanguageResource.java
@@ -53,7 +53,7 @@ public class ControlbusLanguageResource {
     @POST
     public void simple() throws Exception {
         producerTemplate.sendBody(
-                "controlbus:language:simple",
+                "controlbus:language:simple?allowedLanguages=simple",
                 
String.format("${camelContext.getRouteController().stopRoute('%s')}", 
CONTROL_ROUTE_ID));
     }
 
@@ -61,7 +61,7 @@ public class ControlbusLanguageResource {
     @POST
     public void bean() throws Exception {
         producerTemplate.sendBodyAndHeader(
-                "controlbus:language:bean",
+                "controlbus:language:bean?allowedLanguages=bean",
                 "controlbus-bean?method=stopRoute",
                 "routeId",
                 CONTROL_ROUTE_ID);
diff --git 
a/integration-test-groups/foundation/controlbus/src/main/java/org/apache/camel/quarkus/component/controlbus/it/ControlbusLanguageRoute.java
 
b/integration-test-groups/foundation/controlbus/src/main/java/org/apache/camel/quarkus/component/controlbus/it/ControlbusLanguageRoute.java
index e27cead4b28..f290258666d 100644
--- 
a/integration-test-groups/foundation/controlbus/src/main/java/org/apache/camel/quarkus/component/controlbus/it/ControlbusLanguageRoute.java
+++ 
b/integration-test-groups/foundation/controlbus/src/main/java/org/apache/camel/quarkus/component/controlbus/it/ControlbusLanguageRoute.java
@@ -33,12 +33,12 @@ public class ControlbusLanguageRoute extends RouteBuilder {
 
         from("direct:header")
                 .setHeader("action", constant("stop"))
-                .to("controlbus:language:header")
+                .to("controlbus:language:header?allowedLanguages=header")
                 .toD("controlbus:route?routeId=lang-control&action=${body}");
 
         from("direct:exchangeProperty")
                 .setProperty("action", constant("stop"))
-                .to("controlbus:language:exchangeProperty")
+                
.to("controlbus:language:exchangeProperty?allowedLanguages=exchangeProperty")
                 .toD("controlbus:route?routeId=lang-control&action=${body}");
     }
 }
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index a27e7142044..181c3ea308f 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -7303,6 +7303,12 @@
                 <groupId>ca.uhn.hapi.fhir</groupId>
                 <artifactId>org.hl7.fhir.utilities</artifactId>
                 <version>${hapi-fhir-core.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.google.code.findbugs</groupId>
+                        <artifactId>jsr305</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>com.atlassian.jira</groupId>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml 
b/poms/bom/src/main/generated/flattened-full-pom.xml
index 8147a1a2e48..b0d5d9cd340 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -7180,32 +7180,38 @@
       <dependency>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>org.hl7.fhir.dstu2</artifactId>
-        <version>7.0.3</version>
+        <version>7.0.5</version>
       </dependency>
       <dependency>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>org.hl7.fhir.dstu2016may</artifactId>
-        <version>7.0.3</version>
+        <version>7.0.5</version>
       </dependency>
       <dependency>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>org.hl7.fhir.dstu3</artifactId>
-        <version>7.0.3</version>
+        <version>7.0.5</version>
       </dependency>
       <dependency>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>org.hl7.fhir.r4</artifactId>
-        <version>7.0.3</version>
+        <version>7.0.5</version>
       </dependency>
       <dependency>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>org.hl7.fhir.r5</artifactId>
-        <version>7.0.3</version>
+        <version>7.0.5</version>
       </dependency>
       <dependency>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>org.hl7.fhir.utilities</artifactId>
-        <version>7.0.3</version>
+        <version>7.0.5</version>
+        <exclusions>
+          <exclusion>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>com.atlassian.jira</groupId>
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml 
b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index c4a1ae4b0fc..d0b4c762313 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -179,32 +179,38 @@
       <dependency>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>org.hl7.fhir.dstu2</artifactId>
-        <version>7.0.3</version>
+        <version>7.0.5</version>
       </dependency>
       <dependency>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>org.hl7.fhir.dstu2016may</artifactId>
-        <version>7.0.3</version>
+        <version>7.0.5</version>
       </dependency>
       <dependency>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>org.hl7.fhir.dstu3</artifactId>
-        <version>7.0.3</version>
+        <version>7.0.5</version>
       </dependency>
       <dependency>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>org.hl7.fhir.r4</artifactId>
-        <version>7.0.3</version>
+        <version>7.0.5</version>
       </dependency>
       <dependency>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>org.hl7.fhir.r5</artifactId>
-        <version>7.0.3</version>
+        <version>7.0.5</version>
       </dependency>
       <dependency>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>org.hl7.fhir.utilities</artifactId>
-        <version>7.0.3</version>
+        <version>7.0.5</version>
+        <exclusions>
+          <exclusion>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>com.atlassian.jira</groupId>
diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml 
b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
index 4c1e2b04650..92c47f49c9a 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -179,32 +179,38 @@
       <dependency>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>org.hl7.fhir.dstu2</artifactId>
-        <version>7.0.3</version>
+        <version>7.0.5</version>
       </dependency>
       <dependency>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>org.hl7.fhir.dstu2016may</artifactId>
-        <version>7.0.3</version>
+        <version>7.0.5</version>
       </dependency>
       <dependency>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>org.hl7.fhir.dstu3</artifactId>
-        <version>7.0.3</version>
+        <version>7.0.5</version>
       </dependency>
       <dependency>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>org.hl7.fhir.r4</artifactId>
-        <version>7.0.3</version>
+        <version>7.0.5</version>
       </dependency>
       <dependency>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>org.hl7.fhir.r5</artifactId>
-        <version>7.0.3</version>
+        <version>7.0.5</version>
       </dependency>
       <dependency>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>org.hl7.fhir.utilities</artifactId>
-        <version>7.0.3</version>
+        <version>7.0.5</version>
+        <exclusions>
+          <exclusion>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>com.atlassian.jira</groupId>

Reply via email to