JDK 17 minimal build version and Derby and Spring dependency upgrade (#…

…1977) org.eclipse.persistence.jpa.spring.test module is included now into test (GH action, PR verified, SRG + LRG in the Jenkins) Signed-off-by: Radek Felcman <radek.felcman@oracle.com>
eclipse-ee4j · Oct 23, 2023 · 8139584 · 8139584
1 parent 4d57d69
commit 8139584
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/etc/jenkins/pr_verify.groovy b/etc/jenkins/pr_verify.groovy
@@ -189,12 +189,12 @@ spec:
                 }
             }
         }
-        stage('JPA Modelgen, JPA JSE, WDF, JPARS, DBWS, DBWS Builder, Distribution') {
+        stage('JPA Modelgen, JPA JSE, JPA Spring, WDF, JPARS, DBWS, DBWS Builder, Distribution') {
             steps {
                 container('el-build') {
                     sh """
                                 mvn -B -V clean install -pl :eclipselink -P staging
-                                mvn -B -V verify -pl :org.eclipse.persistence.jpa.modelgen.processor,:org.eclipse.persistence.jpa.jse.test,:org.eclipse.persistence.extension,:org.eclipse.persistence.jpa.jpql,:org.eclipse.persistence.jpa.wdf.test,:org.eclipse.persistence.jpars,:org.eclipse.persistence.dbws,:org.eclipse.persistence.dbws.builder,:eclipselink,:org.eclipse.persistence.distribution.tests -P staging,mysql;
+                                mvn -B -V verify -pl :org.eclipse.persistence.jpa.modelgen.processor,:org.eclipse.persistence.jpa.jse.test,:org.eclipse.persistence.jpa.spring.test,:org.eclipse.persistence.extension,:org.eclipse.persistence.jpa.jpql,:org.eclipse.persistence.jpa.wdf.test,:org.eclipse.persistence.jpars,:org.eclipse.persistence.dbws,:org.eclipse.persistence.dbws.builder,:eclipselink,:org.eclipse.persistence.distribution.tests -P staging,mysql;
                             """
                 }
             }

diff --git a/jpa/eclipselink.jpa.spring.test/pom.xml b/jpa/eclipselink.jpa.spring.test/pom.xml
@@ -45,7 +45,7 @@
         <!--Log level-->
         <loglevel>${logging.level}</loglevel>
 
-        <test-skip-jpa-spring>true</test-skip-jpa-spring> <!-- Spring 4 is not supported with jakarta.persistence -->
+        <test-skip-jpa-spring>${skipTests}</test-skip-jpa-spring> <!-- Spring 4 is not supported with jakarta.persistence -->
     </properties>
 
     <dependencies>

diff --git a/pom.xml b/pom.xml
@@ -223,7 +223,7 @@
         <ant.version>1.10.14</ant.version>
         <aspectj.version>1.9.20.1</aspectj.version>
         <commonj.sdo.version>2.1.1</commonj.sdo.version>
-        <derby.version>10.15.2.0</derby.version>
+        <derby.version>10.16.1.1</derby.version>
         <db2.version>11.5.8.0</db2.version>
         <!-- CQ #21134, 21135, 21136, 21137 -->
         <exam.version>4.13.4</exam.version>
@@ -256,7 +256,7 @@
         <!-- CQ #21143 -->
         <slf4j.version>2.0.9</slf4j.version>
         <!-- CQ #23051, 23052, 23053, 53054, 53055 -->
-        <springframework.version>5.3.30</springframework.version>
+        <springframework.version>6.0.13</springframework.version>
         <!-- CQ #23233 -->
         <weld-se.version>5.1.2.Final</weld-se.version>
         <weblogic.version>12.2.1-3</weblogic.version>
@@ -1654,7 +1654,7 @@
                         <configuration>
                             <rules>
                                 <requireJavaVersion>
-                                    <version>[11,)</version>
+                                    <version>[17,)</version>
                                 </requireJavaVersion>
                                 <requireMavenVersion>
                                     <version>[3.6.3,)</version>