Test on JDK 21

.github/workflows/build-and-test-pr.yml

@@ -31,7 +31,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
       - name: "Compile Dubbo (Linux)"
         run: |
           ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C clean install -DskipTests=true -DskipIntegrationTests=true -Dcheckstyle.skip=true -Dcheckstyle_unix.skip=true -Drat.skip=true -Dmaven.javadoc.skip=true
@@ -164,7 +164,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
       - uses: actions/cache@v3
         name: "Cache local Maven repository"
         with:
@@ -328,11 +328,11 @@ jobs:
         with:
           repository: 'apache/dubbo-samples'
           path: "./dubbo-samples"
-      - name: "Set up JDK 17"
+      - name: "Set up JDK 21"
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
       - name: "Restore class result"
         uses: actions/download-artifact@v3
         with:
@@ -372,11 +372,11 @@ jobs:
           ref: main
           path: "./dubbo-test-tools"
 
-      - name: "Set up JDK 17"
+      - name: "Set up JDK 21"
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
 
       - name: "Compile Dubbo (Linux)"
         run: |

.github/workflows/build-and-test-scheduled-3.2.yml

@@ -134,7 +134,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest, windows-latest ]
-        jdk: [ 8, 11, 17, 19 ]
+        jdk: [ 8, 11, 17, 19, 21 ]
     env:
       DISABLE_FILE_SYSTEM_TEST: true
     steps:
@@ -180,7 +180,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest, windows-latest ]
-        jdk: [ 8, 11, 17, 19 ]
+        jdk: [ 8, 11, 17, 19, 21 ]
     env:
       DISABLE_FILE_SYSTEM_TEST: true
       DUBBO_DEFAULT_SERIALIZATION: fastjson2
@@ -249,7 +249,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        jdk: [ 8, 11, 17, 19 ]
+        jdk: [ 8, 11, 17, 19, 21 ]
         job_id: [1, 2, 3, 4, 5]
     steps:
       - uses: actions/checkout@v3
@@ -306,7 +306,7 @@ jobs:
       JAVA_VER: ${{matrix.jdk}}
     strategy:
       matrix:
-        jdk: [ 8, 11, 17, 19 ]
+        jdk: [ 8, 11, 17, 19, 21 ]
     steps:
       - uses: actions/checkout@v3
         with:

dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/MemorySafeLinkedBlockingQueue.java

@@ -37,15 +37,15 @@ public class MemorySafeLinkedBlockingQueue<E> extends LinkedBlockingQueue<E> {
 
     public static int THE_256_MB = 256 * 1024 * 1024;
 
-    private int maxFreeMemory;
+    private long maxFreeMemory;
 
     private Rejector<E> rejector;
 
     public MemorySafeLinkedBlockingQueue() {
         this(THE_256_MB);
     }
 
-    public MemorySafeLinkedBlockingQueue(final int maxFreeMemory) {
+    public MemorySafeLinkedBlockingQueue(final long maxFreeMemory) {
         super(Integer.MAX_VALUE);
         this.maxFreeMemory = maxFreeMemory;
         //default as DiscardPolicy to ensure compatibility with the old version
@@ -74,7 +74,7 @@ public void setMaxFreeMemory(final int maxFreeMemory) {
      *
      * @return the max free memory limit
      */
-    public int getMaxFreeMemory() {
+    public long getMaxFreeMemory() {
         return maxFreeMemory;
     }
 

dubbo-common/src/main/java/org/apache/dubbo/common/utils/JRE.java

@@ -51,6 +51,14 @@ public enum JRE {
 
     JAVA_19,
 
+    JAVA_20,
+
+    JAVA_21,
+
+    JAVA_22,
+
+    JAVA_23,
+
     OTHER;
 
     private static final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(JRE.class);
@@ -113,6 +121,12 @@ private static JRE getJre() {
                     return JAVA_18;
                 case 19:
                     return JAVA_19;
+                case 20:
+                    return JAVA_20;
+                case 21:
+                    return JAVA_21;
+                case 22:
+                    return JAVA_22;
                 default:
                     return OTHER;
             }