Migrate to Java 21

ballerina-platform · Oct 9, 2024 · ca04904 · ca04904
1 parent e44a865
commit ca04904
Show file tree

Hide file tree

Showing 15 changed files with 40 additions and 33 deletions.
diff --git a/.github/workflows/build-timestamped-master.yml b/.github/workflows/build-timestamped-master.yml
@@ -14,5 +14,5 @@ jobs:
   call_workflow:
     name: Run Build Workflow
     if: ${{ github.repository_owner == 'ballerina-platform' }}
-    uses: ballerina-platform/ballerina-library/.github/workflows/build-timestamp-master-template.yml@main
+    uses: ballerina-platform/ballerina-library/.github/workflows/build-timestamp-master-template.yml@java21
     secrets: inherit
diff --git a/.github/workflows/build-with-bal-test-graalvm.yml b/.github/workflows/build-with-bal-test-graalvm.yml
@@ -30,7 +30,7 @@ jobs:
     call_stdlib_workflow:
         name: Run StdLib Workflow
         if: ${{ github.event_name != 'schedule' || (github.event_name == 'schedule' && github.repository_owner == 'ballerina-platform') }}
-        uses: ballerina-platform/ballerina-library/.github/workflows/build-with-bal-test-graalvm-template.yml@main
+        uses: ballerina-platform/ballerina-library/.github/workflows/build-with-bal-test-graalvm-template.yml@java21
         with:
             lang_tag: ${{ inputs.lang_tag }}
             lang_version: ${{ inputs.lang_version }}

diff --git a/.github/workflows/central-publish.yml b/.github/workflows/central-publish.yml
@@ -15,7 +15,7 @@ jobs:
   call_workflow:
     name: Run Central Publish Workflow
     if: ${{ github.repository_owner == 'ballerina-platform' }}
-    uses: ballerina-platform/ballerina-library/.github/workflows/central-publish-template.yml@main
+    uses: ballerina-platform/ballerina-library/.github/workflows/central-publish-template.yml@java21
     secrets: inherit
     with:
       environment: ${{ github.event.inputs.environment }}
diff --git a/.github/workflows/process-load-test-result.yml b/.github/workflows/process-load-test-result.yml
@@ -7,7 +7,7 @@ on:
 jobs:
     call_stdlib_process_load_test_results_workflow:
         name: Run StdLib Process Load Test Results Workflow
-        uses: ballerina-platform/ballerina-library/.github/workflows/process-load-test-results-template.yml@main
+        uses: ballerina-platform/ballerina-library/.github/workflows/process-load-test-results-template.yml@java21
         with:
             results: ${{ toJson(github.event.client_payload.results) }}
         secrets:

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -9,7 +9,7 @@ jobs:
   call_workflow:
     name: Run Release Workflow
     if: ${{ github.repository_owner == 'ballerina-platform' }}
-    uses: ballerina-platform/ballerina-library/.github/workflows/release-package-template.yml@main
+    uses: ballerina-platform/ballerina-library/.github/workflows/release-package-template.yml@java21
     secrets: inherit
     with:
       package-name: oauth2

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -10,7 +10,7 @@ jobs:
   call_workflow:
     name: Run PR Build Workflow
     if: ${{ github.repository_owner == 'ballerina-platform' }}
-    uses: ballerina-platform/ballerina-library/.github/workflows/pull-request-build-template.yml@main
+    uses: ballerina-platform/ballerina-library/.github/workflows/pull-request-build-template.yml@java21
     with:
       additional-windows-test-flags: '-x test'
     secrets: inherit
diff --git a/.github/workflows/trigger-load-tests.yml b/.github/workflows/trigger-load-tests.yml
@@ -18,7 +18,7 @@ jobs:
   call_stdlib_trigger_load_test_workflow:
       name: Run StdLib Load Test Workflow
       if: ${{ github.event_name != 'schedule' || (github.event_name == 'schedule' && github.repository_owner == 'ballerina-platform') }}
-      uses: ballerina-platform/ballerina-library/.github/workflows/trigger-load-tests-template.yml@main
+      uses: ballerina-platform/ballerina-library/.github/workflows/trigger-load-tests-template.yml@java21
       with:
         repo_name: 'module-ballerina-oauth2'
         runtime_artifacts_url: 'https://github.com/gitapi/repos/ballerina-platform/module-ballerina-oauth2/actions/artifacts'

diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml
@@ -9,5 +9,5 @@ jobs:
   call_workflow:
     name: Run Trivy Scan Workflow
     if: ${{ github.repository_owner == 'ballerina-platform' }}
-    uses: ballerina-platform/ballerina-library/.github/workflows/trivy-scan-template.yml@main
+    uses: ballerina-platform/ballerina-library/.github/workflows/trivy-scan-template.yml@java21
     secrets: inherit
diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@ This repository only contains the source code for the module.
 
 ### 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
@@ -7,12 +7,12 @@ keywords = ["security", "authorization", "introspection"]
 repository = "https://github.com/ballerina-platform/module-ballerina-oauth2"
 icon = "icon.png"
 license = ["Apache-2.0"]
-distribution = "2201.10.0"
+distribution = "2201.10.0-20241007-143200-6b69ca80"
 
-[platform.java17]
+[platform.java21]
 graalvmCompatible = true
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "oauth2-native"
 version = "2.12.1"

diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml
@@ -5,7 +5,7 @@
 
 [ballerina]
 dependencies-toml-version = "2"
-distribution-version = "2201.10.0"
+distribution-version = "2201.10.0-20241007-143200-6b69ca80"
 
 [[package]]
 org = "ballerina"

diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml
@@ -7,12 +7,12 @@ keywords = ["security", "authorization", "introspection"]
 repository = "https://github.com/ballerina-platform/module-ballerina-oauth2"
 icon = "icon.png"
 license = ["Apache-2.0"]
-distribution = "2201.10.0"
+distribution = "2201.10.0-20241007-143200-6b69ca80"
 
-[platform.java17]
+[platform.java21]
 graalvmCompatible = true
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "oauth2-native"
 version = "@toml.version@"

diff --git a/build.gradle b/build.gradle
@@ -17,10 +17,10 @@
  */
 
 plugins {
-    id "com.github.spotbugs" version "5.0.14"
-    id "com.github.johnrengelman.shadow" version "8.1.1"
-    id "de.undercouch.download" version "5.4.0"
-    id "net.researchgate.release" version "2.8.0"
+    id "com.github.spotbugs" version "${githubSpotbugsVersion}"
+    id "com.github.johnrengelman.shadow" version "${githubJohnrengelmanShadowVersion}"
+    id "de.undercouch.download" version "${underCouchDownloadVersion}"
+    id "net.researchgate.release" version "${researchgateReleaseVersion}"
 }
 
 allprojects {

diff --git a/gradle.properties b/gradle.properties
@@ -3,18 +3,22 @@ group=io.ballerina.stdlib
 version=2.12.1-SNAPSHOT
 puppycrawlCheckstyleVersion=10.12.0
 ballerinaGradlePluginVersion=2.0.1
-ballerinaLangVersion=2201.10.0
+ballerinaLangVersion=2201.10.0-20241007-143200-6b69ca80
+githubJohnrengelmanShadowVersion=8.1.1
+underCouchDownloadVersion=5.4.0
+researchgateReleaseVersion=2.8.0
+githubSpotbugsVersion=6.0.18
 
 # Dependencies
-stdlibCacheVersion=3.8.0
-stdlibCryptoVersion=2.7.2
-stdlibLogVersion=2.10.0
-stdlibTimeVersion=2.4.0
-stdlibUrlVersion=2.4.0
+stdlibCacheVersion=3.8.1-20241007-154900-63f4403
+stdlibCryptoVersion=2.7.3-20240930-132000-5ecc9ab
+stdlibLogVersion=2.10.1-20240930-154200-5ab2aa4
+stdlibTimeVersion=2.5.1-20240930-120200-e59222b
+stdlibUrlVersion=2.4.1-20240930-120200-b7fb9e1
 
 # Transitive dependencies
-stdlibTaskVersion=2.5.0
-stdlibConstraintVersion=1.5.0
-stdlibIoVersion=1.6.0
-observeVersion=1.3.0
-observeInternalVersion=1.3.0
+stdlibTaskVersion=2.5.1-20241002-145700-5bdb843
+stdlibConstraintVersion=1.5.1-20240930-123400-5ecd396
+stdlibIoVersion=1.6.2-20240928-084100-656404f
+observeVersion=1.3.1-20241007-161000-645452d
+observeInternalVersion=1.3.1-20241007-182700-a5f77a1
diff --git a/native/build.gradle b/native/build.gradle
@@ -40,8 +40,11 @@ checkstyle {
 checkstyleMain.dependsOn(":checkstyle:downloadCheckstyleRuleFiles")
 
 spotbugsMain {
-    effort "max"
-    reportLevel "low"
+    def classLoader = plugins["com.github.spotbugs"].class.classLoader
+    def SpotBugsConfidence = classLoader.findLoadedClass("com.github.spotbugs.snom.Confidence")
+    def SpotBugsEffort = classLoader.findLoadedClass("com.github.spotbugs.snom.Effort")
+    effort = SpotBugsEffort.MAX
+    reportLevel = SpotBugsConfidence.LOW
     reportsDir = file("$project.buildDir/reports/spotbugs")
     reports {
         html.enabled true