This is an automated email from the ASF dual-hosted git repository.
zhfeng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 41b9f5edf8 Bump quarkiverse-pooled-jms.version from 2.11.0 to 2.12.0
(#8499)
41b9f5edf8 is described below
commit 41b9f5edf8119e1553c95c7f177382da3ccf78a2
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Fri Apr 3 15:35:25 2026 +0800
Bump quarkiverse-pooled-jms.version from 2.11.0 to 2.12.0 (#8499)
* Bump quarkiverse-pooled-jms.version from 2.11.0 to 2.12.0
Bumps `quarkiverse-pooled-jms.version` from 2.11.0 to 2.12.0.
Updates `io.quarkiverse.messaginghub:quarkus-pooled-jms` from 2.11.0 to
2.12.0
- [Release
notes](https://github.com/quarkiverse/quarkus-pooled-jms/releases)
-
[Commits](https://github.com/quarkiverse/quarkus-pooled-jms/compare/2.11.0...2.12.0)
Updates `io.quarkiverse.messaginghub:quarkus-pooled-jms-deployment` from
2.11.0 to 2.12.0
- [Release
notes](https://github.com/quarkiverse/quarkus-pooled-jms/releases)
-
[Commits](https://github.com/quarkiverse/quarkus-pooled-jms/compare/2.11.0...2.12.0)
---
updated-dependencies:
- dependency-name: io.quarkiverse.messaginghub:quarkus-pooled-jms
dependency-version: 2.12.0
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: io.quarkiverse.messaginghub:quarkus-pooled-jms-deployment
dependency-version: 2.12.0
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <[email protected]>
* Auto generated changes for dependabot commit
1d8080944dace427f8f87a1d2e1ec5327199ea3c
* Fix JMS connection factory tests for quarkus-pooled-jms 2.12.0
Since 2.12.0, quarkus-pooled-jms wraps connection factories in
DelegatingJmsPoolConnectionFactory. Update resource endpoints to
unwrap this delegate: in passthrough mode return the wrapped CF
class, otherwise return the delegate pool class. This preserves
the original test assertions for all profiles (no-pool, pooling, XA).
Also make IBM MQ CF producer @ApplicationScoped so all injection
points share the same instance and lazy initialization works correctly.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
---------
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Test User <[email protected]>
Co-authored-by: Claude Opus 4.6 <[email protected]>
---
.../apache/camel/quarkus/component/amqp/it/AmqpResource.java | 12 +++++++++++-
.../camel/quarkus/component/amqp/it/AmqpPoolingTest.java | 4 ++--
.../org/apache/camel/quarkus/component/amqp/it/AmqpTest.java | 4 ++--
.../quarkus/component/jms/artemis/it/JmsArtemisResource.java | 11 ++++++++++-
.../component/jms/ibmmq/it/IBMMQConnectionFactory.java | 3 +++
.../camel/quarkus/component/jms/ibmmq/it/IBMMQResource.java | 12 +++++++++++-
.../camel/quarkus/component/jms/qpid/it/QpidJmsResource.java | 12 +++++++++++-
.../quarkus/component/jms/qpid/it/JmsQpidPoolingTest.java | 3 +--
.../camel/quarkus/component/jms/qpid/it/JmsQpidTest.java | 3 +--
pom.xml | 2 +-
poms/bom/src/main/generated/flattened-full-pom.xml | 4 ++--
poms/bom/src/main/generated/flattened-reduced-pom.xml | 4 ++--
.../bom/src/main/generated/flattened-reduced-verbose-pom.xml | 4 ++--
13 files changed, 59 insertions(+), 19 deletions(-)
diff --git
a/integration-tests/amqp/src/main/java/org/apache/camel/quarkus/component/amqp/it/AmqpResource.java
b/integration-tests/amqp/src/main/java/org/apache/camel/quarkus/component/amqp/it/AmqpResource.java
index f7e03d5500..a613a5dd5c 100644
---
a/integration-tests/amqp/src/main/java/org/apache/camel/quarkus/component/amqp/it/AmqpResource.java
+++
b/integration-tests/amqp/src/main/java/org/apache/camel/quarkus/component/amqp/it/AmqpResource.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.quarkus.component.amqp.it;
+import
io.quarkiverse.messaginghub.pooled.jms.DelegatingJmsPoolConnectionFactory;
+import io.quarkus.arc.ClientProxy;
import jakarta.inject.Inject;
import jakarta.jms.ConnectionFactory;
import jakarta.ws.rs.GET;
@@ -33,6 +35,14 @@ public class AmqpResource {
@Path("/connection/factory")
@Produces(MediaType.TEXT_PLAIN)
public String connectionFactoryImplementation() {
- return connectionFactory.getClass().getName().toLowerCase();
+ ConnectionFactory cf = ClientProxy.unwrap(connectionFactory);
+ if (cf instanceof DelegatingJmsPoolConnectionFactory) {
+ DelegatingJmsPoolConnectionFactory delegating =
(DelegatingJmsPoolConnectionFactory) cf;
+ if (delegating.isPassthrough()) {
+ return
delegating.getWrappedConnectionFactory().getClass().getName();
+ }
+ return delegating.getDelegate().getClass().getName();
+ }
+ return cf.getClass().getName();
}
}
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
index 79daca6dc9..d14ba30fbd 100644
---
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
@@ -25,7 +25,7 @@ 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 = {
@@ -39,7 +39,7 @@ class AmqpPoolingTest extends AbstractJmsMessagingTest {
RestAssured.get("/amqp/connection/factory")
.then()
.statusCode(200)
- .body(containsString("qpid"));
+
.body(is("org.messaginghub.pooled.jms.JmsPoolConnectionFactory"));
}
@Override
diff --git
a/integration-tests/amqp/src/test/java/org/apache/camel/quarkus/component/amqp/it/AmqpTest.java
b/integration-tests/amqp/src/test/java/org/apache/camel/quarkus/component/amqp/it/AmqpTest.java
index cf703a8fdd..076b611a50 100644
---
a/integration-tests/amqp/src/test/java/org/apache/camel/quarkus/component/amqp/it/AmqpTest.java
+++
b/integration-tests/amqp/src/test/java/org/apache/camel/quarkus/component/amqp/it/AmqpTest.java
@@ -24,7 +24,7 @@ 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 = {
@@ -37,6 +37,6 @@ class AmqpTest extends AbstractJmsMessagingTest {
RestAssured.get("/amqp/connection/factory")
.then()
.statusCode(200)
- .body(containsString("qpid"));
+ .body(is("org.apache.qpid.jms.JmsConnectionFactory"));
}
}
diff --git
a/integration-tests/jms-artemis-client/src/main/java/org/apache/camel/quarkus/component/jms/artemis/it/JmsArtemisResource.java
b/integration-tests/jms-artemis-client/src/main/java/org/apache/camel/quarkus/component/jms/artemis/it/JmsArtemisResource.java
index 0a46a6df03..3bf52a3443 100644
---
a/integration-tests/jms-artemis-client/src/main/java/org/apache/camel/quarkus/component/jms/artemis/it/JmsArtemisResource.java
+++
b/integration-tests/jms-artemis-client/src/main/java/org/apache/camel/quarkus/component/jms/artemis/it/JmsArtemisResource.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.quarkus.component.jms.artemis.it;
+import
io.quarkiverse.messaginghub.pooled.jms.DelegatingJmsPoolConnectionFactory;
import io.quarkus.arc.ClientProxy;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
@@ -53,7 +54,15 @@ public class JmsArtemisResource {
@Path("/connection/factory")
@Produces(MediaType.TEXT_PLAIN)
public String connectionFactoryImplementation() {
- return ClientProxy.unwrap(connectionFactory).getClass().getName();
+ ConnectionFactory cf = ClientProxy.unwrap(connectionFactory);
+ if (cf instanceof DelegatingJmsPoolConnectionFactory) {
+ DelegatingJmsPoolConnectionFactory delegating =
(DelegatingJmsPoolConnectionFactory) cf;
+ if (delegating.isPassthrough()) {
+ return
delegating.getWrappedConnectionFactory().getClass().getName();
+ }
+ return delegating.getDelegate().getClass().getName();
+ }
+ return cf.getClass().getName();
}
@GET
diff --git
a/integration-tests/jms-ibmmq-client/src/main/java/org/apache/camel/quarkus/component/jms/ibmmq/it/IBMMQConnectionFactory.java
b/integration-tests/jms-ibmmq-client/src/main/java/org/apache/camel/quarkus/component/jms/ibmmq/it/IBMMQConnectionFactory.java
index 50317be332..a1079d6932 100644
---
a/integration-tests/jms-ibmmq-client/src/main/java/org/apache/camel/quarkus/component/jms/ibmmq/it/IBMMQConnectionFactory.java
+++
b/integration-tests/jms-ibmmq-client/src/main/java/org/apache/camel/quarkus/component/jms/ibmmq/it/IBMMQConnectionFactory.java
@@ -22,6 +22,7 @@ import com.ibm.msg.client.jakarta.wmq.WMQConstants;
import io.quarkiverse.messaginghub.pooled.jms.PooledJmsWrapper;
import io.quarkus.arc.properties.IfBuildProperty;
import io.quarkus.arc.properties.UnlessBuildProperty;
+import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.inject.Produces;
import jakarta.jms.ConnectionFactory;
import org.eclipse.microprofile.config.ConfigProvider;
@@ -29,6 +30,7 @@ import org.eclipse.microprofile.config.ConfigProvider;
public class IBMMQConnectionFactory {
@Produces
+ @ApplicationScoped
@UnlessBuildProperty(name = "quarkus.pooled-jms.transaction", stringValue
= "xa")
public ConnectionFactory createConnectionFactory(PooledJmsWrapper wrapper)
{
MQConnectionFactory mq = new MQConnectionFactory();
@@ -37,6 +39,7 @@ public class IBMMQConnectionFactory {
}
@Produces
+ @ApplicationScoped
@IfBuildProperty(name = "quarkus.pooled-jms.transaction", stringValue =
"xa")
public ConnectionFactory createXAConnectionFactory(PooledJmsWrapper
wrapper) {
MQXAConnectionFactory mq = new MQXAConnectionFactory();
diff --git
a/integration-tests/jms-ibmmq-client/src/main/java/org/apache/camel/quarkus/component/jms/ibmmq/it/IBMMQResource.java
b/integration-tests/jms-ibmmq-client/src/main/java/org/apache/camel/quarkus/component/jms/ibmmq/it/IBMMQResource.java
index 6f36113ee8..62ea88fda5 100644
---
a/integration-tests/jms-ibmmq-client/src/main/java/org/apache/camel/quarkus/component/jms/ibmmq/it/IBMMQResource.java
+++
b/integration-tests/jms-ibmmq-client/src/main/java/org/apache/camel/quarkus/component/jms/ibmmq/it/IBMMQResource.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.quarkus.component.jms.ibmmq.it;
+import
io.quarkiverse.messaginghub.pooled.jms.DelegatingJmsPoolConnectionFactory;
+import io.quarkus.arc.ClientProxy;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import jakarta.jms.ConnectionFactory;
@@ -49,7 +51,15 @@ public class IBMMQResource {
@Path("/connection/factory")
@Produces(MediaType.TEXT_PLAIN)
public String connectionFactoryImplementation() {
- return connectionFactory.getClass().getName();
+ ConnectionFactory cf = ClientProxy.unwrap(connectionFactory);
+ if (cf instanceof DelegatingJmsPoolConnectionFactory) {
+ DelegatingJmsPoolConnectionFactory delegating =
(DelegatingJmsPoolConnectionFactory) cf;
+ if (delegating.isPassthrough()) {
+ return
delegating.getWrappedConnectionFactory().getClass().getName();
+ }
+ return delegating.getDelegate().getClass().getName();
+ }
+ return cf.getClass().getName();
}
@POST
diff --git
a/integration-tests/jms-qpid-amqp-client/src/main/java/org/apache/camel/quarkus/component/jms/qpid/it/QpidJmsResource.java
b/integration-tests/jms-qpid-amqp-client/src/main/java/org/apache/camel/quarkus/component/jms/qpid/it/QpidJmsResource.java
index 694cbe07db..da491d5535 100644
---
a/integration-tests/jms-qpid-amqp-client/src/main/java/org/apache/camel/quarkus/component/jms/qpid/it/QpidJmsResource.java
+++
b/integration-tests/jms-qpid-amqp-client/src/main/java/org/apache/camel/quarkus/component/jms/qpid/it/QpidJmsResource.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.quarkus.component.jms.qpid.it;
+import
io.quarkiverse.messaginghub.pooled.jms.DelegatingJmsPoolConnectionFactory;
+import io.quarkus.arc.ClientProxy;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import jakarta.jms.ConnectionFactory;
@@ -41,7 +43,15 @@ public class QpidJmsResource {
@Path("/connection/factory")
@Produces(MediaType.TEXT_PLAIN)
public String connectionFactoryImplementation() {
- return connectionFactory.getClass().getName().toLowerCase();
+ ConnectionFactory cf = ClientProxy.unwrap(connectionFactory);
+ if (cf instanceof DelegatingJmsPoolConnectionFactory) {
+ DelegatingJmsPoolConnectionFactory delegating =
(DelegatingJmsPoolConnectionFactory) cf;
+ if (delegating.isPassthrough()) {
+ return
delegating.getWrappedConnectionFactory().getClass().getName();
+ }
+ return delegating.getDelegate().getClass().getName();
+ }
+ return cf.getClass().getName();
}
@POST
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
index e0166f4f24..de22828240 100644
---
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
@@ -25,7 +25,6 @@ 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
@@ -39,7 +38,7 @@ class JmsQpidPoolingTest extends AbstractJmsMessagingTest {
RestAssured.get("/messaging/jms/qpid/connection/factory")
.then()
.statusCode(200)
- .body(containsString("qpid"));
+
.body(is("org.messaginghub.pooled.jms.JmsPoolConnectionFactory"));
}
@Test
diff --git
a/integration-tests/jms-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/jms/qpid/it/JmsQpidTest.java
b/integration-tests/jms-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/jms/qpid/it/JmsQpidTest.java
index 13d8f4b8e8..aee1ac62b8 100644
---
a/integration-tests/jms-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/jms/qpid/it/JmsQpidTest.java
+++
b/integration-tests/jms-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/jms/qpid/it/JmsQpidTest.java
@@ -24,7 +24,6 @@ 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
@@ -37,7 +36,7 @@ class JmsQpidTest extends AbstractJmsMessagingTest {
RestAssured.get("/messaging/jms/qpid/connection/factory")
.then()
.statusCode(200)
- .body(containsString("qpid"));
+ .body(is("org.apache.qpid.jms.JmsConnectionFactory"));
}
@Test
diff --git a/pom.xml b/pom.xml
index 6cc92e8fef..a0d8b5572e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
<quarkiverse-micrometer.version>3.4.1</quarkiverse-micrometer.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/micrometer/registry/quarkus-micrometer-registry-jmx/
-->
<quarkiverse-minio.version>3.8.6</quarkiverse-minio.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ -->
<quarkiverse-mybatis.version>2.4.2</quarkiverse-mybatis.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/
-->
-
<quarkiverse-pooled-jms.version>2.11.0</quarkiverse-pooled-jms.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/messaginghub/quarkus-pooled-jms-parent/
-->
+
<quarkiverse-pooled-jms.version>2.12.0</quarkiverse-pooled-jms.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/messaginghub/quarkus-pooled-jms-parent/
-->
<quarkus.version>3.34.1</quarkus.version><!--
https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
<quarkus-hazelcast-client.version>4.1.0</quarkus-hazelcast-client.version><!--
https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ -->
<quarkus-qpid-jms.version>2.12.0</quarkus-qpid-jms.version><!-- This
should be in sync with quarkus-platform
https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index 07e7a60504..a415733e51 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -7649,12 +7649,12 @@
<dependency>
<groupId>io.quarkiverse.messaginghub</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>quarkus-pooled-jms</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>2.11.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.12.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>io.quarkiverse.messaginghub</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>quarkus-pooled-jms-deployment</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>2.11.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.12.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>io.quarkiverse.minio</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index 874a96e239..27195455c4 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -7603,12 +7603,12 @@
<dependency>
<groupId>io.quarkiverse.messaginghub</groupId>
<artifactId>quarkus-pooled-jms</artifactId>
- <version>2.11.0</version>
+ <version>2.12.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.messaginghub</groupId>
<artifactId>quarkus-pooled-jms-deployment</artifactId>
- <version>2.11.0</version>
+ <version>2.12.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.minio</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 425db9d9f7..774e5c38ee 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -7603,12 +7603,12 @@
<dependency>
<groupId>io.quarkiverse.messaginghub</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>quarkus-pooled-jms</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>2.11.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.12.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>io.quarkiverse.messaginghub</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>quarkus-pooled-jms-deployment</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>2.11.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.12.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>io.quarkiverse.minio</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
