You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2023/01/11 09:54:32 UTC
[camel] 20/20: Other fixes
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0e8a0024eb44bbe89d67f4e3826b6c9e24c814e6
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Wed Jan 11 09:43:59 2023 +0100
Other fixes
---
components/camel-jms/pom.xml | 2 +-
.../org/apache/camel/component/jms/JmsComponentTest.java | 2 +-
.../camel/component/jms/JmsEndpointConfigurationTest.java | 2 +-
.../component/jms/JmsFormatDateHeadersToIso8601Test.java | 2 +-
parent/pom.xml | 14 +++++++-------
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/components/camel-jms/pom.xml b/components/camel-jms/pom.xml
index 524da6b019f..0d5e0792f2f 100644
--- a/components/camel-jms/pom.xml
+++ b/components/camel-jms/pom.xml
@@ -140,7 +140,7 @@
</dependencies>
<build>
- <testSourceDirectory>src/test/dummy</testSourceDirectory>
+<!-- <testSourceDirectory>src/test/dummy</testSourceDirectory>-->
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentTest.java
index d7328d7982d..984d881029e 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentTest.java
@@ -20,8 +20,8 @@ import jakarta.jms.ConnectionFactory;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.infra.activemq.common.ConnectionFactoryHelper;
import org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker;
+import org.apache.camel.test.infra.artemis.common.ConnectionFactoryHelper;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java
index 2ff46acf998..61728a30db1 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.jms;
import jakarta.jms.ConnectionFactory;
import jakarta.jms.DeliveryMode;
-import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
import org.apache.camel.BindToRegistry;
import org.apache.camel.LoggingLevel;
import org.apache.camel.Processor;
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFormatDateHeadersToIso8601Test.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFormatDateHeadersToIso8601Test.java
index 38276873afa..1e4c15b8d1b 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFormatDateHeadersToIso8601Test.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFormatDateHeadersToIso8601Test.java
@@ -23,7 +23,7 @@ import jakarta.jms.ConnectionFactory;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.infra.activemq.common.ConnectionFactoryHelper;
+import org.apache.camel.test.infra.artemis.common.ConnectionFactoryHelper;
import org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
diff --git a/parent/pom.xml b/parent/pom.xml
index 06d361e2c5e..276e687ac76 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -386,9 +386,9 @@
<maven-war-plugin-version>3.3.1</maven-war-plugin-version>
<metrics-version>4.2.14</metrics-version>
<micrometer-version>1.10.2</micrometer-version>
- <microprofile-config-version>2.0.1</microprofile-config-version>
- <microprofile-metrics-version>3.0.1</microprofile-metrics-version>
- <microprofile-fault-tolerance-version>3.0</microprofile-fault-tolerance-version>
+ <microprofile-config-version>3.0.2</microprofile-config-version>
+ <microprofile-metrics-version>5.0.0</microprofile-metrics-version>
+ <microprofile-fault-tolerance-version>4.0.2</microprofile-fault-tolerance-version>
<milo-version>0.6.8</milo-version>
<milo-guava-version>31.1-jre</milo-guava-version>
<mina-version>2.1.6</mina-version>
@@ -477,10 +477,10 @@
<slf4j-api-version>1.7.36</slf4j-api-version>
<slf4j-version>1.7.36</slf4j-version>
<smack-version>4.3.5</smack-version>
- <smallrye-config-version>2.12.0</smallrye-config-version>
- <smallrye-metrics-version>3.0.5</smallrye-metrics-version>
- <smallrye-health-version>3.3.0</smallrye-health-version>
- <smallrye-fault-tolerance-version>5.6.0</smallrye-fault-tolerance-version>
+ <smallrye-config-version>3.1.1</smallrye-config-version>
+ <smallrye-metrics-version>5.0.0-RC2</smallrye-metrics-version>
+ <smallrye-health-version>4.0.1</smallrye-health-version>
+ <smallrye-fault-tolerance-version>6.1.0</smallrye-fault-tolerance-version>
<snakeyaml-version>1.33</snakeyaml-version>
<snakeyaml-engine-version>2.3</snakeyaml-engine-version>
<snmp4j-version>2.6.3_1</snmp4j-version>