Merge pull request #92 from ballerina-platform/java_17_migration

Sync Java 17 migration branch with main
ballerina-platform · Jul 31, 2023 · cc1f0df · cc1f0df
2 parents 17d79e4 + b3f280f
commit cc1f0df
Show file tree

Hide file tree

Showing 18 changed files with 351 additions and 230 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-dependent-std-libs.yml b/.github/workflows/build-dependent-std-libs.yml
@@ -30,11 +30,11 @@ jobs:
             matrix:
                 module: ${{ fromJson(inputs.ballerina_modules) }}
         steps:
-            - name: Set up JDK 11
+            - name: Set up JDK 17
               uses: actions/setup-java@v3
               with:
                   distribution: 'temurin'
-                  java-version: 11
+                  java-version: 17
 
             - name: Checkout module
               uses: actions/checkout@v3
@@ -98,11 +98,11 @@ jobs:
             matrix:
                 module: ${{ fromJson(inputs.ballerinax_modules) }}
         steps:
-            - name: Set up JDK 11
+            - name: Set up JDK 17
               uses: actions/setup-java@v3
               with:
                   distribution: 'temurin'
-                  java-version: 11
+                  java-version: 17
 
             - name: Checkout module
               uses: actions/checkout@v3

diff --git a/.github/workflows/build-timestamped-master.yml b/.github/workflows/build-timestamped-master.yml
@@ -14,11 +14,11 @@ jobs:
     if: github.repository_owner == 'ballerina-platform'
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         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/central-publish.yml b/.github/workflows/central-publish.yml
@@ -19,11 +19,11 @@ jobs:
     steps:
       - name: Checkout Repository    
         uses: actions/checkout@v2
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         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
@@ -12,11 +12,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         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
@@ -12,11 +12,11 @@ jobs:
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
           distribution: 'temurin'
-          java-version: 11
+          java-version: 17
       - name: Build with Gradle
         env:
           packageUser: ${{ github.actor }}
@@ -37,11 +37,11 @@ jobs:
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         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
@@ -11,11 +11,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
           distribution: 'temurin'
-          java-version: 11
+          java-version: 17
       - name: Build with Gradle
         env:
           packageUser: ${{ github.actor }}

diff --git a/README.md b/README.md
@@ -22,9 +22,9 @@ This repository only contains the source code for the module.
 
 ### Set 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/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
@@ -9,10 +9,10 @@ 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 = "constraint-native"
 version = "@toml.version@"

diff --git a/build.gradle b/build.gradle
@@ -16,9 +16,9 @@
  */
 
 plugins {
-    id "com.github.spotbugs" version "4.0.5"
-    id "com.github.johnrengelman.shadow" version "5.2.0"
-    id "de.undercouch.download" version "4.0.4"
+    id "com.github.spotbugs" version "5.0.14"
+    id "com.github.johnrengelman.shadow" version "7.1.2"
+    id "de.undercouch.download" version "5.4.0"
     id "net.researchgate.release" version "2.8.0"
 }
 

diff --git a/compiler-plugin-tests/build.gradle b/compiler-plugin-tests/build.gradle
@@ -94,7 +94,7 @@ test {
 jacocoTestReport {
     dependsOn test
     reports {
-        xml.enabled true
+        xml.required = true
     }
     sourceSets project(':constraint-compiler-plugin').sourceSets.main
 }

diff --git a/gradle.properties b/gradle.properties
@@ -1,13 +1,13 @@
 org.gradle.caching=true
 group=io.ballerina.stdlib
 version=1.3.1-SNAPSHOT
-puppycrawlCheckstyleVersion=8.18
+puppycrawlCheckstyleVersion=10.12.0
 slf4jVersion=1.7.30
-testngVersion=7.4.0
-ballerinaGradlePluginVersion=1.1.0
-jacocoVersion=0.8.8
+testngVersion=7.6.1
+ballerinaGradlePluginVersion=2.0.1-SNAPSHOT
+jacocoVersion=0.8.10
 
-ballerinaLangVersion= 2201.7.0
+ballerinaLangVersion=2201.8.0-20230726-145300-b2bdf796
 
 # Test dependency
 stdlibTimeVersion=2.3.0
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