Merge pull request #1550 from ballerina-platform/java_17_migration

Sync Java 17 changes into master
ballerina-platform · Jul 31, 2023 · 8c1e8a3 · 8c1e8a3
2 parents 90fe196 + e9a54e6
commit 8c1e8a3
Show file tree

Hide file tree

Showing 18 changed files with 257 additions and 161 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+# Ensure all Java files use LF.
+*.java eol=lf
diff --git a/.github/workflows/build-timestamped-master.yml b/.github/workflows/build-timestamped-master.yml
@@ -17,13 +17,13 @@ jobs:
         if: github.repository_owner == 'ballerina-platform'
         steps:
             -   name: Checkout Repository
-                uses: actions/checkout@v2
+                uses: actions/checkout@v3
 
-            -   name: Set up JDK 11
-                uses: actions/setup-java@v2
+            -   name: Set up JDK 17
+                uses: actions/setup-java@v3
                 with:
                     distribution: 'temurin'
-                    java-version: 11
+                    java-version: 17
 
             -   name: Change to Timestamped Version
                 run: |

diff --git a/.github/workflows/build-with-bal-test-graalvm.yml b/.github/workflows/build-with-bal-test-graalvm.yml
@@ -6,7 +6,7 @@ on:
             lang_tag:
                 description: Branch/Release Tag of the Ballerina Lang
                 required: true
-                default: master
+                default: java_17_migration
             lang_version:
                 description: Ballerina Lang Version (If given ballerina lang build will be skipped)
                 required: false
@@ -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-standard-library/.github/workflows/build-with-bal-test-graalvm-template.yml@main
+        uses: ballerina-platform/ballerina-standard-library/.github/workflows/build-with-bal-test-graalvm-template.yml@java_17_migration
         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
@@ -18,13 +18,13 @@ jobs:
         if: github.repository_owner == 'ballerina-platform'
         steps:
             -   name: Checkout Repository
-                uses: actions/checkout@v2
+                uses: actions/checkout@v3
 
-            -   name: Set up JDK 11
-                uses: actions/setup-java@v2
+            -   name: Set up JDK 17
+                uses: actions/setup-java@v3
                 with:
                     distribution: 'temurin'
-                    java-version: 11
+                    java-version: 17
 
             -   name: Build with Gradle
                 env:

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -12,13 +12,13 @@ jobs:
         if: github.repository_owner == 'ballerina-platform'
         steps:
             -   name: Checkout Repository
-                uses: actions/checkout@v2
+                uses: actions/checkout@v3
 
-            -   name: Set up JDK 11
-                uses: actions/setup-java@v2
+            -   name: Set up JDK 17
+                uses: actions/setup-java@v3
                 with:
                     distribution: 'temurin'
-                    java-version: 11
+                    java-version: 17
 
             -   name: Build with Gradle
                 env:

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -14,11 +14,11 @@ jobs:
             -   name: Checkout Repository
                 uses: actions/checkout@v1
 
-            -   name: Set up JDK 11
-                uses: actions/setup-java@v2
+            -   name: Set up JDK 17
+                uses: actions/setup-java@v3
                 with:
                     distribution: 'temurin'
-                    java-version: 11
+                    java-version: 17
 
             -   name: Build the Package
                 env:
@@ -43,11 +43,11 @@ jobs:
             -   name: Checkout Repository
                 uses: actions/checkout@v1
 
-            -   name: Set up JDK 11
-                uses: actions/setup-java@v2
+            -   name: Set up JDK 17
+                uses: actions/setup-java@v3
                 with:
                     distribution: 'temurin'
-                    java-version: 11
+                    java-version: 17
 
             -   name: Build the Project
                 env:

diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml
@@ -10,12 +10,12 @@ jobs:
         name: Build on Ubuntu
         runs-on: ubuntu-latest
         steps:
