[CONVERSION COMMIT] Use EAP in tests

jbossas · Dec 17, 2024 · a1b880b · a1b880b
1 parent 82c21d9
commit a1b880b
Show file tree

Hide file tree

Showing 17 changed files with 185 additions and 16 deletions.
diff --git a/pom.xml b/pom.xml
@@ -122,6 +122,11 @@
         <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
         <release.short.version>5.1</release.short.version>
         <docs.directory>${project.basedir}/../docs/releases/${release.short.version}</docs.directory>
+
+        <!-- test properties for product -->
+        <wildfly.test.server.producer>org.jboss.eap:wildfly-ee-galleon-pack</wildfly.test.server.producer>
+        <wildfly.channel.groupId>org.jboss.eap.channels</wildfly.channel.groupId>
+        <wildfly.channel.artifactId>eap-8.0</wildfly.channel.artifactId>
     </properties>
 
     <modules>
@@ -137,6 +142,11 @@
             <name>JBoss Public Repository Group</name>
             <url>https://repository.jboss.org/nexus/content/groups/public/</url>
         </repository>
+        <repository>
+            <id>jboss-enterprise-maven-repository</id>
+            <name>JBoss Enterprise Maven Repository</name>
+            <url>https://maven.repository.redhat.com/ga/</url>
+        </repository>
     </repositories>
 
     <build>

diff --git a/tests/bootable-tests/pom.xml b/tests/bootable-tests/pom.xml
@@ -72,6 +72,11 @@
             <artifactId>maven-resolver-util</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.wildfly.channel</groupId>
+            <artifactId>channel-core</artifactId>
+            <scope>test</scope>
+        </dependency>
         <!-- to fix slf4j warning when provisioning -->
         <dependency>
             <groupId>org.jboss.slf4j</groupId>

diff --git a/tests/bootable-tests/src/test/resources/test-project/package-bootable-pom.xml b/tests/bootable-tests/src/test/resources/test-project/package-bootable-pom.xml
@@ -30,9 +30,17 @@
                 <groupId>org.jboss.eap.plugins</groupId>
                 <artifactId>eap-maven-plugin</artifactId>
                 <configuration>
+                    <channels>
+                        <channel>
+                            <manifest>
+                                <groupId>CHANNEL_GROUP_ID</groupId>
+                                <artifactId>CHANNEL_ARTIFACT_ID</artifactId>
+                            </manifest>
+                        </channel>
+                    </channels>
                     <feature-packs>
                         <feature-pack>
-                            <location>wildfly@maven(org.jboss.universe:community-universe)#WF_VERSION</location>
+                            <location>SERVER_PRODUCER</location>
                         </feature-pack>
                     </feature-packs>
                     <layers>

diff --git a/tests/bootable-tests/src/test/resources/test-project/package-bootable-root-pom.xml b/tests/bootable-tests/src/test/resources/test-project/package-bootable-root-pom.xml
@@ -30,9 +30,17 @@
                 <groupId>org.jboss.eap.plugins</groupId>
                 <artifactId>eap-maven-plugin</artifactId>
                 <configuration>
+                    <channels>
+                        <channel>
+                            <manifest>
+                                <groupId>CHANNEL_GROUP_ID</groupId>
+                                <artifactId>CHANNEL_ARTIFACT_ID</artifactId>
+                            </manifest>
+                        </channel>
+                    </channels>
                     <feature-packs>
                         <feature-pack>
-                            <location>wildfly@maven(org.jboss.universe:community-universe)#WF_VERSION</location>
+                            <location>SERVER_PRODUCER</location>
                         </feature-pack>
                     </feature-packs>
                     <layers>

diff --git a/tests/domain-tests/pom.xml b/tests/domain-tests/pom.xml
@@ -31,6 +31,47 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.maven.resolver</groupId>
+            <artifactId>maven-resolver-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.resolver</groupId>
+            <artifactId>maven-resolver-spi</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.resolver</groupId>
+            <artifactId>maven-resolver-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.resolver</groupId>
+            <artifactId>maven-resolver-connector-basic</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.resolver</groupId>
+            <artifactId>maven-resolver-transport-wagon</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <!-- Only required by tests -->
+        <dependency>
+            <groupId>org.apache.maven.wagon</groupId>
+            <artifactId>wagon-http</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.resolver</groupId>
+            <artifactId>maven-resolver-util</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wildfly.channel</groupId>
+            <artifactId>channel-core</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/tests/domain-tests/src/test/resources/test-project/provision-pom.xml b/tests/domain-tests/src/test/resources/test-project/provision-pom.xml
@@ -16,9 +16,17 @@
                 <groupId>org.jboss.eap.plugins</groupId>
                 <artifactId>eap-maven-plugin</artifactId>
                 <configuration>
