Migrate to Java 21

ballerina-platform · Oct 2, 2024 · 22651ae · 22651ae
1 parent 6f556b1
commit 22651ae
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 35 deletions.
diff --git a/.github/workflows/build-timestamped-master.yml b/.github/workflows/build-timestamped-master.yml
@@ -13,11 +13,11 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v2
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: 17.0.7
+          java-version: 21
       - name: Change to Timestamped Version
         run: |
           startTime=$(TZ="Asia/Kolkata" date +'%Y%m%d-%H%M00')

diff --git a/.github/workflows/central-publish.yml b/.github/workflows/central-publish.yml
@@ -18,11 +18,11 @@ jobs:
     if: github.repository_owner == 'ballerina-platform'
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 17.0.7
+          java-version: 21
       - name: Build with Gradle
         env:
           packageUser: ${{ github.actor }}

diff --git a/.github/workflows/daily-build.yml b/.github/workflows/daily-build.yml
@@ -12,11 +12,11 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v2
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v2
         with:
           distribution: 'temurin'
-          java-version: 17.0.7
+          java-version: 21
       - name: Build with Gradle
         env:
           packageUser: ${{ github.actor }}
@@ -34,11 +34,11 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v2
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v2
         with:
           distribution: 'temurin'
-          java-version: 17.0.7
+          java-version: 21
       - name: Build with Gradle
         env:
           packageUser: ${{ github.actor }}
@@ -54,11 +54,11 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v2
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v2
         with:
           distribution: 'temurin'
-          java-version: 17.0.7
+          java-version: 21
       - name: Build with Gradle
         env:
           packageUser: ${{ github.actor }}

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -11,11 +11,11 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v2
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: 17.0.7
+          java-version: 21
       - name: Build with Gradle
         env:
           packageUser: ${{ github.actor }}

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -9,11 +9,11 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v2
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: 17.0.7
+          java-version: 21
       - name: Build with Gradle
         env:
           packageUser: ${{ github.actor }}
@@ -31,11 +31,11 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v2
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v2
         with:
           distribution: 'temurin'
-          java-version: 17.0.7
+          java-version: 21
       - name: Build with Gradle
         env:
           packageUser: ${{ github.actor }}
@@ -51,11 +51,11 @@ jobs:
       steps:
           - name: Checkout Repository
             uses: actions/checkout@v2
-          - name: Set up JDK 17
+          - name: Set up JDK 21
             uses: actions/setup-java@v2
             with:
                 distribution: 'adopt'
-                java-version: 17.0.7
+                java-version: 21
           - name: Build with Gradle
             env:
                 packageUser: ${{ github.actor }}

diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml
@@ -11,11 +11,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: 17.0.7
+          java-version: 21
       - name: Build with Gradle
         env:
           packageUser: ${{ github.actor }}

diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ By default, observability is not included in the executable created by Ballerina
 
 ### Set Up the prerequisites
 
-1. Download and install Java SE Development Kit (JDK) version 17 (from one of the following locations).
+1. Download and install Java SE Development Kit (JDK) version 21 (from one of the following locations).
 
     * [Oracle](https://www.oracle.com/java/technologies/downloads/)
 

diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml
@@ -5,30 +5,30 @@ version = "1.3.0"
 distribution = "2201.10.0"
 export = ["observe", "observe.mockextension" ]
 
-[platform.java17]
+[platform.java21]
 graalvmCompatible = true
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 path = "../native/build/libs/observe-native-1.3.0.jar"
 groupId = "ballerina"
 artifactId = "observe"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.opentelemetry"
 artifactId = "opentelemetry-sdk-trace"
 version = "1.0.0"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.opentelemetry"
 artifactId = "opentelemetry-sdk-testing"
 version = "1.0.0"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.opentelemetry"
 artifactId = "opentelemetry-sdk-common"
 version = "1.0.0"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.opentelemetry"
 artifactId = "opentelemetry-semconv"
 version = "1.0.0-alpha"
diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml
@@ -5,30 +5,30 @@ version = "@toml.version@"
 distribution = "2201.10.0"
 export = ["observe", "observe.mockextension" ]
 
-[platform.java17]
+[platform.java21]
 graalvmCompatible = true
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 path = "../native/build/libs/[email protected]@.jar"
 groupId = "ballerina"
 artifactId = "observe"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.opentelemetry"
 artifactId = "opentelemetry-sdk-trace"
 version = "@opentelemetry.version@"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.opentelemetry"
 artifactId = "opentelemetry-sdk-testing"
 version = "@opentelemetry.version@"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.opentelemetry"
 artifactId = "opentelemetry-sdk-common"
 version = "@opentelemetry.version@"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.opentelemetry"
 artifactId = "opentelemetry-semconv"
 version = "@opentelemetry.version@-alpha"
diff --git a/gradle.properties b/gradle.properties
@@ -15,8 +15,8 @@
 org.gradle.caching=true
 group=io.ballerina.stdlib
 version=1.3.1-SNAPSHOT
-ballerinaLangVersion=2201.10.0
-githubSpotbugsVersion=5.0.14
+ballerinaLangVersion=2201.10.0-20241002-115300-57eee14c
+githubSpotbugsVersion=6.0.18
 githubJohnrengelmanShadowVersion=8.1.1
 underCouchDownloadVersion=5.4.0
 researchgateReleaseVersion=2.8.0