This is an automated email from the ASF dual-hosted git repository.
jamesnetherton 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 1fdb9846b4 Move mock-backend support classes into
camel-quarkus-integration-test-support
1fdb9846b4 is described below
commit 1fdb9846b43b5fc742b569b52d7b052be84b1434
Author: James Netherton <[email protected]>
AuthorDate: Tue Aug 13 10:08:24 2024 +0100
Move mock-backend support classes into
camel-quarkus-integration-test-support
Fixes #6338
---
.../azure/azure-storage-blob/pom.xml | 7 +---
integration-tests-support/aws2/pom.xml | 5 ---
integration-tests-support/azure/pom.xml | 2 +-
integration-tests-support/google/pom.xml | 2 +-
integration-tests-support/mock-backend/pom.xml | 42 ----------------------
integration-tests-support/pom.xml | 1 -
.../quarkus/test}/backend/MockBackendDisabled.java | 0
.../quarkus/test}/backend/MockBackendUtils.java | 0
integration-tests-support/wiremock/pom.xml | 4 ---
integration-tests/azure-grouped/pom.xml | 7 +---
integration-tests/google-storage/pom.xml | 13 +++----
poms/bom-test/pom.xml | 9 -----
12 files changed, 8 insertions(+), 84 deletions(-)
diff --git a/integration-test-groups/azure/azure-storage-blob/pom.xml
b/integration-test-groups/azure/azure-storage-blob/pom.xml
index 401619dd89..0ab9a72691 100644
--- a/integration-test-groups/azure/azure-storage-blob/pom.xml
+++ b/integration-test-groups/azure/azure-storage-blob/pom.xml
@@ -53,7 +53,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
-
<artifactId>camel-quarkus-integration-test-support-mock-backend</artifactId>
+ <artifactId>camel-quarkus-integration-test-support</artifactId>
</dependency>
<!-- test dependencies -->
@@ -72,11 +72,6 @@
<artifactId>awaitility</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-test-support</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-tests-support-azure</artifactId>
diff --git a/integration-tests-support/aws2/pom.xml
b/integration-tests-support/aws2/pom.xml
index ba036383ea..a8f337d445 100644
--- a/integration-tests-support/aws2/pom.xml
+++ b/integration-tests-support/aws2/pom.xml
@@ -73,11 +73,6 @@
<artifactId>camel-quarkus-integration-test-support</artifactId>
<!-- Dependency should be excluded when this module us used a
compile dependency and a test-jar dependency os also present.-->
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
-
<artifactId>camel-quarkus-integration-test-support-mock-backend</artifactId>
- <!-- Dependency should be excluded when this module us used a
compile dependency and a test-jar dependency os also present.-->
- </dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>localstack</artifactId>
diff --git a/integration-tests-support/azure/pom.xml
b/integration-tests-support/azure/pom.xml
index daf07f83ca..e4321a93c7 100644
--- a/integration-tests-support/azure/pom.xml
+++ b/integration-tests-support/azure/pom.xml
@@ -36,7 +36,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
-
<artifactId>camel-quarkus-integration-test-support-mock-backend</artifactId>
+ <artifactId>camel-quarkus-integration-test-support</artifactId>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
diff --git a/integration-tests-support/google/pom.xml
b/integration-tests-support/google/pom.xml
index 71780140b6..68c394a936 100644
--- a/integration-tests-support/google/pom.xml
+++ b/integration-tests-support/google/pom.xml
@@ -36,7 +36,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
-
<artifactId>camel-quarkus-integration-test-support-mock-backend</artifactId>
+ <artifactId>camel-quarkus-integration-test-support</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git a/integration-tests-support/mock-backend/pom.xml
b/integration-tests-support/mock-backend/pom.xml
deleted file mode 100644
index cc6f5ecd14..0000000000
--- a/integration-tests-support/mock-backend/pom.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <parent>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-tests-support</artifactId>
- <version>3.14.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
-
<artifactId>camel-quarkus-integration-test-support-mock-backend</artifactId>
- <name>Camel Quarkus :: Integration Tests :: Support :: Mock
Backend</name>
-
- <dependencies>
- <dependency>
- <groupId>org.eclipse.microprofile.config</groupId>
- <artifactId>microprofile-config-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git a/integration-tests-support/pom.xml
b/integration-tests-support/pom.xml
index af43a41e0c..30df45f5e3 100644
--- a/integration-tests-support/pom.xml
+++ b/integration-tests-support/pom.xml
@@ -65,7 +65,6 @@
<module>process-executor-support</module>
<module>splunk</module>
<module>test-support</module>
- <module>mock-backend</module>
<module>wiremock</module>
<module>xslt-support</module>
</modules>
diff --git
a/integration-tests-support/mock-backend/src/main/java/org/apache/camel/quarkus/test/mock/backend/MockBackendDisabled.java
b/integration-tests-support/test-support/src/main/java/org/apache/camel/quarkus/test/backend/MockBackendDisabled.java
similarity index 100%
rename from
integration-tests-support/mock-backend/src/main/java/org/apache/camel/quarkus/test/mock/backend/MockBackendDisabled.java
rename to
integration-tests-support/test-support/src/main/java/org/apache/camel/quarkus/test/backend/MockBackendDisabled.java
diff --git
a/integration-tests-support/mock-backend/src/main/java/org/apache/camel/quarkus/test/mock/backend/MockBackendUtils.java
b/integration-tests-support/test-support/src/main/java/org/apache/camel/quarkus/test/backend/MockBackendUtils.java
similarity index 100%
rename from
integration-tests-support/mock-backend/src/main/java/org/apache/camel/quarkus/test/mock/backend/MockBackendUtils.java
rename to
integration-tests-support/test-support/src/main/java/org/apache/camel/quarkus/test/backend/MockBackendUtils.java
diff --git a/integration-tests-support/wiremock/pom.xml
b/integration-tests-support/wiremock/pom.xml
index a357c50e9c..b9fede4a0a 100644
--- a/integration-tests-support/wiremock/pom.xml
+++ b/integration-tests-support/wiremock/pom.xml
@@ -34,10 +34,6 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-support</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
-
<artifactId>camel-quarkus-integration-test-support-mock-backend</artifactId>
- </dependency>
<dependency>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-standalone</artifactId>
diff --git a/integration-tests/azure-grouped/pom.xml
b/integration-tests/azure-grouped/pom.xml
index 58b94d33f0..405b2df73a 100644
--- a/integration-tests/azure-grouped/pom.xml
+++ b/integration-tests/azure-grouped/pom.xml
@@ -70,7 +70,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
-
<artifactId>camel-quarkus-integration-test-support-mock-backend</artifactId>
+ <artifactId>camel-quarkus-integration-test-support</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
@@ -90,11 +90,6 @@
<artifactId>rest-assured</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-test-support</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-tests-support-azure</artifactId>
diff --git a/integration-tests/google-storage/pom.xml
b/integration-tests/google-storage/pom.xml
index a5f86718d3..049728a1a4 100644
--- a/integration-tests/google-storage/pom.xml
+++ b/integration-tests/google-storage/pom.xml
@@ -47,6 +47,10 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-direct</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-integration-test-support</artifactId>
+ </dependency>
<!-- test dependencies -->
<dependency>
@@ -75,15 +79,6 @@
<artifactId>quarkus-junit4-mock</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
-
<artifactId>camel-quarkus-integration-test-support-mock-backend</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-test-support</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<profiles>
diff --git a/poms/bom-test/pom.xml b/poms/bom-test/pom.xml
index 7a7a048b19..840eb08507 100644
--- a/poms/bom-test/pom.xml
+++ b/poms/bom-test/pom.xml
@@ -109,10 +109,6 @@
<artifactId>camel-quarkus-integration-test-support</artifactId>
<groupId>org.apache.camel.quarkus</groupId>
</exclusion>
- <exclusion>
-
<artifactId>camel-quarkus-integration-test-support-mock-backend</artifactId>
- <groupId>org.apache.camel.quarkus</groupId>
- </exclusion>
<exclusion>
<artifactId>localstack</artifactId>
<groupId>org.testcontainers</groupId>
@@ -214,11 +210,6 @@
<artifactId>camel-quarkus-integration-test-support</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
-
<artifactId>camel-quarkus-integration-test-support-mock-backend</artifactId>
- <version>${camel-quarkus.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-tests-support-mongodb</artifactId>
