Set JDK 21 as a compiler release switch and version upgrade to 5.0.0-…

…SNAPSHOT (#1979) Set JDK 21 as a compiler release switch EclipseCI Jenkins jobs JDK switch CodeQL JDK change Version upgrade to 5.0.0-SNAPSHOT Signed-off-by: Radek Felcman <radek.felcman@oracle.com>
eclipse-ee4j · Oct 31, 2023 · 04deabc · 04deabc
1 parent 8139584
commit 04deabc
Show file tree

Hide file tree

Showing 159 changed files with 198 additions and 175 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -45,7 +45,7 @@ jobs:
       uses: actions/setup-java@v3
       with:
         distribution: 'zulu'
-        java-version: 17
+        java-version: 21
 
     - name: Checkout repository
       uses: actions/checkout@v3

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -31,7 +31,7 @@ jobs:
 
     strategy:
       matrix:
-        java_version: [ 17, 21 ]
+        java_version: [ 21 ]
 
     steps:
       - name: Start MySQL Database

diff --git a/.lgtm.yml b/.lgtm.yml
@@ -25,7 +25,7 @@ queries:
 extraction:
   java:
     index:
-      java_version: 11
+      java_version: 21
       maven:
         version: 3.6.3
       build_command: "mvn -DskipTests -Denforcer.skip clean package -Pstaging"

diff --git a/bundles/eclipselink/pom.xml b/bundles/eclipselink/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.bundles</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/bundles/moxy-standalone/pom.xml b/bundles/moxy-standalone/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.bundles</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/bundles/nightly/pom.xml b/bundles/nightly/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.bundles</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/bundles/others/pom.xml b/bundles/others/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.bundles</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/bundles/p2site/pom.xml b/bundles/p2site/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2019, 2021 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2019, 2023 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
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.bundles</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/bundles/pom.xml b/bundles/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.parent</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/bundles/tests/pom.xml b/bundles/tests/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.bundles</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/dbws/eclipselink.dbws.test.oracle/pom.xml b/dbws/eclipselink.dbws.test.oracle/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.parent</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/dbws/org.eclipse.persistence.dbws/pom.xml b/dbws/org.eclipse.persistence.dbws/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.parent</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/docs/docs.concepts/pom.xml b/docs/docs.concepts/pom.xml
@@ -24,13 +24,13 @@
     <description>EclipseLink Documentation for the WebSite - Concepts</description>
     <groupId>org.eclipse.persistence</groupId>
     <artifactId>org.eclipse.persistence.documentation.concepts</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>5.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <parent>
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.documentation</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/docs/docs.dbws/pom.xml b/docs/docs.dbws/pom.xml
@@ -24,13 +24,13 @@
     <description>EclipseLink Documentation for the WebSite - DBWS</description>
     <groupId>org.eclipse.persistence</groupId>
     <artifactId>org.eclipse.persistence.documentation.dbws</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>5.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <parent>
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.documentation</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/docs/docs.jpa/pom.xml b/docs/docs.jpa/pom.xml
@@ -24,13 +24,13 @@
     <description>EclipseLink Documentation for the WebSite - JPA Extensions</description>
     <groupId>org.eclipse.persistence</groupId>
     <artifactId>org.eclipse.persistence.documentation.jpaextensions</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>5.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <parent>
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.documentation</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/docs/docs.moxy/pom.xml b/docs/docs.moxy/pom.xml
@@ -24,13 +24,13 @@
     <description>EclipseLink Documentation for the WebSite - MOXy</description>
     <groupId>org.eclipse.persistence</groupId>
     <artifactId>org.eclipse.persistence.documentation.moxy</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>5.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <parent>
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.documentation</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/docs/docs.solutions/pom.xml b/docs/docs.solutions/pom.xml
@@ -24,13 +24,13 @@
     <description>EclipseLink Documentation for the WebSite - Solutions</description>
     <groupId>org.eclipse.persistence</groupId>
     <artifactId>org.eclipse.persistence.documentation.solutions</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>5.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <parent>
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.documentation</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/docs/pom.xml b/docs/pom.xml
@@ -24,13 +24,13 @@
     <description>EclipseLink Documentation for the WebSite</description>
     <groupId>org.eclipse.persistence</groupId>
     <artifactId>org.eclipse.persistence.documentation</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>5.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <parent>
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.parent</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/etc/jenkins/build.groovy b/etc/jenkins/build.groovy
@@ -104,7 +104,7 @@ spec:
     }
     tools {
         maven 'apache-maven-latest'
-        jdk 'openjdk-jdk17-latest'
+        jdk 'openjdk-jdk21-latest'
     }
     stages {
         // Initialize build environment

diff --git a/etc/jenkins/pr_verify.groovy b/etc/jenkins/pr_verify.groovy
@@ -95,7 +95,7 @@ spec:
     }
     tools {
         maven 'apache-maven-latest'
-        jdk 'openjdk-jdk17-latest'
+        jdk 'openjdk-jdk21-latest'
     }
     stages {
         // Initialize build environment

diff --git a/etc/jenkins/release.groovy b/etc/jenkins/release.groovy
@@ -101,7 +101,7 @@ spec:
     }
     tools {
         maven 'apache-maven-latest'
-        jdk 'openjdk-jdk17-latest'
+        jdk 'openjdk-jdk21-latest'
     }
     stages {
 

diff --git a/foundation/eclipselink.core.test/pom.xml b/foundation/eclipselink.core.test/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.parent</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/foundation/org.eclipse.persistence.corba/pom.xml b/foundation/org.eclipse.persistence.corba/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.parent</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/foundation/org.eclipse.persistence.core.test.framework/pom.xml b/foundation/org.eclipse.persistence.core.test.framework/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.parent</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/foundation/org.eclipse.persistence.core/pom.xml b/foundation/org.eclipse.persistence.core/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.parent</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/...sistence.core/src/main/java/org/eclipse/persistence/internal/helper/WriteLockManager.java b/...sistence.core/src/main/java/org/eclipse/persistence/internal/helper/WriteLockManager.java
@@ -425,7 +425,7 @@ private void acquireRequiredLocksInternal(MergeManager mergeManager, UnitOfWorkC
                                 // linked list for quick removal upon
                                 // acquiring all locks
                                 synchronized (this.prevailingQueue) {
-                                    mergeManager.setQueueNode(this.prevailingQueue.addLast(mergeManager));
+                                    mergeManager.setQueueNode(this.prevailingQueue.addLastElement(mergeManager));
                                 }
                             }
 

diff --git a/...c/main/java/org/eclipse/persistence/internal/helper/linkedlist/ExposedNodeLinkedList.java b/...c/main/java/org/eclipse/persistence/internal/helper/linkedlist/ExposedNodeLinkedList.java
@@ -205,7 +205,17 @@ public Object removeLast() {
      *
      * @param o the contents to be inserted at the beginning of this list.
      */
-    public LinkedNode addFirst(Object o) {
+    public void addFirst(Object o) {
+        addAfter(o, header);
+    }
+
+    /**
+     * Inserts the given contents at the beginning of this list.
+     *
+     * @param o the contents to be inserted at the beginning of this list.
+     * @return <code>LinkedNode</code> with the specified content.
+     */
+    public LinkedNode addFirstElement(Object o) {
         return addAfter(o, header);
     }
 
@@ -215,7 +225,18 @@ public LinkedNode addFirst(Object o) {
      *
      * @param o the contents to be inserted at the end of this list.
      */
-    public LinkedNode addLast(Object o) {
+    public void addLast(Object o) {
+        addAfter(o, header.previous);
+    }
+
+    /**
+     * Appends the given contents to the end of this list.  (Identical in
+     * function to the <code>add</code> method; included only for consistency.)
+     *
+     * @param o the contents to be inserted at the end of this list.
+     * @return <code>LinkedNode</code> with the specified content.
+     */
+    public LinkedNode addLastElement(Object o) {
         return addAfter(o, header.previous);
     }
 

diff --git a/...src/main/java/org/eclipse/persistence/internal/identitymaps/HardCacheWeakIdentityMap.java b/...src/main/java/org/eclipse/persistence/internal/identitymaps/HardCacheWeakIdentityMap.java
@@ -155,7 +155,7 @@ public void updateAccess() {
             synchronized (referenceCache) {
                 // If reference node is null, add to start (new cache key).
                 if (this.referenceNode == null) {
-                    this.referenceNode = referenceCache.addFirst(buildReference(getObject()));
+                    this.referenceNode = referenceCache.addFirstElement(buildReference(getObject()));
                 } else {
                     // This is a fast constant time operations because of the linked list usage.
                     referenceCache.moveFirst(getReferenceCacheNode());

diff --git a/foundation/org.eclipse.persistence.extension/pom.xml b/foundation/org.eclipse.persistence.extension/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.parent</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/foundation/org.eclipse.persistence.json/pom.xml b/foundation/org.eclipse.persistence.json/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.parent</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/foundation/org.eclipse.persistence.nosql/pom.xml b/foundation/org.eclipse.persistence.nosql/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.parent</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/foundation/org.eclipse.persistence.oracle.nosql/pom.xml b/foundation/org.eclipse.persistence.oracle.nosql/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.parent</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/foundation/org.eclipse.persistence.oracle.test/pom.xml b/foundation/org.eclipse.persistence.oracle.test/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.parent</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/foundation/org.eclipse.persistence.oracle/pom.xml b/foundation/org.eclipse.persistence.oracle/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.parent</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/foundation/org.eclipse.persistence.pgsql/pom.xml b/foundation/org.eclipse.persistence.pgsql/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.parent</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>