diff --git a/integration-test-groups/http/http/pom.xml b/integration-test-groups/http/http/pom.xml index 262ce4ab1ce2..fdc17239100a 100644 --- a/integration-test-groups/http/http/pom.xml +++ b/integration-test-groups/http/http/pom.xml @@ -32,7 +32,7 @@ org.apache.camel.quarkus - camel-quarkus-integration-tests-http-common + camel-quarkus-integration-tests-support-http io.quarkus @@ -74,7 +74,7 @@ org.apache.camel.quarkus - camel-quarkus-integration-tests-http-common + camel-quarkus-integration-tests-support-http test-jar test diff --git a/integration-test-groups/http/netty-http/pom.xml b/integration-test-groups/http/netty-http/pom.xml index 4f9e91d97b65..4e082460e148 100644 --- a/integration-test-groups/http/netty-http/pom.xml +++ b/integration-test-groups/http/netty-http/pom.xml @@ -32,7 +32,7 @@ org.apache.camel.quarkus - camel-quarkus-integration-tests-http-common + camel-quarkus-integration-tests-support-http org.apache.camel.quarkus @@ -77,7 +77,7 @@ org.apache.camel.quarkus - camel-quarkus-integration-tests-http-common + camel-quarkus-integration-tests-support-http test-jar test diff --git a/integration-test-groups/http/pom.xml b/integration-test-groups/http/pom.xml index c523aa95322a..c8dfeb309727 100644 --- a/integration-test-groups/http/pom.xml +++ b/integration-test-groups/http/pom.xml @@ -31,7 +31,6 @@ - common http netty-http vertx-http diff --git a/integration-test-groups/http/vertx-http/pom.xml b/integration-test-groups/http/vertx-http/pom.xml index 5db96dab0eeb..4272f578c90c 100644 --- a/integration-test-groups/http/vertx-http/pom.xml +++ b/integration-test-groups/http/vertx-http/pom.xml @@ -32,7 +32,7 @@ org.apache.camel.quarkus - camel-quarkus-integration-tests-http-common + camel-quarkus-integration-tests-support-http org.apache.camel.quarkus @@ -65,7 +65,7 @@ org.apache.camel.quarkus - camel-quarkus-integration-tests-http-common + camel-quarkus-integration-tests-support-http test test-jar diff --git a/integration-test-groups/http/common/pom.xml b/integration-tests-support/http/pom.xml similarity index 76% rename from integration-test-groups/http/common/pom.xml rename to integration-tests-support/http/pom.xml index 26aed1b33733..5eed6d817db6 100644 --- a/integration-test-groups/http/common/pom.xml +++ b/integration-tests-support/http/pom.xml @@ -22,13 +22,13 @@ org.apache.camel.quarkus - camel-quarkus-build-parent-it + camel-quarkus-integration-tests-support 3.17.0-SNAPSHOT - ../../../poms/build-parent-it/pom.xml + ../pom.xml - camel-quarkus-integration-tests-http-common - Camel Quarkus :: Integration Tests :: HTTP :: Common + camel-quarkus-integration-tests-support-http + Camel Quarkus :: Integration Tests :: Support :: HTTP @@ -76,16 +76,40 @@ + + ${quarkus.platform.group-id} + quarkus-maven-plugin + ${quarkus.platform.version} + + + build + + + + org.apache.maven.plugins maven-surefire-plugin - - true - + + + default-test + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + - virtualDependencies diff --git a/integration-test-groups/http/common/src/main/java/org/apache/camel/quarkus/component/http/common/AbstractHttpResource.java b/integration-tests-support/http/src/main/java/org/apache/camel/quarkus/component/http/common/AbstractHttpResource.java similarity index 100% rename from integration-test-groups/http/common/src/main/java/org/apache/camel/quarkus/component/http/common/AbstractHttpResource.java rename to integration-tests-support/http/src/main/java/org/apache/camel/quarkus/component/http/common/AbstractHttpResource.java diff --git a/integration-test-groups/http/common/src/main/java/org/apache/camel/quarkus/component/http/common/CommonProducers.java b/integration-tests-support/http/src/main/java/org/apache/camel/quarkus/component/http/common/CommonProducers.java similarity index 100% rename from integration-test-groups/http/common/src/main/java/org/apache/camel/quarkus/component/http/common/CommonProducers.java rename to integration-tests-support/http/src/main/java/org/apache/camel/quarkus/component/http/common/CommonProducers.java diff --git a/integration-test-groups/http/common/src/main/java/org/apache/camel/quarkus/component/http/common/HttpService.java b/integration-tests-support/http/src/main/java/org/apache/camel/quarkus/component/http/common/HttpService.java similarity index 100% rename from integration-test-groups/http/common/src/main/java/org/apache/camel/quarkus/component/http/common/HttpService.java rename to integration-tests-support/http/src/main/java/org/apache/camel/quarkus/component/http/common/HttpService.java diff --git a/integration-test-groups/http/common/src/main/resources/application.properties b/integration-tests-support/http/src/main/resources/application.properties similarity index 100% rename from integration-test-groups/http/common/src/main/resources/application.properties rename to integration-tests-support/http/src/main/resources/application.properties diff --git a/integration-test-groups/http/common/src/test/java/org/apache/camel/quarkus/component/http/common/AbstractHttpTest.java b/integration-tests-support/http/src/test/java/org/apache/camel/quarkus/component/http/common/AbstractHttpTest.java similarity index 100% rename from integration-test-groups/http/common/src/test/java/org/apache/camel/quarkus/component/http/common/AbstractHttpTest.java rename to integration-tests-support/http/src/test/java/org/apache/camel/quarkus/component/http/common/AbstractHttpTest.java diff --git a/integration-test-groups/http/common/src/test/java/org/apache/camel/quarkus/component/http/common/HttpTestResource.java b/integration-tests-support/http/src/test/java/org/apache/camel/quarkus/component/http/common/HttpTestResource.java similarity index 100% rename from integration-test-groups/http/common/src/test/java/org/apache/camel/quarkus/component/http/common/HttpTestResource.java rename to integration-tests-support/http/src/test/java/org/apache/camel/quarkus/component/http/common/HttpTestResource.java diff --git a/integration-tests-support/pom.xml b/integration-tests-support/pom.xml index 5b5e5420bc3f..c33061a4a392 100644 --- a/integration-tests-support/pom.xml +++ b/integration-tests-support/pom.xml @@ -59,6 +59,7 @@ custom-kamelet-resource google grpc + http jdbc kafka messaging diff --git a/integration-tests/http-grouped/pom.xml b/integration-tests/http-grouped/pom.xml index 799ab436c43d..f48497c9d945 100644 --- a/integration-tests/http-grouped/pom.xml +++ b/integration-tests/http-grouped/pom.xml @@ -83,6 +83,10 @@ org.jboss.resteasy resteasy-multipart-provider + + org.apache.camel.quarkus + camel-quarkus-integration-tests-support-http + @@ -121,6 +125,12 @@ camel-quarkus-integration-tests-support-certificate-generator test + + org.apache.camel.quarkus + camel-quarkus-integration-tests-support-http + test + test-jar + diff --git a/poms/bom-test/pom.xml b/poms/bom-test/pom.xml index b44ebb23ba8a..96fdecef20bb 100644 --- a/poms/bom-test/pom.xml +++ b/poms/bom-test/pom.xml @@ -245,12 +245,12 @@ org.apache.camel.quarkus - camel-quarkus-integration-tests-http-common + camel-quarkus-integration-tests-support-http ${camel-quarkus.version} org.apache.camel.quarkus - camel-quarkus-integration-tests-http-common + camel-quarkus-integration-tests-support-http ${camel-quarkus.version} test-jar