From 3e6f9b31fe515a106f3a8960e9eb14b56112c2a0 Mon Sep 17 00:00:00 2001
From: Radek Felcman <radek.felcman@oracle.com>
Date: Thu, 19 Dec 2024 06:54:36 +0100
Subject: [PATCH] Execute
 org.eclipse.persistence.jpa.spring.test,org.eclipse.persistence.jpa.springboot.test
 Maven modules conditionally on used Java version. Minimal Java for used test
 Spring dependencies which support Jakarta is Java 17. (#2331)

Signed-off-by: Radek Felcman <radek.felcman@oracle.com>
---
 pom.xml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8b0aa03f30..974d774d17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1867,6 +1867,18 @@
     </build>
 
     <profiles>
+        <profile>
+            <id>spring-modules</id>
+            <activation>
+                <jdk>[17,)</jdk>
+            </activation>
+            <modules>
+                <!--JPA Spring test module-->
+                <module>jpa/eclipselink.jpa.spring.test</module>
+                <!--JPA Spring Boot test module-->
+                <module>jpa/eclipselink.jpa.springboot.test</module>
+            </modules>
+        </profile>
         <!--Testing database profiles-->
         <!--TODO simplify properties part db.driver.XXXX to load it from file-->
         <profile>
@@ -2189,10 +2201,6 @@
                 <module>jpa/eclipselink.jpa.test.jse</module>
                 <!--JPA Helidon test module-->
                 <module>jpa/eclipselink.jpa.helidon.test</module>
-                <!--JPA Spring test module-->
-                <module>jpa/eclipselink.jpa.spring.test</module>
-                <!--JPA Spring Boot test module-->
-                <module>jpa/eclipselink.jpa.springboot.test</module>
                 <!--JPA WDF test module-->
                 <module>jpa/eclipselink.jpa.wdf.test</module>