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 152221f018 Fix #3884 upgrade quarkus-artemis to 1.2.0 (#3885)
152221f018 is described below
commit 152221f018ac68578d51eebe342d899166954483
Author: Amos Feng <[email protected]>
AuthorDate: Thu Jun 30 11:05:54 2022 +0800
Fix #3884 upgrade quarkus-artemis to 1.2.0 (#3885)
---
integration-tests/jms-artemis-client/pom.xml | 5 -----
.../camel/quarkus/component/jms/artemis/it/JmsArtemisTest.java | 5 -----
integration-tests/jta/pom.xml | 5 -----
.../component/jta/it/XAConnectionFactoryConfiguration.java | 8 ++------
integration-tests/jta/src/main/resources/application.properties | 3 +++
.../java/org/apache/camel/quarkus/component/jta/it/JtaTest.java | 5 -----
integration-tests/sjms-artemis-client/pom.xml | 5 -----
.../camel/quarkus/component/sjms/artemis/it/SjmsArtemisTest.java | 5 -----
integration-tests/sjms2-artemis-client/pom.xml | 5 -----
.../quarkus/component/sjms2/artemis/it/Sjms2ArtemisTest.java | 5 -----
pom.xml | 2 +-
11 files changed, 6 insertions(+), 47 deletions(-)
diff --git a/integration-tests/jms-artemis-client/pom.xml
b/integration-tests/jms-artemis-client/pom.xml
index b28a31cbbb..5e4837e0aa 100644
--- a/integration-tests/jms-artemis-client/pom.xml
+++ b/integration-tests/jms-artemis-client/pom.xml
@@ -65,11 +65,6 @@
<artifactId>rest-assured</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
-
<artifactId>camel-quarkus-integration-tests-support-activemq</artifactId>
- <scope>test</scope>
- </dependency>
<!-- Inherit base messaging tests -->
<dependency>
diff --git
a/integration-tests/jms-artemis-client/src/test/java/org/apache/camel/quarkus/component/jms/artemis/it/JmsArtemisTest.java
b/integration-tests/jms-artemis-client/src/test/java/org/apache/camel/quarkus/component/jms/artemis/it/JmsArtemisTest.java
index 15bbf7e34a..2c32a22daa 100644
---
a/integration-tests/jms-artemis-client/src/test/java/org/apache/camel/quarkus/component/jms/artemis/it/JmsArtemisTest.java
+++
b/integration-tests/jms-artemis-client/src/test/java/org/apache/camel/quarkus/component/jms/artemis/it/JmsArtemisTest.java
@@ -16,20 +16,15 @@
*/
package org.apache.camel.quarkus.component.jms.artemis.it;
-import io.quarkus.test.common.QuarkusTestResource;
-import io.quarkus.test.common.ResourceArg;
import io.quarkus.test.junit.QuarkusTest;
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.is;
import static org.hamcrest.Matchers.startsWith;
@QuarkusTest
-@QuarkusTestResource(initArgs = {
- @ResourceArg(name = "modules", value = "quarkus.artemis") }, value =
ActiveMQTestResource.class)
class JmsArtemisTest extends AbstractJmsMessagingTest {
@Test
diff --git a/integration-tests/jta/pom.xml b/integration-tests/jta/pom.xml
index 1ec2f78734..f64cfd0d21 100644
--- a/integration-tests/jta/pom.xml
+++ b/integration-tests/jta/pom.xml
@@ -84,11 +84,6 @@
<artifactId>rest-assured</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
-
<artifactId>camel-quarkus-integration-tests-support-activemq</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
diff --git
a/integration-tests/jta/src/main/java/org/apache/camel/quarkus/component/jta/it/XAConnectionFactoryConfiguration.java
b/integration-tests/jta/src/main/java/org/apache/camel/quarkus/component/jta/it/XAConnectionFactoryConfiguration.java
index f5d487ba6c..3b78dab297 100644
---
a/integration-tests/jta/src/main/java/org/apache/camel/quarkus/component/jta/it/XAConnectionFactoryConfiguration.java
+++
b/integration-tests/jta/src/main/java/org/apache/camel/quarkus/component/jta/it/XAConnectionFactoryConfiguration.java
@@ -23,8 +23,6 @@ import javax.jms.ConnectionFactory;
import javax.jms.XAConnectionFactory;
import javax.transaction.TransactionManager;
-import io.quarkus.artemis.core.runtime.ArtemisRuntimeConfig;
-import org.apache.activemq.artemis.jms.client.ActiveMQXAConnectionFactory;
import org.jboss.narayana.jta.jms.ConnectionFactoryProxy;
import org.jboss.narayana.jta.jms.TransactionHelperImpl;
@@ -35,10 +33,8 @@ public class XAConnectionFactoryConfiguration {
// And the ConnectionFactory could be integrated with TransactionManager
@Produces
@Named("xaConnectionFactory")
- public ConnectionFactory getXAConnectionFactory(TransactionManager tm,
ArtemisRuntimeConfig config) {
- XAConnectionFactory cf = new ActiveMQXAConnectionFactory(
- config.url, config.username.orElse(null),
config.password.orElse(null));
- return new ConnectionFactoryProxy(cf, new TransactionHelperImpl(tm));
+ public ConnectionFactory getXAConnectionFactory(TransactionManager tm,
XAConnectionFactory xacf) {
+ return new ConnectionFactoryProxy(xacf, new TransactionHelperImpl(tm));
}
}
diff --git a/integration-tests/jta/src/main/resources/application.properties
b/integration-tests/jta/src/main/resources/application.properties
index dcd0d95fc2..878d6e22e2 100644
--- a/integration-tests/jta/src/main/resources/application.properties
+++ b/integration-tests/jta/src/main/resources/application.properties
@@ -22,3 +22,6 @@
quarkus.datasource.camel-ds.jdbc.url=jdbc:h2:tcp://localhost/mem:test
quarkus.datasource.camel-ds.db-kind=h2
quarkus.datasource.camel-ds.jdbc.max-size=8
quarkus.datasource.camel-ds.jdbc.transactions=xa
+
+# Quarkus :: Artemis
+quarkus.artemis.xa.enabled=true
diff --git
a/integration-tests/jta/src/test/java/org/apache/camel/quarkus/component/jta/it/JtaTest.java
b/integration-tests/jta/src/test/java/org/apache/camel/quarkus/component/jta/it/JtaTest.java
index 146f351356..976e26fae4 100644
---
a/integration-tests/jta/src/test/java/org/apache/camel/quarkus/component/jta/it/JtaTest.java
+++
b/integration-tests/jta/src/test/java/org/apache/camel/quarkus/component/jta/it/JtaTest.java
@@ -24,12 +24,10 @@ import java.sql.Statement;
import java.util.UUID;
import io.quarkus.test.common.QuarkusTestResource;
-import io.quarkus.test.common.ResourceArg;
import io.quarkus.test.h2.H2DatabaseTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import io.restassured.http.ContentType;
-import org.apache.camel.quarkus.test.support.activemq.ActiveMQTestResource;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -40,9 +38,6 @@ import static org.hamcrest.Matchers.is;
@QuarkusTest
@QuarkusTestResource(H2DatabaseTestResource.class)
-@QuarkusTestResource(initArgs = {
- @ResourceArg(name = "modules", value = "quarkus.artemis")
-}, value = ActiveMQTestResource.class)
class JtaTest {
@Test
diff --git a/integration-tests/sjms-artemis-client/pom.xml
b/integration-tests/sjms-artemis-client/pom.xml
index fe823793f5..2396e5df8f 100644
--- a/integration-tests/sjms-artemis-client/pom.xml
+++ b/integration-tests/sjms-artemis-client/pom.xml
@@ -60,11 +60,6 @@
<artifactId>rest-assured</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
-
<artifactId>camel-quarkus-integration-tests-support-activemq</artifactId>
- <scope>test</scope>
- </dependency>
<!-- Inherit base messaging tests -->
<dependency>
diff --git
a/integration-tests/sjms-artemis-client/src/test/java/org/apache/camel/quarkus/component/sjms/artemis/it/SjmsArtemisTest.java
b/integration-tests/sjms-artemis-client/src/test/java/org/apache/camel/quarkus/component/sjms/artemis/it/SjmsArtemisTest.java
index 8861de5f31..5b935eba02 100644
---
a/integration-tests/sjms-artemis-client/src/test/java/org/apache/camel/quarkus/component/sjms/artemis/it/SjmsArtemisTest.java
+++
b/integration-tests/sjms-artemis-client/src/test/java/org/apache/camel/quarkus/component/sjms/artemis/it/SjmsArtemisTest.java
@@ -16,19 +16,14 @@
*/
package org.apache.camel.quarkus.component.sjms.artemis.it;
-import io.quarkus.test.common.QuarkusTestResource;
-import io.quarkus.test.common.ResourceArg;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import org.apache.camel.quarkus.messaging.sjms.AbstractSjmsMessagingTest;
-import org.apache.camel.quarkus.test.support.activemq.ActiveMQTestResource;
import org.junit.jupiter.api.Test;
import static org.hamcrest.Matchers.startsWith;
@QuarkusTest
-@QuarkusTestResource(initArgs = {
- @ResourceArg(name = "modules", value = "quarkus.artemis") }, value =
ActiveMQTestResource.class)
class SjmsArtemisTest extends AbstractSjmsMessagingTest {
@Test
diff --git a/integration-tests/sjms2-artemis-client/pom.xml
b/integration-tests/sjms2-artemis-client/pom.xml
index 0acdb49046..5b05cc7002 100644
--- a/integration-tests/sjms2-artemis-client/pom.xml
+++ b/integration-tests/sjms2-artemis-client/pom.xml
@@ -60,11 +60,6 @@
<artifactId>rest-assured</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
-
<artifactId>camel-quarkus-integration-tests-support-activemq</artifactId>
- <scope>test</scope>
- </dependency>
<!-- Inherit base messaging tests -->
<dependency>
diff --git
a/integration-tests/sjms2-artemis-client/src/test/java/org/apache/camel/quarkus/component/sjms2/artemis/it/Sjms2ArtemisTest.java
b/integration-tests/sjms2-artemis-client/src/test/java/org/apache/camel/quarkus/component/sjms2/artemis/it/Sjms2ArtemisTest.java
index 9d7532b9c8..5740e81205 100644
---
a/integration-tests/sjms2-artemis-client/src/test/java/org/apache/camel/quarkus/component/sjms2/artemis/it/Sjms2ArtemisTest.java
+++
b/integration-tests/sjms2-artemis-client/src/test/java/org/apache/camel/quarkus/component/sjms2/artemis/it/Sjms2ArtemisTest.java
@@ -16,19 +16,14 @@
*/
package org.apache.camel.quarkus.component.sjms2.artemis.it;
-import io.quarkus.test.common.QuarkusTestResource;
-import io.quarkus.test.common.ResourceArg;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import org.apache.camel.quarkus.messaging.sjms.AbstractSjmsMessagingTest;
-import org.apache.camel.quarkus.test.support.activemq.ActiveMQTestResource;
import org.junit.jupiter.api.Test;
import static org.hamcrest.Matchers.startsWith;
@QuarkusTest
-@QuarkusTestResource(initArgs = {
- @ResourceArg(name = "modules", value = "quarkus.artemis") }, value =
ActiveMQTestResource.class)
class Sjms2ArtemisTest extends AbstractSjmsMessagingTest {
@Test
diff --git a/pom.xml b/pom.xml
index e8e36c3aef..6687212871 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
<debezium.version>1.9.2.Final</debezium.version><!-- May go back to
Camel's ${debezium-version} when they are in sync
https://repo1.maven.org/maven2/io/debezium/debezium-bom/ -->
<optaplanner.version>8.23.0.Final</optaplanner.version><!-- May go
back to Camel's ${optaplanner-version} when they are in sync
https://repo1.maven.org/maven2/org/optaplanner/optaplanner-quarkus/ -->
<quarkiverse-amazonservices.version>1.1.1</quarkiverse-amazonservices.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/amazonservices/quarkus-amazon-services-parent/
-->
- <quarkiverse-artemis.version>1.0.4</quarkiverse-artemis.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/artemis/quarkus-artemis-parent/
-->
+ <quarkiverse-artemis.version>1.2.0</quarkiverse-artemis.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/artemis/quarkus-artemis-parent/
-->
<quarkiverse-freemarker.version>0.3.0</quarkiverse-freemarker.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/freemarker/quarkus-freemarker-parent/
-->
<quarkiverse-jgit.version>1.2.0</quarkiverse-jgit.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/jgit/quarkus-jgit-parent/ -->
<quarkiverse-jsch.version>2.0.0</quarkiverse-jsch.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/jsch/quarkus-jsch-parent/ -->