+                    <channels>
+                        <channel>
+                            <manifest>
+                                <groupId>CHANNEL_GROUP_ID</groupId>
+                                <artifactId>CHANNEL_ARTIFACT_ID</artifactId>
+                            </manifest>
+                        </channel>
+                    </channels>
                     <feature-packs>
                         <feature-pack>
-                            <location>wildfly@maven(org.jboss.universe:community-universe)#WF_VERSION</location>
+                            <location>SERVER_PRODUCER</location>
                             <inherit-configs>true</inherit-configs>
                             <inherit-packages>true</inherit-packages>
                         </feature-pack>

diff --git a/tests/pom.xml b/tests/pom.xml
@@ -44,9 +44,17 @@
                             <goal>package</goal>
                         </goals>
                         <configuration>
+                            <channels>
+                                <channel>
+                                    <manifest>
+                                        <groupId>${wildfly.channel.groupId}</groupId>
+                                        <artifactId>${wildfly.channel.artifactId}</artifactId>
+                                    </manifest>
+                                </channel>
+                            </channels>
                             <feature-packs>
                                 <feature-pack>
-                                    <location>wildfly@maven(org.jboss.universe:community-universe)#${version.org.wildfly}</location>
+                                    <location>${wildfly.test.server.producer}</location>
                                 </feature-pack>
                             </feature-packs>
                             <provisioning-dir>${project.build.directory}/wildfly</provisioning-dir>
@@ -65,6 +73,9 @@
                         <jboss.home>${jboss.home}</jboss.home>
                         <jboss-as.home>${jboss.home}</jboss-as.home>
                         <wildfly.test.version>${version.org.wildfly}</wildfly.test.version>
+                        <wildfly.test.server.producer>${wildfly.test.server.producer}</wildfly.test.server.producer>
+                        <wildfly.test.channel.groupId>${wildfly.channel.groupId}</wildfly.test.channel.groupId>
+                        <wildfly.test.channel.artifactId>${wildfly.channel.artifactId}</wildfly.test.channel.artifactId>
                         <wildfly.management.port>10099</wildfly.management.port>
                         <wildfly.test.config.dir>${wildfly.test.config.dir}</wildfly.test.config.dir>
                     </systemPropertyVariables>

