Fixes piranhacloud#3335 - Build with all JDKs but run tests with JDK …

…21 only
Thihup · Jun 16, 2023 · c7db066 · c7db066
1 parent e6505e3
commit c7db066
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/...st/java/cloud/piranha/extension/annotationscan/classfile/AnnotationScanExtensionTest.java b/...st/java/cloud/piranha/extension/annotationscan/classfile/AnnotationScanExtensionTest.java
@@ -35,6 +35,8 @@
 import cloud.piranha.resource.impl.DirectoryResource;
 import jakarta.servlet.annotation.WebServlet;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledOnJre;
+import org.junit.jupiter.api.condition.JRE;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -67,6 +69,7 @@ void testConfigure() {
      * Test configure method.
      */
     @Test
+    @EnabledOnJre(value = JRE.JAVA_21, disabledReason = "Only JDK 21 includes the Classfile API")
     void testConfigure2() {
         DefaultResourceManager resourceManager = new DefaultResourceManager();
         resourceManager.addResource(new DirectoryResource("target/test-classes"));

diff --git a/extension/pom.xml b/extension/pom.xml
@@ -17,6 +17,7 @@
 
     <modules>
         <module>annotationscan</module>
+        <module>annotationscan-classfile</module>
         <module>apache-fileupload</module>
         <module>bytesstreamhandler</module>
         <module>coreprofile</module>
@@ -75,16 +76,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>jdk21</id>
-            <activation>
-                <jdk>21</jdk>
-            </activation>
-            <modules>
-                <module>annotationscan-classfile</module>
-            </modules>
-        </profile>
-    </profiles>
 </project>