JDK 17 support switch (#2040)

There are three required changes Maven compiler target and enforcer plugin into Java 17 Derby dependency version decrease to 10.16.1.1 as 10.17.x supports Java 21 only Code change to create Locale by Locale.Builder in JPQLExpressionTurkishLocaleTest.java Signed-off-by: Radek Felcman <radek.felcman@oracle.com>
eclipse-ee4j · Jan 23, 2024 · a8f70b8 · a8f70b8
1 parent c49cc65
commit a8f70b8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/...t/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLExpressionTurkishLocaleTest.java b/...t/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLExpressionTurkishLocaleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,7 +33,7 @@ public class JPQLExpressionTurkishLocaleTest {
     public void testJPQLExpressionWithTurkishLocale() {
         Locale current = Locale.getDefault();
         try {
-            Locale.setDefault(Locale.of("tr", "TR"));
+            Locale.setDefault(new Locale.Builder().setLanguage("tr").setRegion("TR").build());
 
             JPQLGrammar grammar = DefaultEclipseLinkJPQLGrammar.instance();
             JPQLExpression expression = new JPQLExpression(

diff --git a/pom.xml b/pom.xml
@@ -96,8 +96,8 @@
 
     <properties>
         <!-- Minimum required JDK version -->
-        <maven.compiler.release>21</maven.compiler.release>
-        <maven.compiler.testRelease>21</maven.compiler.testRelease>
+        <maven.compiler.release>17</maven.compiler.release>
+        <maven.compiler.testRelease>17</maven.compiler.testRelease>
 
         <!-- TOOL Properties -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -224,7 +224,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.17.1.0</derby.version>
+        <derby.version>10.16.1.1</derby.version>
         <db2.version>11.5.8.0</db2.version>
         <h2.version>2.2.224</h2.version>
         <!-- CQ #21134, 21135, 21136, 21137 -->
@@ -1656,7 +1656,7 @@
                         <configuration>
                             <rules>
                                 <requireJavaVersion>
-                                    <version>[21,)</version>
+                                    <version>[17,)</version>
                                 </requireJavaVersion>
                                 <requireMavenVersion>
                                     <version>[3.6.3,)</version>