You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2024/05/01 09:35:45 UTC
(camel-quarkus) 02/02: Revert "Disable microprofile-fault-tolerance testing due to #5995"
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit a74a7dabcc2a335b84ee626c701a633e5631a4f9
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Apr 17 12:57:18 2024 +0100
Revert "Disable microprofile-fault-tolerance testing due to #5995"
This reverts commit 17a559652d5eca26974e6d89f8af567c5e85a16f.
---
.../foundation/core-fault-tolerance/pom.xml | 2 --
.../faulttolerance/it/CoreFaultToleranceIT.java | 2 --
.../faulttolerance/it/CoreFaultToleranceTest.java | 2 --
integration-tests/foundation-grouped/pom.xml | 17 ++++++---
integration-tests/microprofile/pom.xml | 40 +++++++---------------
.../MicroprofileFaultToleranceIT.java | 2 --
.../MicroprofileFaultToleranceTest.java | 2 --
pom.xml | 2 --
8 files changed, 26 insertions(+), 43 deletions(-)
diff --git a/integration-test-groups/foundation/core-fault-tolerance/pom.xml b/integration-test-groups/foundation/core-fault-tolerance/pom.xml
index fbdc601265..2e116bcd35 100644
--- a/integration-test-groups/foundation/core-fault-tolerance/pom.xml
+++ b/integration-test-groups/foundation/core-fault-tolerance/pom.xml
@@ -59,7 +59,6 @@
</dependencies>
<profiles>
- <!-- TODO: https://github.com/apache/camel-quarkus/issues/5995
<profile>
<id>native</id>
<activation>
@@ -87,7 +86,6 @@
</plugins>
</build>
</profile>
- -->
<profile>
<id>virtualDependencies</id>
<activation>
diff --git a/integration-test-groups/foundation/core-fault-tolerance/src/test/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceIT.java b/integration-test-groups/foundation/core-fault-tolerance/src/test/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceIT.java
index a05c81faf2..76f553a17b 100644
--- a/integration-test-groups/foundation/core-fault-tolerance/src/test/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceIT.java
+++ b/integration-test-groups/foundation/core-fault-tolerance/src/test/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceIT.java
@@ -17,9 +17,7 @@
package org.apache.camel.quarkus.core.faulttolerance.it;
import io.quarkus.test.junit.QuarkusIntegrationTest;
-import org.junit.jupiter.api.Disabled;
-@Disabled("https://github.com/apache/camel-quarkus/issues/5995")
@QuarkusIntegrationTest
public class CoreFaultToleranceIT extends CoreFaultToleranceTest {
}
diff --git a/integration-test-groups/foundation/core-fault-tolerance/src/test/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceTest.java b/integration-test-groups/foundation/core-fault-tolerance/src/test/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceTest.java
index 6ccdcf4364..6aaa60aaf1 100644
--- a/integration-test-groups/foundation/core-fault-tolerance/src/test/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceTest.java
+++ b/integration-test-groups/foundation/core-fault-tolerance/src/test/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceTest.java
@@ -17,13 +17,11 @@
package org.apache.camel.quarkus.core.faulttolerance.it;
import io.quarkus.test.junit.QuarkusTest;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static io.restassured.RestAssured.get;
import static org.hamcrest.Matchers.is;
-@Disabled("https://github.com/apache/camel-quarkus/issues/5995")
@QuarkusTest
public class CoreFaultToleranceTest {
diff --git a/integration-tests/foundation-grouped/pom.xml b/integration-tests/foundation-grouped/pom.xml
index 01e5bf6155..f4c7cecd45 100644
--- a/integration-tests/foundation-grouped/pom.xml
+++ b/integration-tests/foundation-grouped/pom.xml
@@ -112,12 +112,10 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-log</artifactId>
</dependency>
- <!-- TODO: https://github.com/apache/camel-quarkus/issues/5995
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-microprofile-fault-tolerance</artifactId>
</dependency>
- -->
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-mock</artifactId>
@@ -214,8 +212,6 @@
<group-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/foundation</group-tests.source.dir>
<group-tests.dest.module.dir>${project.basedir}</group-tests.dest.module.dir>
<group-tests.concat.rel.paths>src/main/resources/application.properties</group-tests.concat.rel.paths>
- <!-- TODO: https://github.com/apache/camel-quarkus/issues/5995 -->
- <group-tests.files.excludes>core-fault-tolerance</group-tests.files.excludes>
</properties>
</configuration>
</execution>
@@ -456,6 +452,19 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-microprofile-fault-tolerance-deployment</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-mock-deployment</artifactId>
diff --git a/integration-tests/microprofile/pom.xml b/integration-tests/microprofile/pom.xml
index 71e7e6cf28..a6bc9c5ea8 100644
--- a/integration-tests/microprofile/pom.xml
+++ b/integration-tests/microprofile/pom.xml
@@ -43,12 +43,10 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-log</artifactId>
</dependency>
- <!-- TODO: https://github.com/apache/camel-quarkus/issues/5995
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-microprofile-fault-tolerance</artifactId>
</dependency>
- -->
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-microprofile-health</artifactId>
@@ -80,31 +78,6 @@
</dependency>
</dependencies>
- <!-- TODO: https://github.com/apache/camel-quarkus/issues/5995 -->
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>org/apache/camel/quarkus/component/microprofile/it/faulttolerance/**</exclude>
- </excludes>
- <testExcludes>
- <exclude>org/apache/camel/quarkus/component/microprofile/it/faulttolerance/**</exclude>
- </testExcludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <excludePackageNames>org.apache.camel.quarkus.component.microprofile.it.faulttolerance</excludePackageNames>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<profiles>
<profile>
<id>native</id>
@@ -181,6 +154,19 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-microprofile-fault-tolerance-deployment</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-microprofile-health-deployment</artifactId>
diff --git a/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/faulttolerance/MicroprofileFaultToleranceIT.java b/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/faulttolerance/MicroprofileFaultToleranceIT.java
index aae58346ea..1362ada770 100644
--- a/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/faulttolerance/MicroprofileFaultToleranceIT.java
+++ b/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/faulttolerance/MicroprofileFaultToleranceIT.java
@@ -17,9 +17,7 @@
package org.apache.camel.quarkus.component.microprofile.it.faulttolerance;
import io.quarkus.test.junit.QuarkusIntegrationTest;
-import org.junit.jupiter.api.Disabled;
-@Disabled("https://github.com/apache/camel-quarkus/issues/5995")
@QuarkusIntegrationTest
class MicroprofileFaultToleranceIT extends MicroprofileFaultToleranceTest {
diff --git a/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/faulttolerance/MicroprofileFaultToleranceTest.java b/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/faulttolerance/MicroprofileFaultToleranceTest.java
index 842a2801ba..4d5378c12a 100644
--- a/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/faulttolerance/MicroprofileFaultToleranceTest.java
+++ b/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/faulttolerance/MicroprofileFaultToleranceTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.quarkus.component.microprofile.it.faulttolerance;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
@@ -27,7 +26,6 @@ import org.junit.jupiter.params.provider.ValueSource;
import static org.apache.camel.quarkus.component.microprofile.it.faulttolerance.MicroProfileFaultToleranceRoutes.EXCEPTION_MESSAGE;
import static org.hamcrest.Matchers.is;
-@Disabled("https://github.com/apache/camel-quarkus/issues/5995")
@QuarkusTest
class MicroprofileFaultToleranceTest {
diff --git a/pom.xml b/pom.xml
index 511f89bc11..c6708836bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -974,7 +974,6 @@
</sourcePoms>
<destinationPom>${basedir}/integration-tests/compression-grouped/pom.xml</destinationPom>
</mergePom>
- <!-- TODO: https://github.com/apache/camel-quarkus/issues/5995
<mergePom>
<sourcePoms>
<directory>${basedir}/integration-test-groups/foundation</directory>
@@ -984,7 +983,6 @@
</sourcePoms>
<destinationPom>${basedir}/integration-tests/foundation-grouped/pom.xml</destinationPom>
</mergePom>
- -->
<mergePom>
<sourcePoms>
<directory>${basedir}/integration-test-groups/mongodb</directory>