Merge pull request #1687 from gabilang/java_17_migration

Migrate to Java 17
ballerina-platform · Jun 28, 2023 · d156778 · d156778
2 parents 8990c0c + baf9099
commit d156778
Show file tree

Hide file tree

Showing 24 changed files with 224 additions and 87 deletions.
diff --git a/.github/workflows/build-timestamped-master.yml b/.github/workflows/build-timestamped-master.yml
@@ -16,9 +16,9 @@ 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
+ uses: actions/setup-java@v3
  with:
  distribution: 'temurin'
  java-version: 11

diff --git a/.github/workflows/build-with-ballerina-lang.yml b/.github/workflows/build-with-ballerina-lang.yml
@@ -31,7 +31,7 @@ jobs:
  ref: ${{ inputs.lang_tag || 'master' }}
 
  - name: Set up JDK 11
- uses: actions/setup-java@v2
+ uses: actions/setup-java@v3
  with:
  distribution: 'temurin'
  java-version: 11
@@ -78,7 +78,7 @@ jobs:
  ref: ${{ inputs.lang_tag || 'master' }}
 
  - name: Set up JDK 11
- uses: actions/setup-java@v2
+ uses: actions/setup-java@v3
  with:
  distribution: 'temurin'
  java-version: 11

diff --git a/.github/workflows/central-publish.yml b/.github/workflows/central-publish.yml
@@ -18,9 +18,9 @@ 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
+ uses: actions/setup-java@v3
  with:
  distribution: 'temurin'
  java-version: 11

diff --git a/.github/workflows/on-demand-urgent-build-timestamped-master-without-tests.yml b/.github/workflows/on-demand-urgent-build-timestamped-master-without-tests.yml
@@ -9,9 +9,9 @@ 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
+ uses: actions/setup-java@v3
  with:
  distribution: 'temurin'
  java-version: 11

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -12,9 +12,9 @@ jobs:
 
  steps:
  - name: Checkout Repository
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
  - name: Set up JDK 11
- uses: actions/setup-java@v2
+ uses: actions/setup-java@v3
  with:
  distribution: 'temurin'
  java-version: 11

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -12,9 +12,9 @@ jobs:
  cancel-in-progress: true
  steps:
  - name: Checkout Repository
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
  - name: Set up JDK 11
- uses: actions/setup-java@v2
+ uses: actions/setup-java@v3
  with:
  distribution: 'temurin'
  java-version: 11
@@ -39,9 +39,9 @@ jobs:
  cancel-in-progress: true
  steps:
  - name: Checkout Repository
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
  - name: Set up JDK 11
- uses: actions/setup-java@v2
+ uses: actions/setup-java@v3
  with:
  distribution: 'temurin'
  java-version: 11
@@ -62,9 +62,9 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout Repository
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
  - name: Set up JDK 11
- uses: actions/setup-java@v2
+ uses: actions/setup-java@v3
  with:
  distribution: 'temurin'
  java-version: 11

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

diff --git a/.github/workflows/update_specs.yml b/.github/workflows/update_specs.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
@@ -117,9 +117,9 @@ This repository only contains the source code for the package.
 
 ### 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/javase-jdk17-downloads.html)
 
  * [OpenJDK](https://adoptium.net/)
 

diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml
@@ -10,157 +10,157 @@ license = ["Apache-2.0"]
 distribution = "2201.7.0"
 export = ["http", "http.httpscerr"]
 
-[platform.java11]
+[platform.java17]
 graalvmCompatible = true
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "http-native"
 version = "2.9.0"
 path = "../native/build/libs/http-native-2.9.0-SNAPSHOT.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "mime-native"
 version = "2.8.0"
-path = "./lib/mime-native-2.8.0-20230620-205000-a1e0453.jar"
+path = "./lib/mime-native-2.8.0-20230622-135900-25e4923.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "constraint-native"
 version = "1.3.0"
-path = "./lib/constraint-native-1.3.0-20230620-195700-ca941bc.jar"
+path = "./lib/constraint-native-1.3.0-20230622-115000-e1ca592.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-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-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-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-codec-http"
 version = "4.1.94.Final"
 path = "./lib/netty-codec-http-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-handler-proxy"
 version = "4.1.94.Final"
 path = "./lib/netty-handler-proxy-4.1.94.Final.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "io.netty"
 artifactId = "netty-codec-http2"
 version = "4.1.94.Final"
 path = "./lib/netty-codec-http2-4.1.94.Final.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "commons-pool.wso2"
 artifactId = "commons-pool"
 version = "1.5.6.wso2v1"
 path = "./lib/commons-pool-1.5.6.wso2v1.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 = "org.bouncycastle"
 artifactId = "bcprov-jdk15on"
 version = "1.69"
 path = "./lib/bcprov-jdk15on-1.69.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "org.bouncycastle"
 artifactId = "bcpkix-jdk15on"
 version = "1.69"
 path = "./lib/bcpkix-jdk15on-1.69.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "io.netty"
 artifactId = "netty-tcnative-boringssl-static"
 version = "2.0.61.Final"
 path = "./lib/netty-tcnative-boringssl-static-2.0.61.Final.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 path = "./lib/netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 path = "./lib/netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 path = "./lib/netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 path = "./lib/netty-tcnative-boringssl-static-2.0.61.Final-osx-aarch_64.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 path = "./lib/netty-tcnative-boringssl-static-2.0.61.Final-osx-x86_64.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "io.netty"
 artifactId = "netty-tcnative-classes"
 version = "2.0.61.Final"
 path = "./lib/netty-tcnative-classes-2.0.61.Final.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "org.jvnet.mimepull"
 artifactId = "mimepull"
 version = "1.9.11"
 path = "./lib/mimepull-1.9.11.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 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.gradle b/build.gradle
@@ -16,9 +16,9 @@
  */
 
 plugins {
- id "com.github.spotbugs" version "4.2.3"
- 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 "8.1.0"
+ 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
@@ -95,7 +95,7 @@ test {
 jacocoTestReport {
  dependsOn test
  reports {
- xml.enabled true
+ xml.required = true
  }
  sourceSets project(':http-compiler-plugin').sourceSets.main
 }

diff --git a/compiler-plugin/build.gradle b/compiler-plugin/build.gradle
@@ -54,7 +54,7 @@ spotbugsMain {
  html.enabled true
  text.enabled = true
  }
- def excludeFile = file("${rootDir}/spotbugs-exclude.xml")
+ def excludeFile = file('spotbugs-exclude.xml')
  if(excludeFile.exists()) {
  excludeFilter = excludeFile
  }