-            -   uses: actions/checkout@v2
-            -   name: Set up JDK 11
-                uses: actions/setup-java@v2
+            -   uses: actions/checkout@v3
+            -   name: Set up JDK 17
+                uses: actions/setup-java@v3
                 with:
                     distribution: 'temurin'
-                    java-version: 11
+                    java-version: 17
 
             -   name: Build with Gradle
                 env:

diff --git a/.github/workflows/update-spec.yml b/.github/workflows/update-spec.yml
@@ -19,7 +19,7 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Get current date
         id: date

diff --git a/README.md b/README.md
@@ -999,9 +999,9 @@ This repository only contains the source code for the module.
 
 ### Prerequisites
 
-1. Download and install Java SE Development Kit (JDK) version 11 (from one of the following locations).
+1. Download and install Java SE Development Kit (JDK) version 17 (from one of the following locations).
 
-   * [Oracle](https://www.oracle.com/java/technologies/javase-jdk11-downloads.html)
+   * [Oracle](https://www.oracle.com/java/technologies/downloads/)
    * [OpenJDK](https://adoptium.net/)
 
         > **Note:** Set the JAVA_HOME environment variable to the path name of the directory into which you installed JDK.

diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml
@@ -10,16 +10,16 @@ icon = "icon.png"
 license = ["Apache-2.0"]
 distribution = "2201.7.0"
 
-[platform.java11]
+[platform.java17]
 graalvmCompatible = true
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "graphql-native"
 version = "1.9.1"
 path = "../native/build/libs/graphql-native-1.9.1-SNAPSHOT.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "graphql-commons"
 version = "1.9.1"

diff --git a/build-config/checkstyle/build.gradle b/build-config/checkstyle/build.gradle
@@ -23,8 +23,8 @@ apply plugin: 'java'
 
 task downloadCheckstyleRuleFiles(type: Download) {
     src([
-            'https://raw.githubusercontent.com/wso2/code-quality-tools/v1.3/checkstyle/checkstyle.xml',
-            'https://raw.githubusercontent.com/wso2/code-quality-tools/v1.3/checkstyle/suppressions.xml'
+            'https://raw.githubusercontent.com/wso2/code-quality-tools/v1.4/checkstyle/jdk-17/checkstyle.xml',
+            'https://raw.githubusercontent.com/wso2/code-quality-tools/v1.4/checkstyle/jdk-17/suppressions.xml'
     ])
     overwrite false
     onlyIfNewer true

diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml
@@ -10,16 +10,16 @@ icon = "icon.png"
 license = ["Apache-2.0"]
 distribution = "2201.7.0"
 
-[platform.java11]
+[platform.java17]
 graalvmCompatible = true
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "graphql-native"
 version = "@toml.version@"
 path = "../native/build/libs/[email protected]@.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "graphql-commons"
 version = "@toml.version@"

diff --git a/gradle.properties b/gradle.properties
@@ -1,17 +1,17 @@
 org.gradle.caching=true
 group=io.ballerina.stdlib
 version=1.9.1-SNAPSHOT
-ballerinaLangVersion=2201.7.0
-
-checkstylePluginVersion=8.18
-spotbugsPluginVersion=4.5.1
-shadowJarPluginVersion=5.2.0
-downloadPluginVersion=4.0.4
-releasePluginVersion=2.6.0
-testngVersion=7.4.0
+ballerinaLangVersion=2201.8.0-20230726-145300-b2bdf796
+
+checkstylePluginVersion=10.12.0
+spotbugsPluginVersion=5.0.14
+shadowJarPluginVersion=8.1.1
+downloadPluginVersion=5.4.0
+releasePluginVersion=2.8.0
+testngVersion=7.6.1
 eclipseLsp4jVersion=0.12.0
-ballerinaGradlePluginVersion=1.1.0
-jacocoVersion=0.8.8
+ballerinaGradlePluginVersion=2.0.1-SNAPSHOT
+jacocoVersion=0.8.10
 
 # Standard Library Dependencies
 # Level 01

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists