Move integration-tests/messaging to integration-tests-support/messaging

apache · Nov 29, 2024 · d43943f · d43943f
1 parent 7f03434
commit d43943f
Show file tree

Hide file tree

Showing 38 changed files with 77 additions and 101 deletions.
diff --git a/integration-tests/messaging/README.adoc → ...ation-tests-support/messaging/README.adoc b/integration-tests/messaging/README.adoc → ...ation-tests-support/messaging/README.adoc
diff --git a/integration-tests/messaging/common/pom.xml → ...on-tests-support/messaging/common/pom.xml b/integration-tests/messaging/common/pom.xml → ...on-tests-support/messaging/common/pom.xml
@@ -21,12 +21,13 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.camel.quarkus</groupId>
-        <artifactId>camel-quarkus-integration-test-messaging</artifactId>
+        <artifactId>camel-quarkus-integration-tests-support-messaging</artifactId>
         <version>3.17.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>camel-quarkus-integration-test-messaging-common</artifactId>
-    <name>Camel Quarkus :: Integration Tests :: Messaging Common</name>
+    <artifactId>camel-quarkus-integration-tests-support-messaging-common</artifactId>
+    <name>Camel Quarkus :: Integration Tests :: Support :: Messaging :: Common</name>
     <description>Integration tests for Camel Quarkus Messaging Common</description>
 
     <dependencies>
@@ -76,22 +77,6 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.jboss.jandex</groupId>
-                <artifactId>jandex-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>make-index</id>
-                        <goals>
-                            <goal>jandex</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
     <profiles>
         <profile>
             <id>virtualDependencies</id>

diff --git a/...messaging/it/MessagingCommonResource.java → ...messaging/it/MessagingCommonResource.java b/...messaging/it/MessagingCommonResource.java → ...messaging/it/MessagingCommonResource.java
diff --git a/...t/messaging/it/MessagingCommonRoutes.java → ...t/messaging/it/MessagingCommonRoutes.java b/...t/messaging/it/MessagingCommonRoutes.java → ...t/messaging/it/MessagingCommonRoutes.java
diff --git a/...t/messaging/it/MessagingPojoConsumer.java → ...t/messaging/it/MessagingPojoConsumer.java b/...t/messaging/it/MessagingPojoConsumer.java → ...t/messaging/it/MessagingPojoConsumer.java
diff --git a/...uarkus/component/messaging/it/Person.java → ...uarkus/component/messaging/it/Person.java b/...uarkus/component/messaging/it/Person.java → ...uarkus/component/messaging/it/Person.java
diff --git a/.../it/util/resolver/JmsMessageResolver.java → .../it/util/resolver/JmsMessageResolver.java b/.../it/util/resolver/JmsMessageResolver.java → .../it/util/resolver/JmsMessageResolver.java
diff --git a/.../resolver/JmsMessageResolverProducer.java → .../resolver/JmsMessageResolverProducer.java b/.../resolver/JmsMessageResolverProducer.java → .../resolver/JmsMessageResolverProducer.java
diff --git a/...aging/it/util/scheme/ComponentScheme.java → ...aging/it/util/scheme/ComponentScheme.java b/...aging/it/util/scheme/ComponentScheme.java → ...aging/it/util/scheme/ComponentScheme.java
diff --git a/...eme/MessagingComponentSchemeProducer.java → ...eme/MessagingComponentSchemeProducer.java b/...eme/MessagingComponentSchemeProducer.java → ...eme/MessagingComponentSchemeProducer.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/...t/messaging/it/AbstractMessagingTest.java → ...t/messaging/it/AbstractMessagingTest.java b/...t/messaging/it/AbstractMessagingTest.java → ...t/messaging/it/AbstractMessagingTest.java
diff --git a/integration-tests/messaging/jms/pom.xml → ...ation-tests-support/messaging/jms/pom.xml b/integration-tests/messaging/jms/pom.xml → ...ation-tests-support/messaging/jms/pom.xml
@@ -21,12 +21,13 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.camel.quarkus</groupId>
-        <artifactId>camel-quarkus-integration-test-messaging</artifactId>
+        <artifactId>camel-quarkus-integration-tests-support-messaging</artifactId>
         <version>3.17.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>camel-quarkus-integration-test-messaging-jms</artifactId>
