Move integration-test-groups/http/common to integration-tests-support…

…/http
apache · Nov 29, 2024 · acfc1db · acfc1db
1 parent d43943f
commit acfc1db
Show file tree

Hide file tree

Showing 14 changed files with 51 additions and 17 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 → integration-tests-support/http/pom.xml b/integration-test-groups/http/common/pom.xml → 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/...ent/http/common/AbstractHttpResource.java → ...ent/http/common/AbstractHttpResource.java b/...ent/http/common/AbstractHttpResource.java → ...ent/http/common/AbstractHttpResource.java
diff --git a/...omponent/http/common/CommonProducers.java → ...omponent/http/common/CommonProducers.java b/...omponent/http/common/CommonProducers.java → ...omponent/http/common/CommonProducers.java
diff --git a/...us/component/http/common/HttpService.java → ...us/component/http/common/HttpService.java b/...us/component/http/common/HttpService.java → ...us/component/http/common/HttpService.java
diff --git a/...src/main/resources/application.properties → ...src/main/resources/application.properties b/...src/main/resources/application.properties → ...src/main/resources/application.properties
diff --git a/...mponent/http/common/AbstractHttpTest.java → ...mponent/http/common/AbstractHttpTest.java b/...mponent/http/common/AbstractHttpTest.java → ...mponent/http/common/AbstractHttpTest.java
diff --git a/...mponent/http/common/HttpTestResource.java → ...mponent/http/common/HttpTestResource.java b/...mponent/http/common/HttpTestResource.java → ...mponent/http/common/HttpTestResource.java
diff --git 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
@@ -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
@@ -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>