diff --git a/...hared/src/main/java/org/wildfly/plugin/tests/AbstractProvisionConfiguredMojoTestCase.java b/...hared/src/main/java/org/wildfly/plugin/tests/AbstractProvisionConfiguredMojoTestCase.java
@@ -67,8 +67,14 @@
 @RunWith(JUnit4.class)
 public abstract class AbstractProvisionConfiguredMojoTestCase extends AbstractMojoTestCase {
     private static final String TEST_REPLACE_WF_VERSION = "WF_VERSION";
+    private static final String TEST_REPLACE_SERVER_PRODUCER = "SERVER_PRODUCER";
+    private static final String TEST_REPLACE_CHANNEL_GROUP_ID = "CHANNEL_GROUP_ID";
+    private static final String TEST_REPLACE_CHANNEL_ARTIFACT_ID = "CHANNEL_ARTIFACT_ID";
     private static final String TEST_REPLACE_BASE_DIR_ABSOLUTE_URL = "WF_BASE_DIR_ABSOLUTE_URL";
     static final String WILDFLY_VERSION = "wildfly.test.version";
+    static final String WILDFLY_SERVER_PRODUCER = "wildfly.test.server.producer";
+    static final String WILDFLY_CHANNEL_GROUP_ID = "wildfly.test.channel.groupId";
+    static final String WILDFLY_CHANNEL_ARTIFACT_ID = "wildfly.test.channel.artifactId";
     private final String artifactId;
 
     protected AbstractProvisionConfiguredMojoTestCase(String artifactId) {
@@ -151,6 +157,15 @@ protected Mojo lookupConfiguredMojo(final Path pom, final String goal) throws Ex
     private void patchPomFile(final Path pom) throws IOException {
         StringBuilder content = new StringBuilder();
         for (String s : Files.readAllLines(pom)) {
+            if (s.contains(TEST_REPLACE_CHANNEL_GROUP_ID)) {
+                s = s.replace(TEST_REPLACE_CHANNEL_GROUP_ID, System.getProperty(WILDFLY_CHANNEL_GROUP_ID));
+            }
+            if (s.contains(TEST_REPLACE_CHANNEL_ARTIFACT_ID)) {
+                s = s.replace(TEST_REPLACE_CHANNEL_ARTIFACT_ID, System.getProperty(WILDFLY_CHANNEL_ARTIFACT_ID));
+            }
+            if (s.contains(TEST_REPLACE_SERVER_PRODUCER)) {
+                s = s.replace(TEST_REPLACE_SERVER_PRODUCER, System.getProperty(WILDFLY_SERVER_PRODUCER));
+            }
             if (s.contains(TEST_REPLACE_WF_VERSION)) {
                 s = s.replace(TEST_REPLACE_WF_VERSION, System.getProperty(WILDFLY_VERSION));
             }

diff --git a/tests/standalone-tests/src/test/resources/test-project/package-channel-pom.xml b/tests/standalone-tests/src/test/resources/test-project/package-channel-pom.xml
@@ -19,15 +19,14 @@
                     <channels>
                         <channel>
                             <manifest>
-                                <groupId>org.wildfly.channels</groupId>
-                                <artifactId>wildfly</artifactId>
-                                <version>WF_VERSION</version>
+                                <groupId>CHANNEL_GROUP_ID</groupId>
+                                <artifactId>CHANNEL_ARTIFACT_ID</artifactId>
                             </manifest>
                         </channel>
                     </channels>
                     <feature-packs>
                         <feature-pack>
-                            <location>org.wildfly:wildfly-galleon-pack:WF_VERSION</location>
+                            <location>SERVER_PRODUCER</location>
                         </feature-pack>
                     </feature-packs>
                     <layers>

diff --git a/tests/standalone-tests/src/test/resources/test-project/package-default-config-pom.xml b/tests/standalone-tests/src/test/resources/test-project/package-default-config-pom.xml
@@ -16,9 +16,17 @@
                 <groupId>org.jboss.eap.plugins</groupId>
                 <artifactId>eap-maven-plugin</artifactId>
                 <configuration>
+                    <channels>
+                        <channel>
+                            <manifest>
+                                <groupId>CHANNEL_GROUP_ID</groupId>
+                                <artifactId>CHANNEL_ARTIFACT_ID</artifactId>
+                            </manifest>
+                        </channel>
+                    </channels>
                     <feature-packs>
                         <feature-pack>
-                            <location>wildfly@maven(org.jboss.universe:community-universe)#WF_VERSION</location>
+                            <location>SERVER_PRODUCER</location>
                         </feature-pack>
                     </feature-packs>
                     <record-provisioning-state>true</record-provisioning-state>

diff --git a/tests/standalone-tests/src/test/resources/test-project/package-invalid-deployment-pom.xml b/tests/standalone-tests/src/test/resources/test-project/package-invalid-deployment-pom.xml
@@ -16,9 +16,17 @@
                 <groupId>org.jboss.eap.plugins</groupId>
                 <artifactId>eap-maven-plugin</artifactId>
                 <configuration>
+                    <channels>
+                        <channel>
+                            <manifest>
+                                <groupId>CHANNEL_GROUP_ID</groupId>
+                                <artifactId>CHANNEL_ARTIFACT_ID</artifactId>
+                            </manifest>
+                        </channel>
+                    </channels>
                     <feature-packs>
                         <feature-pack>
-                            <location>wildfly@maven(org.jboss.universe:community-universe)#WF_VERSION</location>
+                            <location>SERVER_PRODUCER</location>
                         </feature-pack>
                     </feature-packs>
                     <layers>

diff --git a/tests/standalone-tests/src/test/resources/test-project/package-invalid-deployment2-pom.xml b/tests/standalone-tests/src/test/resources/test-project/package-invalid-deployment2-pom.xml
@@ -17,9 +17,17 @@
                 <groupId>org.jboss.eap.plugins</groupId>
                 <artifactId>eap-maven-plugin</artifactId>
                 <configuration>
+                    <channels>
+                        <channel>
+                            <manifest>
+                                <groupId>CHANNEL_GROUP_ID</groupId>
+                                <artifactId>CHANNEL_ARTIFACT_ID</artifactId>
+                            </manifest>
+                        </channel>
+                    </channels>
                     <feature-packs>
                         <feature-pack>
-                            <location>wildfly@maven(org.jboss.universe:community-universe)#WF_VERSION</location>
+                            <location>SERVER_PRODUCER</location>
                         </feature-pack>
                     </feature-packs>
                     <layers>

diff --git a/...dalone-tests/src/test/resources/test-project/package-multiple-deployments-missing-pom.xml b/...dalone-tests/src/test/resources/test-project/package-multiple-deployments-missing-pom.xml
@@ -32,9 +32,17 @@
                     <included-dependencies>
                         <include>org.foo:bar:war</include>
                     </included-dependencies>
+                    <channels>
+                        <channel>
+                            <manifest>
+                                <groupId>CHANNEL_GROUP_ID</groupId>
+                                <artifactId>CHANNEL_ARTIFACT_ID</artifactId>
+                            </manifest>
+                        </channel>
+                    </channels>
                     <feature-packs>
                         <feature-pack>
-                            <location>wildfly@maven(org.jboss.universe:community-universe)#WF_VERSION</location>
+                            <location>SERVER_PRODUCER</location>
                         </feature-pack>
                     </feature-packs>
                     <layers>

diff --git a/tests/standalone-tests/src/test/resources/test-project/package-multiple-deployments-pom.xml b/tests/standalone-tests/src/test/resources/test-project/package-multiple-deployments-pom.xml
@@ -52,9 +52,17 @@
                         <included>::jar</included>
                     </included-dependencies>
                     <excluded-dependency-scope>test</excluded-dependency-scope>
+                    <channels>
+                        <channel>
+                            <manifest>
+                                <groupId>CHANNEL_GROUP_ID</groupId>
+                                <artifactId>CHANNEL_ARTIFACT_ID</artifactId>
+                            </manifest>
+                        </channel>
+                    </channels>
                     <feature-packs>
                         <feature-pack>
-                            <location>wildfly@maven(org.jboss.universe:community-universe)#WF_VERSION</location>
+                            <location>SERVER_PRODUCER</location>
                         </feature-pack>
                     </feature-packs>
                     <layers>

diff --git a/tests/standalone-tests/src/test/resources/test-project/package-no-deployment-pom.xml b/tests/standalone-tests/src/test/resources/test-project/package-no-deployment-pom.xml
@@ -16,9 +16,17 @@
                 <groupId>org.jboss.eap.plugins</groupId>
                 <artifactId>eap-maven-plugin</artifactId>
                 <configuration>
+                    <channels>
+                        <channel>
+                            <manifest>
+                                <groupId>CHANNEL_GROUP_ID</groupId>
+                                <artifactId>CHANNEL_ARTIFACT_ID</artifactId>
+                            </manifest>
+                        </channel>
+                    </channels>
                     <feature-packs>
                         <feature-pack>
-                            <location>wildfly@maven(org.jboss.universe:community-universe)#WF_VERSION</location>
+                            <location>SERVER_PRODUCER</location>
                             <inherit-packages>false</inherit-packages>
                             <inherit-configs>false</inherit-configs>
                             <included-configs>

diff --git a/tests/standalone-tests/src/test/resources/test-project/package-pom.xml b/tests/standalone-tests/src/test/resources/test-project/package-pom.xml
@@ -16,9 +16,17 @@
                 <groupId>org.jboss.eap.plugins</groupId>
                 <artifactId>eap-maven-plugin</artifactId>
                 <configuration>
+                    <channels>
+                        <channel>
+                            <manifest>
+                                <groupId>CHANNEL_GROUP_ID</groupId>
+                                <artifactId>CHANNEL_ARTIFACT_ID</artifactId>
+                            </manifest>
+                        </channel>
+                    </channels>
                     <feature-packs>
                         <feature-pack>
-                            <location>wildfly@maven(org.jboss.universe:community-universe)#WF_VERSION</location>
+                            <location>SERVER_PRODUCER</location>
                         </feature-pack>
                     </feature-packs>
                     <layers>

diff --git a/tests/standalone-tests/src/test/resources/test-project/provision-pom.xml b/tests/standalone-tests/src/test/resources/test-project/provision-pom.xml
@@ -16,9 +16,17 @@
                 <groupId>org.jboss.eap.plugins</groupId>
                 <artifactId>eap-maven-plugin</artifactId>
                 <configuration>
+                    <channels>
+                        <channel>
+                            <manifest>
+                                <groupId>CHANNEL_GROUP_ID</groupId>
+                                <artifactId>CHANNEL_ARTIFACT_ID</artifactId>
+                            </manifest>
+                        </channel>
+                    </channels>
                     <feature-packs>
                         <feature-pack>
-                            <location>wildfly@maven(org.jboss.universe:community-universe)#WF_VERSION</location>
+                            <location>SERVER_PRODUCER</location>
                         </feature-pack>
                     </feature-packs>
                     <layers>