-    <name>Camel Quarkus :: Integration Tests :: Messaging JMS</name>
+    <artifactId>camel-quarkus-integration-tests-support-messaging-jms</artifactId>
+    <name>Camel Quarkus :: Integration Tests :: Support :: Messaging :: JMS</name>
     <description>Integration tests for Camel Quarkus Messaging JMS</description>
 
     <dependencies>
@@ -44,7 +45,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-integration-test-messaging-common</artifactId>
+            <artifactId>camel-quarkus-integration-tests-support-messaging-common</artifactId>
         </dependency>
 
         <!-- test dependencies -->
@@ -60,29 +61,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-integration-test-messaging-common</artifactId>
+            <artifactId>camel-quarkus-integration-tests-support-messaging-common</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.jboss.jandex</groupId>
-                <artifactId>jandex-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>make-index</id>
-                        <goals>
-                            <goal>jandex</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
     <profiles>
         <profile>
             <id>virtualDependencies</id>

diff --git a/...uarkus/messaging/jms/DummyXAResource.java → ...uarkus/messaging/jms/DummyXAResource.java b/...uarkus/messaging/jms/DummyXAResource.java → ...uarkus/messaging/jms/DummyXAResource.java
diff --git a/...l/quarkus/messaging/jms/JmsProducers.java → ...l/quarkus/messaging/jms/JmsProducers.java b/...l/quarkus/messaging/jms/JmsProducers.java → ...l/quarkus/messaging/jms/JmsProducers.java
diff --git a/...el/quarkus/messaging/jms/JmsResource.java → ...el/quarkus/messaging/jms/JmsResource.java b/...el/quarkus/messaging/jms/JmsResource.java → ...el/quarkus/messaging/jms/JmsResource.java
diff --git a/...amel/quarkus/messaging/jms/JmsRoutes.java → ...amel/quarkus/messaging/jms/JmsRoutes.java b/...amel/quarkus/messaging/jms/JmsRoutes.java → ...amel/quarkus/messaging/jms/JmsRoutes.java
diff --git a/.../jms/util/JmsMessageResolverProducer.java → .../jms/util/JmsMessageResolverProducer.java b/.../jms/util/JmsMessageResolverProducer.java → .../jms/util/JmsMessageResolverProducer.java
diff --git a/...ssaging/jms/AbstractJmsMessagingTest.java → ...ssaging/jms/AbstractJmsMessagingTest.java b/...ssaging/jms/AbstractJmsMessagingTest.java → ...ssaging/jms/AbstractJmsMessagingTest.java
diff --git a/integration-tests/messaging/pom.xml → integration-tests-support/messaging/pom.xml b/integration-tests/messaging/pom.xml → integration-tests-support/messaging/pom.xml
@@ -21,13 +21,13 @@
     <modelVersion>4.0.0</modelVersion>
     <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-test-messaging</artifactId>
-    <name>Camel Quarkus :: Integration Tests :: Messaging</name>
+    <artifactId>camel-quarkus-integration-tests-support-messaging</artifactId>
+    <name>Camel Quarkus :: Integration Tests :: Support :: Messaging</name>
     <description>Integration tests for Camel Quarkus Messaging extensions</description>
     <packaging>pom</packaging>
 
@@ -39,6 +39,18 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.jboss.jandex</groupId>
+                <artifactId>jandex-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>make-index</id>
+                        <goals>
+                            <goal>jandex</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>${quarkus.platform.group-id}</groupId>
                 <artifactId>quarkus-maven-plugin</artifactId>
@@ -60,6 +72,17 @@
                     </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>
 

diff --git a/integration-tests/messaging/sjms/pom.xml → ...tion-tests-support/messaging/sjms/pom.xml b/integration-tests/messaging/sjms/pom.xml → ...tion-tests-support/messaging/sjms/pom.xml
@@ -21,12 +21,13 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.camel.quarkus</groupId>
-        <artifactId>camel-quarkus-integration-test-messaging</artifactId>
+        <artifactId>camel-quarkus-integration-tests-support-messaging</artifactId>
         <version>3.17.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>camel-quarkus-integration-test-messaging-sjms</artifactId>
