This is an automated email from the ASF dual-hosted git repository.
jamesnetherton 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 08d0a6473d Upgrade quarkus-pooled-jms to 2.1.0
08d0a6473d is described below
commit 08d0a6473dbdb2151795b02de5e4586ea03983ca
Author: Zheng Feng <[email protected]>
AuthorDate: Mon Sep 11 19:31:13 2023 +0800
Upgrade quarkus-pooled-jms to 2.1.0
---
.../jms/ibmmq/it/IBMMQConnectionFactory.java | 26 +++++++++++++---------
.../component/jms/ibmmq/it/IBMMQPoolingTest.java | 4 ++--
.../quarkus/component/jms/ibmmq/it/IBMMQTest.java | 3 +--
pom.xml | 2 +-
poms/bom/src/main/generated/flattened-full-pom.xml | 4 ++--
.../src/main/generated/flattened-reduced-pom.xml | 4 ++--
.../generated/flattened-reduced-verbose-pom.xml | 4 ++--
7 files changed, 25 insertions(+), 22 deletions(-)
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 fd009b9b63..a550748b96 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
@@ -18,25 +18,29 @@ package org.apache.camel.quarkus.component.jms.ibmmq.it;
import com.ibm.mq.jakarta.jms.MQConnectionFactory;
import com.ibm.msg.client.jakarta.wmq.WMQConstants;
-import jakarta.enterprise.context.Dependent;
+import io.quarkiverse.messaginghub.pooled.jms.PooledJmsWrapper;
+import jakarta.enterprise.inject.Produces;
+import jakarta.jms.ConnectionFactory;
import org.eclipse.microprofile.config.ConfigProvider;
-@Dependent
-public class IBMMQConnectionFactory extends MQConnectionFactory {
+public class IBMMQConnectionFactory {
- public IBMMQConnectionFactory() {
- setHostName(ConfigProvider.getConfig().getValue("ibm.mq.host",
String.class));
+ @Produces
+ public ConnectionFactory createConnectionFactory(PooledJmsWrapper wrapper)
{
+ MQConnectionFactory mq = new MQConnectionFactory();
try {
- setPort(ConfigProvider.getConfig().getValue("ibm.mq.port",
Integer.class));
- setChannel(ConfigProvider.getConfig().getValue("ibm.mq.channel",
String.class));
-
setQueueManager(ConfigProvider.getConfig().getValue("ibm.mq.queueManagerName",
String.class));
- setTransportType(WMQConstants.WMQ_CM_CLIENT);
- setStringProperty(WMQConstants.USERID,
+ mq.setHostName(ConfigProvider.getConfig().getValue("ibm.mq.host",
String.class));
+ mq.setPort(ConfigProvider.getConfig().getValue("ibm.mq.port",
Integer.class));
+
mq.setChannel(ConfigProvider.getConfig().getValue("ibm.mq.channel",
String.class));
+
mq.setQueueManager(ConfigProvider.getConfig().getValue("ibm.mq.queueManagerName",
String.class));
+ mq.setTransportType(WMQConstants.WMQ_CM_CLIENT);
+ mq.setStringProperty(WMQConstants.USERID,
ConfigProvider.getConfig().getValue("ibm.mq.user",
String.class));
- setStringProperty(WMQConstants.PASSWORD,
+ mq.setStringProperty(WMQConstants.PASSWORD,
ConfigProvider.getConfig().getValue("ibm.mq.password",
String.class));
} catch (Exception e) {
throw new RuntimeException("Unable to create new IBM MQ connection
factory", e);
}
+ return wrapper.wrapConnectionFactory(mq);
}
}
diff --git
a/integration-tests/jms-ibmmq-client/src/test/java/org/apache/camel/quarkus/component/jms/ibmmq/it/IBMMQPoolingTest.java
b/integration-tests/jms-ibmmq-client/src/test/java/org/apache/camel/quarkus/component/jms/ibmmq/it/IBMMQPoolingTest.java
index 8597e50904..3bcaa6adf7 100644
---
a/integration-tests/jms-ibmmq-client/src/test/java/org/apache/camel/quarkus/component/jms/ibmmq/it/IBMMQPoolingTest.java
+++
b/integration-tests/jms-ibmmq-client/src/test/java/org/apache/camel/quarkus/component/jms/ibmmq/it/IBMMQPoolingTest.java
@@ -32,7 +32,7 @@ import org.junit.jupiter.api.TestInfo;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
-import static org.hamcrest.Matchers.startsWith;
+import static org.hamcrest.Matchers.is;
@QuarkusTest
@QuarkusTestResource(IBMMQTestResource.class)
@@ -69,7 +69,7 @@ public class IBMMQPoolingTest extends
AbstractJmsMessagingTest {
RestAssured.get("/messaging/jms/ibmmq/connection/factory")
.then()
.statusCode(200)
-
.body(startsWith("org.apache.camel.quarkus.component.jms.ibmmq.it.IBMMQConnectionFactory"));
+
.body(is("org.messaginghub.pooled.jms.JmsPoolConnectionFactory"));
}
@Override
diff --git
a/integration-tests/jms-ibmmq-client/src/test/java/org/apache/camel/quarkus/component/jms/ibmmq/it/IBMMQTest.java
b/integration-tests/jms-ibmmq-client/src/test/java/org/apache/camel/quarkus/component/jms/ibmmq/it/IBMMQTest.java
index 5dcd0d784d..dc90ff428d 100644
---
a/integration-tests/jms-ibmmq-client/src/test/java/org/apache/camel/quarkus/component/jms/ibmmq/it/IBMMQTest.java
+++
b/integration-tests/jms-ibmmq-client/src/test/java/org/apache/camel/quarkus/component/jms/ibmmq/it/IBMMQTest.java
@@ -31,7 +31,6 @@ import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.startsWith;
@QuarkusTest
@QuarkusTestResource(IBMMQTestResource.class)
@@ -67,7 +66,7 @@ public class IBMMQTest extends AbstractJmsMessagingTest {
RestAssured.get("/messaging/jms/ibmmq/connection/factory")
.then()
.statusCode(200)
-
.body(startsWith("org.apache.camel.quarkus.component.jms.ibmmq.it.IBMMQConnectionFactory"));
+ .body(is("com.ibm.mq.jakarta.jms.MQConnectionFactory"));
}
@Test
diff --git a/pom.xml b/pom.xml
index 649c0a080b..10e0d0ab55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
<quarkiverse-micrometer.version>3.2.4</quarkiverse-micrometer.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/micrometer/registry/quarkus-micrometer-registry-jmx/
-->
<quarkiverse-minio.version>3.3.1</quarkiverse-minio.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ -->
<quarkiverse-mybatis.version>2.1.0</quarkiverse-mybatis.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/
-->
-
<quarkiverse-pooled-jms.version>2.0.2</quarkiverse-pooled-jms.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/messaginghub/quarkus-pooled-jms-parent/
-->
+
<quarkiverse-pooled-jms.version>2.1.0</quarkiverse-pooled-jms.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/messaginghub/quarkus-pooled-jms-parent/
-->
<quarkiverse-tika.version>2.0.2</quarkiverse-tika.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/tika/quarkus-tika-parent/ -->
<quarkus.version>3.4.0.CR1</quarkus.version><!--
https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
<quarkus-hazelcast-client.version>4.0.0</quarkus-hazelcast-client.version><!--
https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ -->
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index 582205193f..dd68da65be 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6271,12 +6271,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.0.2</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.1.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.0.2</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.1.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 f64f99d3d3..046005a5ba 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -6261,12 +6261,12 @@
<dependency>
<groupId>io.quarkiverse.messaginghub</groupId>
<artifactId>quarkus-pooled-jms</artifactId>
- <version>2.0.2</version>
+ <version>2.1.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.messaginghub</groupId>
<artifactId>quarkus-pooled-jms-deployment</artifactId>
- <version>2.0.2</version>
+ <version>2.1.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 637dbc2bd2..a09746756c 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -6261,12 +6261,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.0.2</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.1.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.0.2</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.1.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} -->
