From 0a99db07d864f90271e33a7dc87063cd9ce490d4 Mon Sep 17 00:00:00 2001
From: Peter Palaga <ppalaga@redhat.com>
Date: Fri, 29 Nov 2024 21:46:59 +0100
Subject: [PATCH] Move integration-test-groups/http/common to
 integration-tests-support/http

---
 integration-test-groups/http/http/pom.xml     |  4 +-
 .../http/netty-http/pom.xml                   |  4 +-
 integration-test-groups/http/pom.xml          |  1 -
 .../http/vertx-http/pom.xml                   |  4 +-
 .../http}/pom.xml                             | 40 +++++++++++++++----
 .../http/common/AbstractHttpResource.java     |  0
 .../http/common/CommonProducers.java          |  0
 .../component/http/common/HttpService.java    |  0
 .../src/main/resources/application.properties |  0
 .../http/common/AbstractHttpTest.java         |  0
 .../http/common/HttpTestResource.java         |  0
 integration-tests-support/pom.xml             |  1 +
 integration-tests/http-grouped/pom.xml        | 10 +++++
 poms/bom-test/pom.xml                         |  4 +-
 14 files changed, 51 insertions(+), 17 deletions(-)
 rename {integration-test-groups/http/common => integration-tests-support/http}/pom.xml (76%)
 rename {integration-test-groups/http/common => integration-tests-support/http}/src/main/java/org/apache/camel/quarkus/component/http/common/AbstractHttpResource.java (100%)
 rename {integration-test-groups/http/common => integration-tests-support/http}/src/main/java/org/apache/camel/quarkus/component/http/common/CommonProducers.java (100%)
 rename {integration-test-groups/http/common => integration-tests-support/http}/src/main/java/org/apache/camel/quarkus/component/http/common/HttpService.java (100%)
 rename {integration-test-groups/http/common => integration-tests-support/http}/src/main/resources/application.properties (100%)
 rename {integration-test-groups/http/common => integration-tests-support/http}/src/test/java/org/apache/camel/quarkus/component/http/common/AbstractHttpTest.java (100%)
 rename {integration-test-groups/http/common => integration-tests-support/http}/src/test/java/org/apache/camel/quarkus/component/http/common/HttpTestResource.java (100%)

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 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-integration-tests-http-common</artifactId>
+            <artifactId>camel-quarkus-integration-tests-support-http</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -74,7 +74,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-integration-tests-http-common</artifactId>
+            <artifactId>camel-quarkus-integration-tests-support-http</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
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 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-integration-tests-http-common</artifactId>
+            <artifactId>camel-quarkus-integration-tests-support-http</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
@@ -77,7 +77,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-integration-tests-http-common</artifactId>
+            <artifactId>camel-quarkus-integration-tests-support-http</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
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 @@
 
     <modules>
         <!-- extensions a..z; do not remove this comment, it is important when sorting via  mvn process-resources -Pformat -->
-        <module>common</module>
         <module>http</module>
         <module>netty-http</module>
         <module>vertx-http</module>
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 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-integration-tests-http-common</artifactId>
+            <artifactId>camel-quarkus-integration-tests-support-http</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
@@ -65,7 +65,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-integration-tests-http-common</artifactId>
+            <artifactId>camel-quarkus-integration-tests-support-http</artifactId>
             <scope>test</scope>
             <type>test-jar</type>
         </dependency>
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 @@
 
     <parent>
         <groupId>org.apache.camel.quarkus</groupId>
-        <artifactId>camel-quarkus-build-parent-it</artifactId>
+        <artifactId>camel-quarkus-integration-tests-support</artifactId>
         <version>3.17.0-SNAPSHOT</version>
-        <relativePath>../../../poms/build-parent-it/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>camel-quarkus-integration-tests-http-common</artifactId>
-    <name>Camel Quarkus :: Integration Tests :: HTTP :: Common</name>
+    <artifactId>camel-quarkus-integration-tests-support-http</artifactId>
+    <name>Camel Quarkus :: Integration Tests :: Support :: HTTP</name>
 
     <dependencies>
         <dependency>
@@ -76,16 +76,40 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>${quarkus.platform.group-id}</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <version>${quarkus.platform.version}</version>
+                <executions>
+                    <execution>
+                        <id>build</id>
+                        <phase />
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <skipTests>true</skipTests>
-                </configuration>
+                <executions>
+                    <execution>
+                        <id>default-test</id>
+                        <phase />
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
-
     <profiles>
         <profile>
             <id>virtualDependencies</id>
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 @@
         <module>custom-kamelet-resource</module>
         <module>google</module>
         <module>grpc</module>
+        <module>http</module>
         <module>jdbc</module>
         <module>kafka</module>
         <module>messaging</module>
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 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.camel.quarkus</groupId>
+            <artifactId>camel-quarkus-integration-tests-support-http</artifactId>
+        </dependency>
 
         <!-- test dependencies -->
         <dependency>
@@ -121,6 +125,12 @@
             <artifactId>camel-quarkus-integration-tests-support-certificate-generator</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.camel.quarkus</groupId>
+            <artifactId>camel-quarkus-integration-tests-support-http</artifactId>
+            <scope>test</scope>
+            <type>test-jar</type>
+        </dependency>
     </dependencies>
 
     <build>
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 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.camel.quarkus</groupId>
-                <artifactId>camel-quarkus-integration-tests-http-common</artifactId>
+                <artifactId>camel-quarkus-integration-tests-support-http</artifactId>
                 <version>${camel-quarkus.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.camel.quarkus</groupId>
-                <artifactId>camel-quarkus-integration-tests-http-common</artifactId>
+                <artifactId>camel-quarkus-integration-tests-support-http</artifactId>
                 <version>${camel-quarkus.version}</version>
                 <type>test-jar</type>
             </dependency>