-    <name>Camel Quarkus :: Integration Tests :: Messaging SJMS</name>
+    <artifactId>camel-quarkus-integration-tests-support-messaging-sjms</artifactId>
+    <name>Camel Quarkus :: Integration Tests :: Support :: Messaging :: SJMS</name>
     <description>Integration tests for Camel Quarkus Messaging SJMS</description>
 
     <dependencies>
@@ -44,7 +45,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-integration-test-messaging-common</artifactId>
+            <artifactId>camel-quarkus-integration-tests-support-messaging-common</artifactId>
         </dependency>
 
         <!-- test dependencies -->
@@ -60,29 +61,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-integration-test-messaging-common</artifactId>
+            <artifactId>camel-quarkus-integration-tests-support-messaging-common</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.jboss.jandex</groupId>
-                <artifactId>jandex-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>make-index</id>
-                        <goals>
-                            <goal>jandex</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
     <profiles>
         <profile>
             <id>virtualDependencies</id>

diff --git a/...quarkus/messaging/sjms/SjmsProducers.java → ...quarkus/messaging/sjms/SjmsProducers.java b/...quarkus/messaging/sjms/SjmsProducers.java → ...quarkus/messaging/sjms/SjmsProducers.java
diff --git a/.../quarkus/messaging/sjms/SjmsResource.java → .../quarkus/messaging/sjms/SjmsResource.java b/.../quarkus/messaging/sjms/SjmsResource.java → .../quarkus/messaging/sjms/SjmsResource.java
diff --git a/...el/quarkus/messaging/sjms/SjmsRoutes.java → ...el/quarkus/messaging/sjms/SjmsRoutes.java b/...el/quarkus/messaging/sjms/SjmsRoutes.java → ...el/quarkus/messaging/sjms/SjmsRoutes.java
diff --git a/...sjms/util/JmsMessageResolverProducer.java → ...sjms/util/JmsMessageResolverProducer.java b/...sjms/util/JmsMessageResolverProducer.java → ...sjms/util/JmsMessageResolverProducer.java
diff --git a/...aging/sjms/AbstractSjmsMessagingTest.java → ...aging/sjms/AbstractSjmsMessagingTest.java b/...aging/sjms/AbstractSjmsMessagingTest.java → ...aging/sjms/AbstractSjmsMessagingTest.java
diff --git a/integration-tests-support/pom.xml b/integration-tests-support/pom.xml
@@ -61,6 +61,7 @@
         <module>grpc</module>
         <module>jdbc</module>
         <module>kafka</module>
+        <module>messaging</module>
         <module>mongodb</module>
         <module>process-executor-support</module>
         <module>splunk</module>

diff --git a/integration-tests/activemq/pom.xml b/integration-tests/activemq/pom.xml
@@ -40,7 +40,7 @@
         <!-- Inherit base messaging routes -->
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-integration-test-messaging-jms</artifactId>
+            <artifactId>camel-quarkus-integration-tests-support-messaging-jms</artifactId>
         </dependency>
 
         <!-- test dependencies -->
@@ -74,13 +74,13 @@
         <!-- Inherit base messaging tests -->
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-integration-test-messaging-common</artifactId>
+            <artifactId>camel-quarkus-integration-tests-support-messaging-common</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-integration-test-messaging-jms</artifactId>
+            <artifactId>camel-quarkus-integration-tests-support-messaging-jms</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>

diff --git a/integration-tests/amqp/pom.xml b/integration-tests/amqp/pom.xml
@@ -39,7 +39,7 @@
         <!-- Inherit base messaging routes -->
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-integration-test-messaging-jms</artifactId>
+            <artifactId>camel-quarkus-integration-tests-support-messaging-jms</artifactId>
         </dependency>
 
         <!-- Messaging Pooled JMS -->
@@ -68,13 +68,13 @@
         <!-- Inherit base messaging tests -->
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-integration-test-messaging-common</artifactId>
+            <artifactId>camel-quarkus-integration-tests-support-messaging-common</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-integration-test-messaging-jms</artifactId>
+            <artifactId>camel-quarkus-integration-tests-support-messaging-jms</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>

