You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zh...@apache.org on 2022/11/03 14:24:10 UTC
[camel-quarkus] branch main updated: Fix #3951 to add a test with quarkus-pooled-jms (#4237)
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 cb740e2ae9 Fix #3951 to add a test with quarkus-pooled-jms (#4237)
cb740e2ae9 is described below
commit cb740e2ae96cd7ded5728a9c7ce7e37585b6262f
Author: Zheng Feng <zh...@gmail.com>
AuthorDate: Thu Nov 3 22:24:03 2022 +0800
Fix #3951 to add a test with quarkus-pooled-jms (#4237)
* Fix #3951 to add a test with quarkus-pooled-jms
* Manage quarkus-pooled-jms in camel-quarkus-bom
---
integration-tests/jms-artemis-client/pom.xml | 12 ++++++++
.../src/main/resources/application.properties | 3 ++
.../jms/artemis/it/JmsArtemisPoolingIT.java | 23 +++++++++++++++
.../jms/artemis/it/JmsArtemisPoolingTest.java | 30 ++++++++++++++++++++
.../jms/artemis/it/JmsPoolingEnabled.java | 33 ++++++++++++++++++++++
pom.xml | 1 +
poms/bom/pom.xml | 12 ++++++++
poms/bom/src/main/generated/flattened-full-pom.xml | 11 ++++++++
.../src/main/generated/flattened-reduced-pom.xml | 11 ++++++++
.../generated/flattened-reduced-verbose-pom.xml | 11 ++++++++
10 files changed, 147 insertions(+)
diff --git a/integration-tests/jms-artemis-client/pom.xml b/integration-tests/jms-artemis-client/pom.xml
index 1931d046c8..e36bf950f8 100644
--- a/integration-tests/jms-artemis-client/pom.xml
+++ b/integration-tests/jms-artemis-client/pom.xml
@@ -49,6 +49,12 @@
<artifactId>quarkus-artemis-jms</artifactId>
</dependency>
+ <!-- Messaging Pooled JMS -->
+ <dependency>
+ <groupId>io.quarkiverse.messaginghub</groupId>
+ <artifactId>quarkus-pooled-jms</artifactId>
+ </dependency>
+
<dependency>
<groupId>jakarta.jms</groupId>
<artifactId>jakarta.jms-api</artifactId>
@@ -69,6 +75,12 @@
<groupId>io.quarkiverse.artemis</groupId>
<artifactId>quarkus-test-artemis</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-pool2</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- Inherit base messaging tests -->
diff --git a/integration-tests/jms-artemis-client/src/main/resources/application.properties b/integration-tests/jms-artemis-client/src/main/resources/application.properties
index fe7754fc47..2d40acb5aa 100644
--- a/integration-tests/jms-artemis-client/src/main/resources/application.properties
+++ b/integration-tests/jms-artemis-client/src/main/resources/application.properties
@@ -18,3 +18,6 @@
# Overridden to false via @TestProfile(JmsArtemisDisable.class) for some tests
# When false, we produce a custom ConnectionFactory via CustomConnectionFactory producer bean
quarkus.artemis.enabled=true
+#
+# Only enabled with JmsArtemisPoolingTest
+quarkus.pooled-jms.pooling.enabled=false
diff --git a/integration-tests/jms-artemis-client/src/test/java/org/apache/camel/quarkus/component/jms/artemis/it/JmsArtemisPoolingIT.java b/integration-tests/jms-artemis-client/src/test/java/org/apache/camel/quarkus/component/jms/artemis/it/JmsArtemisPoolingIT.java
new file mode 100644
index 0000000000..d793e6956e
--- /dev/null
+++ b/integration-tests/jms-artemis-client/src/test/java/org/apache/camel/quarkus/component/jms/artemis/it/JmsArtemisPoolingIT.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.artemis.it;
+
+import io.quarkus.test.junit.QuarkusIntegrationTest;
+
+@QuarkusIntegrationTest
+public class JmsArtemisPoolingIT extends JmsArtemisPoolingTest {
+}
diff --git a/integration-tests/jms-artemis-client/src/test/java/org/apache/camel/quarkus/component/jms/artemis/it/JmsArtemisPoolingTest.java b/integration-tests/jms-artemis-client/src/test/java/org/apache/camel/quarkus/component/jms/artemis/it/JmsArtemisPoolingTest.java
new file mode 100644
index 0000000000..d41da87f8e
--- /dev/null
+++ b/integration-tests/jms-artemis-client/src/test/java/org/apache/camel/quarkus/component/jms/artemis/it/JmsArtemisPoolingTest.java
@@ -0,0 +1,30 @@
+/*
+ * 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.artemis.it;
+
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.junit.TestProfile;
+import org.apache.camel.quarkus.messaging.jms.AbstractJmsMessagingTest;
+
+@QuarkusTest
+@TestProfile(JmsPoolingEnabled.class)
+public class JmsArtemisPoolingTest extends AbstractJmsMessagingTest {
+ @Override
+ public void testJmsTopic() {
+ // Ignore testJmsTopic since it can't use setClientId in a pool connection.
+ }
+}
diff --git a/integration-tests/jms-artemis-client/src/test/java/org/apache/camel/quarkus/component/jms/artemis/it/JmsPoolingEnabled.java b/integration-tests/jms-artemis-client/src/test/java/org/apache/camel/quarkus/component/jms/artemis/it/JmsPoolingEnabled.java
new file mode 100644
index 0000000000..b1b534764e
--- /dev/null
+++ b/integration-tests/jms-artemis-client/src/test/java/org/apache/camel/quarkus/component/jms/artemis/it/JmsPoolingEnabled.java
@@ -0,0 +1,33 @@
+/*
+ * 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.artemis.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");
+ return props;
+ }
+}
diff --git a/pom.xml b/pom.xml
index 3f7e193fc8..a0abb6fab5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,6 +57,7 @@
<quarkiverse-jsch.version>2.0.1</quarkiverse-jsch.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/jsch/quarkus-jsch-parent/ -->
<quarkiverse-minio.version>2.9.2</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ -->
<quarkiverse-mybatis.version>1.0.4</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ -->
+ <quarkiverse-pooled-jms.version>1.0.5</quarkiverse-pooled-jms.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/messaginghub/quarkus-pooled-jms-parent/ -->
<quarkiverse-tika.version>1.0.3</quarkiverse-tika.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/tika/quarkus-tika-parent/ -->
<quarkus.version>2.14.0.Final</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
<quarkus-hazelcast-client.version>3.0.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ -->
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 908ba98941..078d2fe966 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -10077,6 +10077,17 @@
<artifactId>quarkus-jsch-deployment</artifactId>
<version>${quarkiverse-jsch.version}</version>
</dependency>
+ <dependency>
+ <groupId>io.quarkiverse.messaginghub</groupId>
+ <artifactId>quarkus-pooled-jms</artifactId>
+ <version>${quarkiverse-pooled-jms.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>io.quarkiverse.minio</groupId>
<artifactId>quarkus-minio</artifactId>
@@ -10583,6 +10594,7 @@
<resolutionEntryPointInclude>org.apache.camel.quarkus:*</resolutionEntryPointInclude>
<resolutionEntryPointInclude>ca.uhn.hapi:*</resolutionEntryPointInclude>
<resolutionEntryPointInclude>io.quarkiverse.cxf:*</resolutionEntryPointInclude>
+ <resolutionEntryPointInclude>io.quarkiverse.messaginghub:*</resolutionEntryPointInclude>
<resolutionEntryPointInclude>net.openhft:affinity</resolutionEntryPointInclude><!-- https://github.com/apache/camel-quarkus/issues/3788 -->
<resolutionEntryPointInclude>org.apache.cxf.xjc-utils:cxf-xjc-runtime</resolutionEntryPointInclude>
</resolutionEntryPointIncludes>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml
index f9241dee97..88186bd8fe 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -10011,6 +10011,17 @@
<artifactId>quarkus-jsch-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>2.0.1</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</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.0.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <exclusions>
+ <exclusion>
+ <groupId>jakarta.jms</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>jakarta.jms-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>io.quarkiverse.minio</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>quarkus-minio</artifactId><!-- 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 fb7dda630e..c5f06b62ad 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -10011,6 +10011,17 @@
<artifactId>quarkus-jsch-deployment</artifactId>
<version>2.0.1</version>
</dependency>
+ <dependency>
+ <groupId>io.quarkiverse.messaginghub</groupId>
+ <artifactId>quarkus-pooled-jms</artifactId>
+ <version>1.0.5</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>io.quarkiverse.minio</groupId>
<artifactId>quarkus-minio</artifactId>
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 06e484c23c..bb9d51ab76 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -10011,6 +10011,17 @@
<artifactId>quarkus-jsch-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>2.0.1</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</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.0.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <exclusions>
+ <exclusion>
+ <groupId>jakarta.jms</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>jakarta.jms-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>io.quarkiverse.minio</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>quarkus-minio</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->