Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #3884 upgrade quarkus-artemis to 1.2.0 #3885

Merged
merged 1 commit into from
Jun 30, 2022
Merged

Fix #3884 upgrade quarkus-artemis to 1.2.0 #3885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 0 additions & 5 deletions integration-tests/jms-artemis-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 0 additions & 5 deletions ...lient/src/test/java/org/apache/camel/quarkus/component/jms/artemis/it/JmsArtemisTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions integration-tests/jta/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>


Expand Down
8 changes: 2 additions & 6 deletions ...main/java/org/apache/camel/quarkus/component/jta/it/XAConnectionFactoryConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
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;

Expand All @@ -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));

}
}
3 changes: 3 additions & 0 deletions integration-tests/jta/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 0 additions & 5 deletions integration-tests/jta/src/test/java/org/apache/camel/quarkus/component/jta/it/JtaTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,10 @@
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;
Expand All @@ -40,9 +38,6 @@

@QuarkusTest
@QuarkusTestResource(H2DatabaseTestResource.class)
@QuarkusTestResource(initArgs = {
@ResourceArg(name = "modules", value = "quarkus.artemis")
}, value = ActiveMQTestResource.class)
class JtaTest {

@Test
Expand Down
5 changes: 0 additions & 5 deletions integration-tests/sjms-artemis-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 0 additions & 5 deletions ...ent/src/test/java/org/apache/camel/quarkus/component/sjms/artemis/it/SjmsArtemisTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions integration-tests/sjms2-artemis-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 0 additions & 5 deletions ...t/src/test/java/org/apache/camel/quarkus/component/sjms2/artemis/it/Sjms2ArtemisTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/ -->
Expand Down