Fix tests for running on Java 11. This requires setting a version of …

…WildFly which is compiled to Java 11. Signed-off-by: James R. Perkins <jperkins@redhat.com>
wildfly · Dec 12, 2024 · 90a76ae · 90a76ae
1 parent 92be090
commit 90a76ae
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 2 deletions.
diff --git a/.github/workflows/legacy-build.yml b/.github/workflows/legacy-build.yml
@@ -38,7 +38,7 @@ jobs:
           cache: 'maven'
           distribution: 'temurin'
       - name: Build and Test on ${{ matrix.java }} - ${{ matrix.wildfly-version }}
-        run: mvn clean install '-Dorg.jboss.logmanager.nocolor=true' '-Dversion.org.wildfly=${{ matrix.wildfly-version }}'
+        run: mvn clean install '-Dorg.jboss.logmanager.nocolor=true' '-Dversion.org.wildfly=${{ matrix.wildfly-version }}' '-Dskip.channel.tests'
       - name: Upload surefire logs for failed run
         uses: actions/upload-artifact@v4
         if: failure()

diff --git a/tests/shared/src/main/java/org/wildfly/plugin/categories/ChannelsRequired.java b/tests/shared/src/main/java/org/wildfly/plugin/categories/ChannelsRequired.java
@@ -0,0 +1,12 @@
+/*
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.wildfly.plugin.categories;
+
+/**
+ * @author <a href="mailto:jperkins@redhat.com">James R. Perkins</a>
+ */
+public interface ChannelsRequired {
+}
diff --git a/tests/standalone-tests/pom.xml b/tests/standalone-tests/pom.xml
@@ -124,4 +124,25 @@
             </plugin>
         </plugins>
     </build>
+
+    <profiles>
+        <profile>
+            <id>skip-channel-tests</id>
+            <activation>
+                <property>
+                    <name>skip.channel.tests</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <excludedGroups>org.wildfly.plugin.categories.ChannelsRequired</excludedGroups>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/tests/standalone-tests/src/test/java/org/wildfly/plugin/provision/PackageTest.java b/tests/standalone-tests/src/test/java/org/wildfly/plugin/provision/PackageTest.java
@@ -11,6 +11,8 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.wildfly.plugin.categories.ChannelsRequired;
 import org.wildfly.plugin.tests.AbstractProvisionConfiguredMojoTestCase;
 import org.wildfly.plugin.tests.AbstractWildFlyMojoTest;
 
@@ -36,6 +38,7 @@ public void testPackage() throws Exception {
     }
 
     @Test
+    @Category(ChannelsRequired.class)
     public void testPackageWithChannel() throws Exception {
 
         final Mojo packageMojo = lookupConfiguredMojo(AbstractWildFlyMojoTest.getPomFile("package-channel-pom.xml").toFile(),

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
@@ -21,12 +21,13 @@
                             <manifest>
                                 <groupId>org.wildfly.channels</groupId>
                                 <artifactId>wildfly</artifactId>
+                                <version>WF_VERSION</version>
                             </manifest>
                         </channel>
                     </channels>
                     <feature-packs>
                         <feature-pack>
-                            <location>org.wildfly:wildfly-galleon-pack</location>
+                            <location>org.wildfly:wildfly-galleon-pack:WF_VERSION</location>
                         </feature-pack>
                     </feature-packs>
                     <layers>