From bcf6bd4a82d7fa611475724d1345b1fabb60a934 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 7 Jul 2023 03:23:19 +0000
Subject: [PATCH 1/9] Updated CHANGELOG.md

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5337977b8128..95c7e7330f41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,12 +15,15 @@
 **Closed issues:**
 
 - Allow disabling periodic scan functionality [\#3078](https://github.com/apache/camel-quarkus/issues/3078)
+- Surefire 3.0.0-M4 passing even if a build step throws an exception [\#723](https://github.com/apache/camel-quarkus/issues/723)
 
 **Merged pull requests:**
 
+- Set the official snapshot repositories [\#5062](https://github.com/apache/camel-quarkus/pull/5062) ([essobedo](https://github.com/essobedo))
 - Improve native support of camel-quarkus-debug [\#5060](https://github.com/apache/camel-quarkus/pull/5060) ([essobedo](https://github.com/essobedo))
 - Bump quarkus-micrometer-registry-jmx from 3.0.2 to 3.1.2 [\#5055](https://github.com/apache/camel-quarkus/pull/5055) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump quarkus-amazon-services-bom from 2.3.3 to 2.4.0 [\#5054](https://github.com/apache/camel-quarkus/pull/5054) ([dependabot[bot]](https://github.com/apps/dependabot))
+- chore: fix various build/compilation warnings [\#5053](https://github.com/apache/camel-quarkus/pull/5053) ([lburgazzoli](https://github.com/lburgazzoli))
 - Add sync tag for Groovy version property [\#5052](https://github.com/apache/camel-quarkus/pull/5052) ([jamesnetherton](https://github.com/jamesnetherton))
 - Remove skip of maven-enforcer-plugin for Google extensions [\#5049](https://github.com/apache/camel-quarkus/pull/5049) ([jamesnetherton](https://github.com/jamesnetherton))
 - Restore native profiles to kubernetes-client tests [\#5047](https://github.com/apache/camel-quarkus/pull/5047) ([jamesnetherton](https://github.com/jamesnetherton))

From 279944f957076954d5250843887152915b4cc02b Mon Sep 17 00:00:00 2001
From: Nicolas Filotto <nfilotto@talend.com>
Date: Thu, 6 Jul 2023 17:45:02 +0200
Subject: [PATCH 2/9] Ref #5056: Replace the deprecated
 RecorderContext#classProxy

---
 .../runtime/LanguageSupportRecorder.java      | 28 +++++++++++++++++++
 .../groovy/deployment/GroovyProcessor.java    |  9 ++----
 .../runtime/GroovyExpressionRecorder.java     |  4 +--
 .../joor/deployment/JoorProcessor.java        | 13 ++++-----
 .../joor/runtime/JoorExpressionRecorder.java  | 13 ++++-----
 5 files changed, 44 insertions(+), 23 deletions(-)
 create mode 100644 extensions-support/language/runtime/src/main/java/org/apache/camel/quarkus/support/language/runtime/LanguageSupportRecorder.java

diff --git a/extensions-support/language/runtime/src/main/java/org/apache/camel/quarkus/support/language/runtime/LanguageSupportRecorder.java b/extensions-support/language/runtime/src/main/java/org/apache/camel/quarkus/support/language/runtime/LanguageSupportRecorder.java
new file mode 100644
index 000000000000..41b979619099
--- /dev/null
+++ b/extensions-support/language/runtime/src/main/java/org/apache/camel/quarkus/support/language/runtime/LanguageSupportRecorder.java
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+package org.apache.camel.quarkus.support.language.runtime;
+
+import io.quarkus.runtime.RuntimeValue;
+import io.quarkus.runtime.annotations.Recorder;
+
+@Recorder
+public class LanguageSupportRecorder {
+
+    public RuntimeValue<Class<?>> loadClass(String name) throws ClassNotFoundException {
+        return new RuntimeValue<>(Class.forName(name, true, Thread.currentThread().getContextClassLoader()));
+    }
+}
diff --git a/extensions/groovy/deployment/src/main/java/org/apache/camel/quarkus/component/groovy/deployment/GroovyProcessor.java b/extensions/groovy/deployment/src/main/java/org/apache/camel/quarkus/component/groovy/deployment/GroovyProcessor.java
index ad3027bc3df7..183200f5a05d 100644
--- a/extensions/groovy/deployment/src/main/java/org/apache/camel/quarkus/component/groovy/deployment/GroovyProcessor.java
+++ b/extensions/groovy/deployment/src/main/java/org/apache/camel/quarkus/component/groovy/deployment/GroovyProcessor.java
@@ -30,7 +30,6 @@
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
 import io.quarkus.deployment.pkg.steps.NativeBuild;
-import io.quarkus.deployment.recording.RecorderContext;
 import io.quarkus.maven.dependency.ResolvedDependency;
 import io.quarkus.paths.PathCollection;
 import io.quarkus.runtime.RuntimeValue;
@@ -42,6 +41,7 @@
 import org.apache.camel.quarkus.support.language.deployment.ExpressionExtractionResultBuildItem;
 import org.apache.camel.quarkus.support.language.deployment.ScriptBuildItem;
 import org.apache.camel.quarkus.support.language.runtime.ExpressionUID;
+import org.apache.camel.quarkus.support.language.runtime.LanguageSupportRecorder;
 import org.apache.camel.quarkus.support.language.runtime.ScriptUID;
 import org.codehaus.groovy.control.CompilationUnit;
 import org.codehaus.groovy.control.CompilerConfiguration;
@@ -145,14 +145,11 @@ void compileScriptsAOT(CurateOutcomeBuildItem curateOutcomeBuildItem,
         }
     }
 
-    // We still need to use RecorderContext#classProxy as using i.e. Class.forName does not work
-    // at runtime. See https://github.com/apache/camel-quarkus/issues/5056
-    @SuppressWarnings("deprecation")
     @Record(ExecutionTime.STATIC_INIT)
     @BuildStep(onlyIf = NativeBuild.class)
     CamelBeanBuildItem configureLanguage(
-            RecorderContext recorderContext,
             GroovyExpressionRecorder recorder,
+            LanguageSupportRecorder languageRecorder,
             ExpressionExtractionResultBuildItem result,
             List<GroovyExpressionSourceBuildItem> sources) throws ClassNotFoundException {
 
@@ -162,7 +159,7 @@ CamelBeanBuildItem configureLanguage(
                 recorder.addScript(
                         builder,
                         source.getOriginalCode(),
-                        recorderContext.classProxy(source.getClassName()));
+                        languageRecorder.loadClass(source.getClassName()));
             }
             final RuntimeValue<GroovyLanguage> language = recorder.languageNewInstance(builder);
             return new CamelBeanBuildItem("groovy", GroovyLanguage.class.getName(), language);
diff --git a/extensions/groovy/runtime/src/main/java/org/apache/camel/quarkus/component/groovy/runtime/GroovyExpressionRecorder.java b/extensions/groovy/runtime/src/main/java/org/apache/camel/quarkus/component/groovy/runtime/GroovyExpressionRecorder.java
index e1d9a922a98e..e0ee30034475 100644
--- a/extensions/groovy/runtime/src/main/java/org/apache/camel/quarkus/component/groovy/runtime/GroovyExpressionRecorder.java
+++ b/extensions/groovy/runtime/src/main/java/org/apache/camel/quarkus/component/groovy/runtime/GroovyExpressionRecorder.java
@@ -29,9 +29,9 @@ public RuntimeValue<GroovyLanguage.Builder> languageBuilder() {
     }
 
     @SuppressWarnings("unchecked")
-    public void addScript(RuntimeValue<GroovyLanguage.Builder> builder, String content, Class<?> clazz) {
+    public void addScript(RuntimeValue<GroovyLanguage.Builder> builder, String content, RuntimeValue<Class<?>> clazz) {
         try {
-            builder.getValue().addScript(content, (Class<Script>) clazz);
+            builder.getValue().addScript(content, (Class<Script>) clazz.getValue());
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
diff --git a/extensions/joor/deployment/src/main/java/org/apache/camel/quarkus/component/joor/deployment/JoorProcessor.java b/extensions/joor/deployment/src/main/java/org/apache/camel/quarkus/component/joor/deployment/JoorProcessor.java
index e025d5421a8c..a6378ab77a95 100644
--- a/extensions/joor/deployment/src/main/java/org/apache/camel/quarkus/component/joor/deployment/JoorProcessor.java
+++ b/extensions/joor/deployment/src/main/java/org/apache/camel/quarkus/component/joor/deployment/JoorProcessor.java
@@ -32,7 +32,6 @@
 import io.quarkus.deployment.builditem.GeneratedClassBuildItem;
 import io.quarkus.deployment.pkg.PackageConfig;
 import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
-import io.quarkus.deployment.recording.RecorderContext;
 import io.quarkus.maven.dependency.ResolvedDependency;
 import io.quarkus.paths.PathCollection;
 import io.quarkus.runtime.RuntimeValue;
@@ -54,6 +53,7 @@
 import org.apache.camel.quarkus.support.language.deployment.ExpressionExtractionResultBuildItem;
 import org.apache.camel.quarkus.support.language.deployment.ScriptBuildItem;
 import org.apache.camel.quarkus.support.language.runtime.ExpressionUID;
+import org.apache.camel.quarkus.support.language.runtime.LanguageSupportRecorder;
 import org.apache.camel.quarkus.support.language.runtime.ScriptUID;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -152,16 +152,13 @@ void compileExpressions(
         }
     }
 
-    // We still need to use RecorderContext#classProxy as using i.e. Class.forName does not work
-    // at runtime. See https://github.com/apache/camel-quarkus/issues/5056
-    @SuppressWarnings("deprecation")
     @Record(ExecutionTime.STATIC_INIT)
     @BuildStep(onlyIf = CompileAtBuildTime.class)
     @Consume(CamelContextBuildItem.class)
     CamelBeanBuildItem configureLanguage(
-            RecorderContext recorderContext,
             JoorExpressionConfig config,
             JoorExpressionRecorder recorder,
+            LanguageSupportRecorder languageRecorder,
             CamelContextBuildItem context,
             ExpressionExtractionResultBuildItem result,
             List<JoorExpressionSourceBuildItem> sources) throws ClassNotFoundException {
@@ -179,13 +176,13 @@ CamelBeanBuildItem configureLanguage(
                             expressionScriptingCompilerBuilder,
                             camelContext,
                             source.getId(),
-                            recorderContext.classProxy(source.getClassName()));
+                            languageRecorder.loadClass(source.getClassName()));
                 } else {
                     recorder.addExpression(
                             expressionCompilerBuilder,
                             camelContext,
                             source.getId(),
-                            recorderContext.classProxy(source.getClassName()));
+                            languageRecorder.loadClass(source.getClassName()));
                 }
             }
             final RuntimeValue<JoorLanguage> language = recorder.languageNewInstance(config, expressionCompilerBuilder,
@@ -194,7 +191,7 @@ CamelBeanBuildItem configureLanguage(
             if (config.resultType.isPresent()) {
                 recorder.setResultType(
                         language,
-                        recorderContext.classProxy(config.resultType.get()));
+                        languageRecorder.loadClass(config.resultType.get()));
             }
 
             return new CamelBeanBuildItem("joor", JoorLanguage.class.getName(), language);
diff --git a/extensions/joor/runtime/src/main/java/org/apache/camel/quarkus/component/joor/runtime/JoorExpressionRecorder.java b/extensions/joor/runtime/src/main/java/org/apache/camel/quarkus/component/joor/runtime/JoorExpressionRecorder.java
index 94b056d52ee4..62d47febce49 100644
--- a/extensions/joor/runtime/src/main/java/org/apache/camel/quarkus/component/joor/runtime/JoorExpressionRecorder.java
+++ b/extensions/joor/runtime/src/main/java/org/apache/camel/quarkus/component/joor/runtime/JoorExpressionRecorder.java
@@ -36,8 +36,8 @@ public RuntimeValue<JoorLanguage> languageNewInstance(JoorExpressionConfig confi
         return language;
     }
 
-    public void setResultType(RuntimeValue<JoorLanguage> language, Class<?> resultType) {
-        language.getValue().setResultType(resultType);
+    public void setResultType(RuntimeValue<JoorLanguage> language, RuntimeValue<Class<?>> resultType) {
+        language.getValue().setResultType(resultType.getValue());
     }
 
     public RuntimeValue<JoorExpressionCompiler.Builder> expressionCompilerBuilder() {
@@ -49,21 +49,20 @@ public RuntimeValue<JoorExpressionScriptingCompiler.Builder> expressionScripting
     }
 
     public void addExpression(RuntimeValue<JoorExpressionCompiler.Builder> builder, RuntimeValue<CamelContext> ctx, String id,
-            Class<?> clazz) {
+            RuntimeValue<Class<?>> clazz) {
         try {
             builder.getValue().addExpression(id,
-                    (JoorMethod) clazz.getConstructor(CamelContext.class).newInstance(ctx.getValue()));
+                    (JoorMethod) clazz.getValue().getConstructor(CamelContext.class).newInstance(ctx.getValue()));
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
     }
 
     public void addScript(RuntimeValue<JoorExpressionScriptingCompiler.Builder> builder, RuntimeValue<CamelContext> ctx,
-            String id,
-            Class<?> clazz) {
+            String id, RuntimeValue<Class<?>> clazz) {
         try {
             builder.getValue().addScript(id,
-                    (JoorScriptingMethod) clazz.getConstructor(CamelContext.class).newInstance(ctx.getValue()));
+                    (JoorScriptingMethod) clazz.getValue().getConstructor(CamelContext.class).newInstance(ctx.getValue()));
         } catch (Exception e) {
             throw new RuntimeException(e);
         }

From 65a5ce1617751dad00fb5d6218111a1673be9760 Mon Sep 17 00:00:00 2001
From: Zheng Feng <zh.feng@gmail.com>
Date: Fri, 7 Jul 2023 14:26:17 +0800
Subject: [PATCH 3/9] Fix #5068 to add a pooling test with quarkus-qpid-jms
 (#5069)

---
 .../ROOT/pages/reference/extensions/amqp.adoc | 21 ++++--
 .../runtime/src/main/doc/limitations.adoc     |  3 -
 .../amqp/runtime/src/main/doc/usage.adoc      | 19 ++++++
 integration-tests/amqp/pom.xml                |  6 ++
 .../src/main/resources/application.properties | 19 ++++++
 .../component/amqp/it/AmqpPoolingIT.java      | 24 +++++++
 .../component/amqp/it/AmqpPoolingTest.java    | 49 ++++++++++++++
 .../component/amqp/it/JmsPoolingEnabled.java  | 34 ++++++++++
 .../jms-qpid-amqp-client/pom.xml              | 13 ++--
 .../src/main/resources/application.properties | 19 ++++++
 .../jms/qpid/it/JmsPoolingEnabled.java        | 34 ++++++++++
 .../jms/qpid/it/JmsQpidPoolingIT.java         | 23 +++++++
 .../jms/qpid/it/JmsQpidPoolingTest.java       | 66 +++++++++++++++++++
 13 files changed, 316 insertions(+), 14 deletions(-)
 delete mode 100644 extensions/amqp/runtime/src/main/doc/limitations.adoc
 create mode 100644 integration-tests/amqp/src/main/resources/application.properties
 create mode 100644 integration-tests/amqp/src/test/java/org/apache/camel/quarkus/component/amqp/it/AmqpPoolingIT.java
 create mode 100644 integration-tests/amqp/src/test/java/org/apache/camel/quarkus/component/amqp/it/AmqpPoolingTest.java
 create mode 100644 integration-tests/amqp/src/test/java/org/apache/camel/quarkus/component/amqp/it/JmsPoolingEnabled.java
 create mode 100644 integration-tests/jms-qpid-amqp-client/src/main/resources/application.properties
 create mode 100644 integration-tests/jms-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/jms/qpid/it/JmsPoolingEnabled.java
 create mode 100644 integration-tests/jms-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/jms/qpid/it/JmsQpidPoolingIT.java
 create mode 100644 integration-tests/jms-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/jms/qpid/it/JmsQpidPoolingTest.java

diff --git a/docs/modules/ROOT/pages/reference/extensions/amqp.adoc b/docs/modules/ROOT/pages/reference/extensions/amqp.adoc
index 6129773c98c7..97dd753142b8 100644
--- a/docs/modules/ROOT/pages/reference/extensions/amqp.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/amqp.adoc
@@ -59,14 +59,25 @@ you must ensure that the `camel-quarkus-xml-jaxp` extension is present on the cl
 When sending JMS message payloads as `javax.jms.ObjectMessage`, you must annotate the relevant classes to be registered for serialization with `@RegisterForReflection(serialization = true)`. 
 Note that this extension automatically sets `quarkus.camel.native.reflection.serialization-enabled = true` for you. Refer to the xref:user-guide/native-mode.adoc#serialization[native mode user guide] for more information.
 
+[id="extensions-amqp-usage-connection-pooling"]
+=== Connection Pooling
 
-[id="extensions-amqp-camel-quarkus-limitations"]
-== Camel Quarkus limitations
+You can use the `quarkus-pooled-jms` extension to get pooling support for the connections. Refer to the https://quarkiverse.github.io/quarkiverse-docs/quarkus-pooled-jms/dev/index.html[quarkus-pooled-jms] extension documentation for more information.
 
-[id="extensions-amqp-limitations-connection-pooling"]
-=== Connection Pooling
+Just add the following dependency to your `pom.xml`:
+[source,xml]
+----
+<dependency>
+    <groupId>io.quarkiverse.messaginghub</groupId>
+    <artifactId>quarkus-pooled-jms</artifactId>
+</dependency>
+----
 
-JMS connection pooling isn't supported yet since there is still an open https://github.com/amqphub/quarkus-qpid-jms/issues/22[issue] with quarkus-qpid-jms.
+To enable the pooling support, you need to add the following configuration to your `application.properties`:
+[source,properties]
+----
+quarkus.qpid-jms.wrap=true
+----
 
 
 [id="extensions-amqp-transferexception-option-in-native-mode"]
diff --git a/extensions/amqp/runtime/src/main/doc/limitations.adoc b/extensions/amqp/runtime/src/main/doc/limitations.adoc
deleted file mode 100644
index f85e704485fe..000000000000
--- a/extensions/amqp/runtime/src/main/doc/limitations.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-=== Connection Pooling
-
-JMS connection pooling isn't supported yet since there is still an open https://github.com/amqphub/quarkus-qpid-jms/issues/22[issue] with quarkus-qpid-jms.
diff --git a/extensions/amqp/runtime/src/main/doc/usage.adoc b/extensions/amqp/runtime/src/main/doc/usage.adoc
index 3b72792a572f..3ce81fcee910 100644
--- a/extensions/amqp/runtime/src/main/doc/usage.adoc
+++ b/extensions/amqp/runtime/src/main/doc/usage.adoc
@@ -7,3 +7,22 @@ you must ensure that the `camel-quarkus-xml-jaxp` extension is present on the cl
 
 When sending JMS message payloads as `javax.jms.ObjectMessage`, you must annotate the relevant classes to be registered for serialization with `@RegisterForReflection(serialization = true)`. 
 Note that this extension automatically sets `quarkus.camel.native.reflection.serialization-enabled = true` for you. Refer to the xref:user-guide/native-mode.adoc#serialization[native mode user guide] for more information.
+
+=== Connection Pooling
+
+You can use the `quarkus-pooled-jms` extension to get pooling support for the connections. Refer to the https://quarkiverse.github.io/quarkiverse-docs/quarkus-pooled-jms/dev/index.html[quarkus-pooled-jms] extension documentation for more information.
+
+Just add the following dependency to your `pom.xml`:
+[source,xml]
+----
+<dependency>
+    <groupId>io.quarkiverse.messaginghub</groupId>
+    <artifactId>quarkus-pooled-jms</artifactId>
+</dependency>
+----
+
+To enable the pooling support, you need to add the following configuration to your `application.properties`:
+[source,properties]
+----
+quarkus.qpid-jms.wrap=true
+----
diff --git a/integration-tests/amqp/pom.xml b/integration-tests/amqp/pom.xml
index 15ca64e54fc6..b8a5c2cfbabd 100644
--- a/integration-tests/amqp/pom.xml
+++ b/integration-tests/amqp/pom.xml
@@ -42,6 +42,12 @@
             <artifactId>camel-quarkus-integration-test-messaging-jms</artifactId>
         </dependency>
 
+        <!-- Messaging Pooled JMS -->
+        <dependency>
+            <groupId>io.quarkiverse.messaginghub</groupId>
+            <artifactId>quarkus-pooled-jms</artifactId>
+        </dependency>
+
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/integration-tests/amqp/src/main/resources/application.properties b/integration-tests/amqp/src/main/resources/application.properties
new file mode 100644
index 000000000000..57ff45f33992
--- /dev/null
+++ b/integration-tests/amqp/src/main/resources/application.properties
@@ -0,0 +1,19 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+#
+# Only enabled with AmqpPoolingTest
+quarkus.pooled-jms.pooling.enabled=false
diff --git a/integration-tests/amqp/src/test/java/org/apache/camel/quarkus/component/amqp/it/AmqpPoolingIT.java b/integration-tests/amqp/src/test/java/org/apache/camel/quarkus/component/amqp/it/AmqpPoolingIT.java
new file mode 100644
index 000000000000..d1398c0f7f2b
--- /dev/null
+++ b/integration-tests/amqp/src/test/java/org/apache/camel/quarkus/component/amqp/it/AmqpPoolingIT.java
@@ -0,0 +1,24 @@
+/*
+ * 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.
+ */
+package org.apache.camel.quarkus.component.amqp.it;
+
+import io.quarkus.test.junit.QuarkusIntegrationTest;
+
+@QuarkusIntegrationTest
+class AmqpPoolingIT extends AmqpPoolingTest {
+
+}
diff --git a/integration-tests/amqp/src/test/java/org/apache/camel/quarkus/component/amqp/it/AmqpPoolingTest.java b/integration-tests/amqp/src/test/java/org/apache/camel/quarkus/component/amqp/it/AmqpPoolingTest.java
new file mode 100644
index 000000000000..79daca6dc986
--- /dev/null
+++ b/integration-tests/amqp/src/test/java/org/apache/camel/quarkus/component/amqp/it/AmqpPoolingTest.java
@@ -0,0 +1,49 @@
+/*
+ * 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.
+ */
+package org.apache.camel.quarkus.component.amqp.it;
+
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.common.ResourceArg;
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.junit.TestProfile;
+import io.restassured.RestAssured;
+import org.apache.camel.quarkus.messaging.jms.AbstractJmsMessagingTest;
+import org.apache.camel.quarkus.test.support.activemq.ActiveMQTestResource;
+import org.junit.jupiter.api.Test;
+
+import static org.hamcrest.Matchers.containsString;
+
+@QuarkusTest
+@QuarkusTestResource(initArgs = {
+        @ResourceArg(name = "modules", value = "quarkus.qpid-jms")
+}, value = ActiveMQTestResource.class)
+@TestProfile(JmsPoolingEnabled.class)
+class AmqpPoolingTest extends AbstractJmsMessagingTest {
+
+    @Test
+    public void connectionFactoryImplementation() {
+        RestAssured.get("/amqp/connection/factory")
+                .then()
+                .statusCode(200)
+                .body(containsString("qpid"));
+    }
+
+    @Override
+    public void testJmsTopic() {
+        // Ignore testJmsTopic since it can't use setClientId in a pool connection.
+    }
+}
diff --git a/integration-tests/amqp/src/test/java/org/apache/camel/quarkus/component/amqp/it/JmsPoolingEnabled.java b/integration-tests/amqp/src/test/java/org/apache/camel/quarkus/component/amqp/it/JmsPoolingEnabled.java
new file mode 100644
index 000000000000..5ba55511a9ad
--- /dev/null
+++ b/integration-tests/amqp/src/test/java/org/apache/camel/quarkus/component/amqp/it/JmsPoolingEnabled.java
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+
+package org.apache.camel.quarkus.component.amqp.it;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import io.quarkus.test.junit.QuarkusTestProfile;
+
+public class JmsPoolingEnabled implements QuarkusTestProfile {
+    @Override
+    public Map<String, String> getConfigOverrides() {
+        Map<String, String> props = new HashMap<>();
+        props.put("quarkus.pooled-jms.pooling.enabled", "true");
+        props.put("quarkus.pooled-jms.max-connections", "8");
+        props.put("quarkus.qpid-jms.wrap", "true");
+        return props;
+    }
+}
diff --git a/integration-tests/jms-qpid-amqp-client/pom.xml b/integration-tests/jms-qpid-amqp-client/pom.xml
index 50069c456893..0c8121367278 100644
--- a/integration-tests/jms-qpid-amqp-client/pom.xml
+++ b/integration-tests/jms-qpid-amqp-client/pom.xml
@@ -37,6 +37,12 @@
             <artifactId>camel-quarkus-jms</artifactId>
         </dependency>
 
+        <!-- Messaging Pooled JMS -->
+        <dependency>
+            <groupId>io.quarkiverse.messaginghub</groupId>
+            <artifactId>quarkus-pooled-jms</artifactId>
+        </dependency>
+
         <!-- Inherit base messaging routes -->
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
@@ -47,13 +53,8 @@
         <dependency>
             <groupId>org.amqphub.quarkus</groupId>
             <artifactId>quarkus-qpid-jms</artifactId>
-            <exclusions>
-                <exclusion><!-- Remove this once https://github.com/apache/qpid-jms/pull/46 reaches us -->
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jms_2.0_spec</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
+
         <dependency>
             <groupId>jakarta.jms</groupId>
             <artifactId>jakarta.jms-api</artifactId>
diff --git a/integration-tests/jms-qpid-amqp-client/src/main/resources/application.properties b/integration-tests/jms-qpid-amqp-client/src/main/resources/application.properties
new file mode 100644
index 000000000000..19dcbd8f1513
--- /dev/null
+++ b/integration-tests/jms-qpid-amqp-client/src/main/resources/application.properties
@@ -0,0 +1,19 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+#
+# Only enabled with JmsQpidPoolingTest
+quarkus.pooled-jms.pooling.enabled=false
diff --git a/integration-tests/jms-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/jms/qpid/it/JmsPoolingEnabled.java b/integration-tests/jms-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/jms/qpid/it/JmsPoolingEnabled.java
new file mode 100644
index 000000000000..522b8e82e005
--- /dev/null
+++ b/integration-tests/jms-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/jms/qpid/it/JmsPoolingEnabled.java
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+
+package org.apache.camel.quarkus.component.jms.qpid.it;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import io.quarkus.test.junit.QuarkusTestProfile;
+
+public class JmsPoolingEnabled implements QuarkusTestProfile {
+    @Override
+    public Map<String, String> getConfigOverrides() {
+        Map<String, String> props = new HashMap<>();
+        props.put("quarkus.pooled-jms.pooling.enabled", "true");
+        props.put("quarkus.pooled-jms.max-connections", "8");
+        props.put("quarkus.qpid-jms.wrap", "true");
+        return props;
+    }
+}
diff --git a/integration-tests/jms-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/jms/qpid/it/JmsQpidPoolingIT.java b/integration-tests/jms-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/jms/qpid/it/JmsQpidPoolingIT.java
new file mode 100644
index 000000000000..731d56343406
--- /dev/null
+++ b/integration-tests/jms-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/jms/qpid/it/JmsQpidPoolingIT.java
@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+package org.apache.camel.quarkus.component.jms.qpid.it;
+
+import io.quarkus.test.junit.QuarkusIntegrationTest;
+
+@QuarkusIntegrationTest
+public class JmsQpidPoolingIT extends JmsQpidPoolingTest {
+}
diff --git a/integration-tests/jms-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/jms/qpid/it/JmsQpidPoolingTest.java b/integration-tests/jms-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/jms/qpid/it/JmsQpidPoolingTest.java
new file mode 100644
index 000000000000..e0166f4f2481
--- /dev/null
+++ b/integration-tests/jms-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/jms/qpid/it/JmsQpidPoolingTest.java
@@ -0,0 +1,66 @@
+/*
+ * 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.
+ */
+package org.apache.camel.quarkus.component.jms.qpid.it;
+
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.common.ResourceArg;
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.junit.TestProfile;
+import io.restassured.RestAssured;
+import org.apache.camel.quarkus.messaging.jms.AbstractJmsMessagingTest;
+import org.apache.camel.quarkus.test.support.activemq.ActiveMQTestResource;
+import org.junit.jupiter.api.Test;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.is;
+
+@QuarkusTest
+@QuarkusTestResource(initArgs = {
+        @ResourceArg(name = "modules", value = "quarkus.qpid-jms") }, value = ActiveMQTestResource.class)
+@TestProfile(JmsPoolingEnabled.class)
+class JmsQpidPoolingTest extends AbstractJmsMessagingTest {
+
+    @Test
+    public void connectionFactoryImplementation() {
+        RestAssured.get("/messaging/jms/qpid/connection/factory")
+                .then()
+                .statusCode(200)
+                .body(containsString("qpid"));
+    }
+
+    @Test
+    public void testPojoProducer() {
+        String message = "Camel Quarkus qPid AMQP Pojo Producer";
+
+        RestAssured.given()
+                .body(message)
+                .post("/messaging/jms/qpid/pojo/producer")
+                .then()
+                .statusCode(204);
+
+        RestAssured.get("/messaging/{queueName}", "pojoProduce")
+                .then()
+                .statusCode(200)
+                .body(is(message));
+    }
+
+    @Override
+    public void testJmsTopic() {
+        // Ignore testJmsTopic since it can't use setClientId in a pool connection.
+    }
+
+}

From 9a5790022ef6abfaf468b71d4c309406fa5d02dc Mon Sep 17 00:00:00 2001
From: James Netherton <jamesnetherton@gmail.com>
Date: Thu, 6 Jul 2023 15:14:02 +0100
Subject: [PATCH 4/9] Restrict downloading of com.atlassian dependencies to
 packages.atlassian.com

---
 .mvn/maven.config              | 2 ++
 .mvn/rrf/groupId-atlassian.txt | 6 ++++++
 2 files changed, 8 insertions(+)
 create mode 100644 .mvn/maven.config
 create mode 100644 .mvn/rrf/groupId-atlassian.txt

diff --git a/.mvn/maven.config b/.mvn/maven.config
new file mode 100644
index 000000000000..7408098dbe37
--- /dev/null
+++ b/.mvn/maven.config
@@ -0,0 +1,2 @@
+-Daether.remoteRepositoryFilter.groupId=true
+-Daether.remoteRepositoryFilter.groupId.basedir=${session.rootDirectory}/.mvn/rrf/
diff --git a/.mvn/rrf/groupId-atlassian.txt b/.mvn/rrf/groupId-atlassian.txt
new file mode 100644
index 000000000000..4f03a4f21f26
--- /dev/null
+++ b/.mvn/rrf/groupId-atlassian.txt
@@ -0,0 +1,6 @@
+com.atlassian.event
+com.atlassian.httpclient
+com.atlassian.jira
+com.atlassian.platform
+com.atlassian.pom
+com.atlassian.sal

From 039b8e5a19c055892591b8d747145977b5b207c2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 7 Jul 2023 06:36:55 +0000
Subject: [PATCH 5/9] Bump htmlunit-driver from 4.9.1 to 4.10.0

Bumps [htmlunit-driver](https://github.com/SeleniumHQ/htmlunit-driver) from 4.9.1 to 4.10.0.
- [Release notes](https://github.com/SeleniumHQ/htmlunit-driver/releases)
- [Commits](https://github.com/SeleniumHQ/htmlunit-driver/compare/htmlunit-driver-4.9.1...htmlunit-driver-4.10.0)

---
updated-dependencies:
- dependency-name: org.seleniumhq.selenium:htmlunit-driver
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2598ace814e6..2a1e97eab12f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -158,7 +158,7 @@
         <consul-client.version>${consul-client-version}</consul-client.version>
         <ftpserver.version>${ftpserver-version}</ftpserver.version>
         <hamcrest.version>2.2</hamcrest.version><!-- Awaitility and Wiremock -->
-        <htmlunit-driver.version>4.9.1</htmlunit-driver.version>
+        <htmlunit-driver.version>4.10.0</htmlunit-driver.version>
         <pdfbox.version>${pdfbox-version}</pdfbox.version>
         <sshd.version>2.9.2</sshd.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.sshd:sshd-common -->
         <unboundid-ldapsdk.version>6.0.9</unboundid-ldapsdk.version>

From e97f3885c223e8121601f8aab15ca799cd03862b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 7 Jul 2023 09:37:31 +0000
Subject: [PATCH 6/9] Bump os-maven-plugin from 1.7.0 to 1.7.1

Bumps [os-maven-plugin](https://github.com/trustin/os-maven-plugin) from 1.7.0 to 1.7.1.
- [Release notes](https://github.com/trustin/os-maven-plugin/releases)
- [Commits](https://github.com/trustin/os-maven-plugin/compare/os-maven-plugin-1.7.0...os-maven-plugin-1.7.1)

---
updated-dependencies:
- dependency-name: kr.motd.maven:os-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2a1e97eab12f..3e6211079d56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -198,7 +198,7 @@
         <maven-scm-plugin.version>2.0.0</maven-scm-plugin.version>
         <maven-shade-plugin.version>3.5.0</maven-shade-plugin.version>
         <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
-        <os-maven-plugin.version>${os-maven-plugin-version}</os-maven-plugin.version>
+        <os-maven-plugin.version>1.7.1</os-maven-plugin.version>
         <protobuf-maven-plugin.version>${protobuf-maven-plugin-version}</protobuf-maven-plugin.version>
         <rpkgtests-maven-plugin.version>1.0.0</rpkgtests-maven-plugin.version>
 

From a57ae34b5a835c47a01a203925c287bc009ef15c Mon Sep 17 00:00:00 2001
From: James Netherton <jamesnetherton@gmail.com>
Date: Fri, 7 Jul 2023 10:33:35 +0100
Subject: [PATCH 7/9] Use NativeImageFeatureBuildItem instead of deprecated
 AutomaticFeature annotation

---
 .../xalan/deployment/XalanNativeImageProcessor.java      | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/extensions-support/xalan/deployment/src/main/java/org/apache/camel/quarkus/support/xalan/deployment/XalanNativeImageProcessor.java b/extensions-support/xalan/deployment/src/main/java/org/apache/camel/quarkus/support/xalan/deployment/XalanNativeImageProcessor.java
index 638f15a1d095..cef5d8ca8c33 100644
--- a/extensions-support/xalan/deployment/src/main/java/org/apache/camel/quarkus/support/xalan/deployment/XalanNativeImageProcessor.java
+++ b/extensions-support/xalan/deployment/src/main/java/org/apache/camel/quarkus/support/xalan/deployment/XalanNativeImageProcessor.java
@@ -25,6 +25,7 @@
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.GeneratedNativeImageClassBuildItem;
 import io.quarkus.deployment.builditem.GeneratedResourceBuildItem;
+import io.quarkus.deployment.builditem.NativeImageFeatureBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBundleBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
@@ -82,7 +83,8 @@ void resources(BuildProducer<NativeImageResourceBuildItem> resource) {
     @BuildStep
     void installTransformerFactory(
             BuildProducer<GeneratedNativeImageClassBuildItem> nativeImageClass,
-            BuildProducer<GeneratedResourceBuildItem> generatedResources) {
+            BuildProducer<GeneratedResourceBuildItem> generatedResources,
+            BuildProducer<NativeImageFeatureBuildItem> nativeImageFeature) {
 
         final String serviceProviderFileContent = XalanTransformerFactory.class.getName() + "\n";
 
@@ -98,14 +100,14 @@ void installTransformerFactory(
          * or NativeImageResourceBuildItem will pick the service file preferred by us.
          * We are thus forced to use this low level mechanism to ensure that.
          */
+        String xalanAutoFeatureClassName = getClass().getName() + "AutoFeature";
         final ClassCreator file = new ClassCreator(new ClassOutput() {
             @Override
             public void write(String s, byte[] bytes) {
                 nativeImageClass.produce(new GeneratedNativeImageClassBuildItem(s, bytes));
             }
-        }, getClass().getName() + "AutoFeature", null,
+        }, xalanAutoFeatureClassName, null,
                 Object.class.getName(), Feature.class.getName());
-        file.addAnnotation("com.oracle.svm.core.annotate.AutomaticFeature");
         final MethodCreator beforeAn = file.getMethodCreator("beforeAnalysis", "V",
                 Feature.BeforeAnalysisAccess.class.getName());
         final TryBlock overallCatch = beforeAn.tryBlock();
@@ -121,6 +123,7 @@ public void write(String s, byte[] bytes) {
         beforeAn.returnValue(null);
         file.close();
 
+        nativeImageFeature.produce(new NativeImageFeatureBuildItem(xalanAutoFeatureClassName));
     }
 
 }

From da6b251c87103102d7ba2dedd202ddb06efe3abb Mon Sep 17 00:00:00 2001
From: James Netherton <jamesnetherton@gmail.com>
Date: Fri, 7 Jul 2023 11:44:16 +0100
Subject: [PATCH 8/9] Register additional JDK classes for serialization
 required by Nitrite

Fixes #5070
---
 .../core/deployment/CamelSerializationProcessor.java      | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelSerializationProcessor.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelSerializationProcessor.java
index 117d11604676..1a3fe429fe2e 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelSerializationProcessor.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelSerializationProcessor.java
@@ -25,6 +25,8 @@
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.concurrent.ConcurrentSkipListMap;
+import java.util.concurrent.ConcurrentSkipListSet;
 
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
@@ -47,13 +49,17 @@ public class CamelSerializationProcessor {
             Byte.class.getName(),
             Character.class.getName(),
             Collections.EMPTY_LIST.getClass().getName(),
+            ConcurrentSkipListMap.class.getName(),
+            ConcurrentSkipListSet.class.getName(),
             Date.class.getName(),
             Double.class.getName(),
             Exception.class.getName(),
             Float.class.getName(),
             HashMap.class.getName(),
+            HashSet.class.getName(),
             Integer.class.getName(),
             LinkedHashMap.class.getName(),
+            LinkedHashSet.class.getName(),
             Long.class.getName(),
             Number.class.getName(),
             RuntimeException.class.getName(),
@@ -61,8 +67,6 @@ public class CamelSerializationProcessor {
             StackTraceElement[].class.getName(),
             String.class.getName(),
             Throwable.class.getName(),
-            HashSet.class.getName(),
-            LinkedHashSet.class.getName(),
 
             // Camel classes
             CamelExecutionException.class.getName(),

From 4f5c96c3e2db23c9f8508ab0fc1edf14dd7589b4 Mon Sep 17 00:00:00 2001
From: Nicolas Filotto <essobedo@users.noreply.github.com>
Date: Fri, 7 Jul 2023 17:33:37 +0200
Subject: [PATCH 9/9] chore: Add git diff when there are uncommitted changes
 (#5076)

## Motivation

There are builds failing due to uncommitted changes for which providing only the list of uncommitted files is not enough to understand the problem especially when we cannot reproduce.

## Modifications

* Add `git diff` to each command to have more info
---
 .github/workflows/camel-master-cron.yaml   | 4 ++--
 .github/workflows/ci-build.yaml            | 4 ++--
 .github/workflows/quarkus-master-cron.yaml | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/camel-master-cron.yaml b/.github/workflows/camel-master-cron.yaml
index f39d7d3b10ac..0b730490e8c6 100644
--- a/.github/workflows/camel-master-cron.yaml
+++ b/.github/workflows/camel-master-cron.yaml
@@ -72,7 +72,7 @@ jobs:
       - name: Fail if there are uncommitted changes
         shell: bash
         run: |
-          [[ -z $(git status --porcelain | grep -v antora.yml) ]] || { echo 'There are uncommitted changes'; git status; exit 1; }
+          [[ -z $(git status --porcelain | grep -v antora.yml) ]] || { echo 'There are uncommitted changes'; git status; git diff; exit 1; }
       - name: Tar Maven Repo
         shell: bash
         run: |
@@ -174,7 +174,7 @@ jobs:
       - name: Fail if there are uncommitted changes
         shell: bash
         run: |
-          [[ -z $(git status --porcelain) ]] || { echo 'There are uncommitted changes'; git status; exit 1; }
+          [[ -z $(git status --porcelain) ]] || { echo 'There are uncommitted changes'; git status; git diff; exit 1; }
       - name: Report Build Failure
         if: failure() || cancelled()
         run: |
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
index 26c6bfb49389..07c7f857061d 100644
--- a/.github/workflows/ci-build.yaml
+++ b/.github/workflows/ci-build.yaml
@@ -160,7 +160,7 @@ jobs:
       - name: Fail if there are uncommitted changes
         shell: bash
         run: |
-          [[ -z $(git status --porcelain | grep -v antora.yml) ]] || { echo 'There are uncommitted changes'; git status; exit 1; }
+          [[ -z $(git status --porcelain | grep -v antora.yml) ]] || { echo 'There are uncommitted changes'; git status; git diff; exit 1; }
       - name: Tar Maven Repo
         shell: bash
         run: |
@@ -256,7 +256,7 @@ jobs:
       - name: Fail if there are uncommitted changes
         shell: bash
         run: |
-          [[ -z $(git status --porcelain) ]] || { echo 'There are uncommitted changes'; git status; exit 1; }
+          [[ -z $(git status --porcelain) ]] || { echo 'There are uncommitted changes'; git status; git diff; exit 1; }
 
   functional-extension-tests:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/quarkus-master-cron.yaml b/.github/workflows/quarkus-master-cron.yaml
index ed16c129cf1d..784507d47764 100644
--- a/.github/workflows/quarkus-master-cron.yaml
+++ b/.github/workflows/quarkus-master-cron.yaml
@@ -78,7 +78,7 @@ jobs:
       - name: Fail if there are uncommitted changes
         shell: bash
         run: |
-          [[ -z $(git status --porcelain | grep -v antora.yml) ]] || { echo 'There are uncommitted changes'; git status; exit 1; }
+          [[ -z $(git status --porcelain | grep -v antora.yml) ]] || { echo 'There are uncommitted changes'; git status; git diff; exit 1; }
       - name: Tar Maven Repo
         shell: bash
         run: |
@@ -180,7 +180,7 @@ jobs:
       - name: Fail if there are uncommitted changes
         shell: bash
         run: |
-          [[ -z $(git status --porcelain) ]] || { echo 'There are uncommitted changes'; git status; exit 1; }
+          [[ -z $(git status --porcelain) ]] || { echo 'There are uncommitted changes'; git status; git diff; exit 1; }
       - name: Report Build Failure
         if: failure() || cancelled()
         run: |