diff --git a/integration-tests/jms-artemis-client/pom.xml b/integration-tests/jms-artemis-client/pom.xml
@@ -40,7 +40,7 @@
         <!-- Inherit base messaging routes -->
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-integration-test-messaging-jms</artifactId>
+            <artifactId>camel-quarkus-integration-tests-support-messaging-jms</artifactId>
         </dependency>
 
         <!-- The JMS client library to test with -->
@@ -80,13 +80,13 @@
         <!-- Inherit base messaging tests -->
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-integration-test-messaging-common</artifactId>
+            <artifactId>camel-quarkus-integration-tests-support-messaging-common</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-integration-test-messaging-jms</artifactId>
+            <artifactId>camel-quarkus-integration-tests-support-messaging-jms</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>

diff --git a/integration-tests/jms-ibmmq-client/pom.xml b/integration-tests/jms-ibmmq-client/pom.xml
@@ -55,7 +55,7 @@
         <!-- Inherit base messaging routes -->
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-integration-test-messaging-jms</artifactId>
+            <artifactId>camel-quarkus-integration-tests-support-messaging-jms</artifactId>
         </dependency>
 
         <!-- The JMS client library to test with -->
@@ -96,13 +96,13 @@
         <!-- Inherit base messaging tests -->
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-integration-test-messaging-common</artifactId>
+            <artifactId>camel-quarkus-integration-tests-support-messaging-common</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-integration-test-messaging-jms</artifactId>
+            <artifactId>camel-quarkus-integration-tests-support-messaging-jms</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>

diff --git a/integration-tests/jms-qpid-amqp-client/pom.xml b/integration-tests/jms-qpid-amqp-client/pom.xml
@@ -46,7 +46,7 @@
         <!-- Inherit base messaging routes -->
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-integration-test-messaging-jms</artifactId>
+            <artifactId>camel-quarkus-integration-tests-support-messaging-jms</artifactId>
         </dependency>
 
         <!-- The JMS client library to test with -->
@@ -80,13 +80,13 @@
         <!-- Inherit base messaging tests -->
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-integration-test-messaging-common</artifactId>
+            <artifactId>camel-quarkus-integration-tests-support-messaging-common</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-integration-test-messaging-jms</artifactId>
+            <artifactId>camel-quarkus-integration-tests-support-messaging-jms</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -164,7 +164,6 @@
         <module>master</module>
         <module>master-file</module>
         <module>master-openshift</module>
-        <module>messaging</module>
         <module>micrometer</module>
         <module>microprofile-fault-tolerance</module>
         <module>microprofile-health</module>

diff --git a/integration-tests/sjms-artemis-client/pom.xml b/integration-tests/sjms-artemis-client/pom.xml
@@ -40,7 +40,7 @@
         <!-- Inherit base messaging routes -->
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-integration-test-messaging-sjms</artifactId>
+            <artifactId>camel-quarkus-integration-tests-support-messaging-sjms</artifactId>
         </dependency>
 
         <!-- The JMS client library to test with -->
@@ -64,13 +64,13 @@
         <!-- Inherit base messaging tests -->
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-integration-test-messaging-common</artifactId>
+            <artifactId>camel-quarkus-integration-tests-support-messaging-common</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-integration-test-messaging-sjms</artifactId>
+            <artifactId>camel-quarkus-integration-tests-support-messaging-sjms</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>

diff --git a/integration-tests/sjms-qpid-amqp-client/pom.xml b/integration-tests/sjms-qpid-amqp-client/pom.xml
@@ -40,7 +40,7 @@
         <!-- Inherit base messaging routes -->
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-integration-test-messaging-sjms</artifactId>
+            <artifactId>camel-quarkus-integration-tests-support-messaging-sjms</artifactId>
         </dependency>
 
         <!-- The JMS client library to test with -->
@@ -79,13 +79,13 @@
         <!-- Inherit base messaging tests -->
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-integration-test-messaging-common</artifactId>
+            <artifactId>camel-quarkus-integration-tests-support-messaging-common</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-integration-test-messaging-sjms</artifactId>
+            <artifactId>camel-quarkus-integration-tests-support-messaging-sjms</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>