Merge pull request #762 from ballerina-platform/java_17_migration

Sync Java 17 migration branch with master
ballerina-platform · Aug 10, 2023 · ca31d5e · ca31d5e
2 parents 4d2117e + 2483a62
commit ca31d5e
Show file tree

Hide file tree

Showing 18 changed files with 246 additions and 183 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:
  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.0.7
  - 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
@@ -17,12 +17,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.0.7
  - name: Build with Gradle
  env:
  packageUser: ${{ github.actor }}

diff --git a/.github/workflows/daily-build.yml b/.github/workflows/daily-build.yml
@@ -10,13 +10,13 @@ jobs:
  runs-on: ubuntu-latest
 
  steps:
- - 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.0.7
 
  - name: Set environment variable
  if: github.event.action == 'check_connector_for_breaking_changes'

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:
  - 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.0.7
  - name: Build with Gradle
  env:
  packageUser: ${{ github.actor }}

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -13,12 +13,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.0.7
  - name: Build with Gradle
  env:
  packageUser: ${{ github.actor }}
@@ -46,12 +46,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.0.7
  - 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.0.7
  - name: Build with Gradle
  env:
  packageUser: ${{ github.actor }}

diff --git a/README.md b/README.md
@@ -143,9 +143,9 @@ This repository only contains the source code for the library.
 
 ### Set up the prerequisites
 
-* Download and install Java SE Development Kit (JDK) version 11 (from one of the following locations).
+* 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,19 +9,19 @@ icon = "icon.png"
 license = ["Apache-2.0"]
 distribution = "2201.7.0"
 
-[platform.java11]
+[platform.java17]
 graalvmCompatible = true
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 path = "./lib/jnats-2.16.0.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "nats-native"
 version = "2.9.0"
 path = "../native/build/libs/nats-native-2.9.0.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "constraint-native"
 version = "1.3.0"

diff --git a/build-config/checkstyle/build.gradle b/build-config/checkstyle/build.gradle
@@ -19,12 +19,12 @@ plugins {
  id "de.undercouch.download"
 }
 
-apply plugin: 'java'
+apply plugin: 'java-library'
 
 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,19 +9,19 @@ icon = "icon.png"
 license = ["Apache-2.0"]
 distribution = "2201.7.0"
 
-[platform.java11]
+[platform.java17]
 graalvmCompatible = true
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 path = "./lib/jnats-@nats.client.version@.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "nats-native"
 version = "@toml.version@"
 path = "../native/build/libs/nats-native-@project.version@.jar"
 
-[[platform.java11.dependency]]
+[[platform.java17.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "constraint-native"
 version = "@constraint.version@"

diff --git a/build.gradle b/build.gradle
@@ -17,9 +17,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 "8.1.1"
+ id "de.undercouch.download" version "5.4.0"
  id "net.researchgate.release" version "2.8.0"
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -2,20 +2,20 @@ org.gradle.caching=true
 group=io.ballerina.stdlib
 
 version=2.9.1-SNAPSHOT
-ballerinaLangVersion= 2201.7.0
-ballerinaGradlePluginVersion=1.1.0
+ballerinaLangVersion=2201.8.0-20230726-145300-b2bdf796
+ballerinaGradlePluginVersion=2.0.1-SNAPSHOT
 
 natsVersion=2.16.0
-puppycrawlCheckstyleVersion=8.18
-testngVersion=7.4.0
+puppycrawlCheckstyleVersion=10.12.1
+testngVersion=7.6.1
 gsonVersion=2.8.8
 
 stdlibConstraintVersion=1.3.0
 stdlibIoVersion=1.5.0
-stdlibLogVersion=2.8.0
+stdlibLogVersion=2.8.1-20230718-085900-36c385c
 stdlibCryptoVersion=2.4.0
 stdlibTimeVersion=2.3.0
 observeVersion=1.1.0
 observeInternalVersion=1.1.0
 
-jacocoVersion=0.8.8
+jacocoVersion=0.8.10
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