Merge pull request #1075 from ballerina-platform/java_17_migration

Sync Java 17 changes with master
ballerina-platform · Jul 31, 2023 · d96f081 · d96f081
2 parents 94fdf9e + b5d9731
commit d96f081
Show file tree

Hide file tree

Showing 20 changed files with 340 additions and 185 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
@@ -15,12 +15,12 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository_owner == 'ballerina-platform'
     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: Change to Timestamped Version
         run: |
           startTime=$(TZ="Asia/Kolkata" date +'%Y%m%d-%H%M00')

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 buid 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,12 +18,12 @@ jobs:
     if: github.repository_owner == 'ballerina-platform'
     steps:
       - name: Checkout Repository
-        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:
           packageUser: ${{ github.actor }}

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -11,12 +11,12 @@ jobs:
     if: github.repository_owner == 'ballerina-platform'
 
     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:
           packageUser: ${{ github.actor }}

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -9,12 +9,12 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        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:
           packageUser: ${{ github.actor }}
@@ -38,12 +38,12 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        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:
           packageUser: ${{ github.actor }}

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:
           packageUser: ${{ github.actor }}

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
@@ -113,9 +113,9 @@ This repository only contains the source code for the package.
 
 ### Setting up the 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/)
 

diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml
@@ -9,80 +9,80 @@ 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 = "tcp-native"
 version = "1.8.0"
 path = "../native/build/libs/tcp-native-1.8.0.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 path = "../test-utils/build/libs/tcp-test-utils-1.8.0.jar"
 scope = "testOnly"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "io.netty"
 artifactId = "netty-handler"
 version = "4.1.94.Final"
 path = "./lib/netty-handler-4.1.94.Final.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "io.netty"
 artifactId = "netty-buffer"
 version = "4.1.94.Final"
 path = "./lib/netty-buffer-4.1.94.Final.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "io.netty"
 artifactId = "netty-transport"
 version = "4.1.94.Final"
 path = "./lib/netty-transport-4.1.94.Final.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "io.netty"
 artifactId = "netty-common"
 version = "4.1.94.Final"
 path = "./lib/netty-common-4.1.94.Final.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "io.netty"
 artifactId = "netty-resolver"
 version = "4.1.94.Final"
 path = "./lib/netty-resolver-4.1.94.Final.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "io.netty"
 artifactId = "netty-codec"
 version = "4.1.94.Final"
 path = "./lib/netty-codec-4.1.94.Final.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "io.netty"
 artifactId = "netty-transport-native-unix-common"
 version = "4.1.94.Final"
 path = "./lib/netty-transport-native-unix-common-4.1.94.Final.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "io.netty"
 artifactId = "netty-codec-socks"
 version = "4.1.94.Final"
 path = "./lib/netty-codec-socks-4.1.94.Final.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "org.jboss.marshalling"
 artifactId = "jboss-marshalling"
 version = "2.0.5.Final"
 path = "./lib/jboss-marshalling-2.0.5.Final.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "net.jpountz.lz4"
 artifactId = "lz4"
 version = "1.3.0"
 path = "./lib/lz4-1.3.0.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "com.google.protobufl"
 artifactId = "protobuf-java"
 version = "3.20.3"

diff --git a/build-config/checkstyle/build.gradle b/build-config/checkstyle/build.gradle
@@ -23,8 +23,8 @@ apply plugin: 'java'
 
 task downloadMultipleFiles(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
@@ -9,80 +9,80 @@ 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 = "tcp-native"
 version = "@toml.version@"
 path = "../native/build/libs/tcp-native-@project.version@.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 path = "../test-utils/build/libs/tcp-test-utils-@project.version@.jar"
 scope = "testOnly"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "io.netty"
 artifactId = "netty-handler"
 version = "@netty.version@"
 path = "./lib/netty-handler-@netty.version@.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "io.netty"
 artifactId = "netty-buffer"
 version = "@netty.version@"
 path = "./lib/netty-buffer-@netty.version@.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "io.netty"
 artifactId = "netty-transport"
 version = "@netty.version@"
 path = "./lib/netty-transport-@netty.version@.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "io.netty"
 artifactId = "netty-common"
 version = "@netty.version@"
 path = "./lib/netty-common-@netty.version@.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "io.netty"
 artifactId = "netty-resolver"
 version = "@netty.version@"
 path = "./lib/netty-resolver-@netty.version@.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "io.netty"
 artifactId = "netty-codec"
 version = "@netty.version@"
 path = "./lib/netty-codec-@netty.version@.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "io.netty"
 artifactId = "netty-transport-native-unix-common"
 version = "@netty.version@"
 path = "./lib/netty-transport-native-unix-common-@netty.version@.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "io.netty"
 artifactId = "netty-codec-socks"
 version = "@netty.version@"
 path = "./lib/netty-codec-socks-@netty.version@.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "org.jboss.marshalling"
 artifactId = "jboss-marshalling"
 version = "@marshalling.version@"
 path = "./lib/jboss-marshalling-@marshalling.version@.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "net.jpountz.lz4"
 artifactId = "lz4"
 version = "@lz4.version@"
 path = "./lib/lz4-@lz4.version@.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "com.google.protobufl"
 artifactId = "protobuf-java"
 version = "@protobuf.version@"