Merge pull request #244 from gabilang/java_17_migration

Migrate to Java 17
ballerina-platform · Jun 26, 2023 · 2e19c0b · 2e19c0b
2 parents de3de08 + f888280
commit 2e19c0b
Show file tree

Hide file tree

Showing 17 changed files with 64 additions and 36 deletions.
diff --git a/.github/workflows/build-timestamped-master.yml b/.github/workflows/build-timestamped-master.yml
@@ -17,11 +17,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: |
  initialVersion=$((grep -w 'version' | cut -d= -f2) < gradle.properties )

diff --git a/.github/workflows/central-publish.yml b/.github/workflows/central-publish.yml
@@ -18,11 +18,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: Build with Gradle
  env:
  packageUser: ${{ github.actor }}

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -11,11 +11,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: Build with Gradle
  env:
  packageUser: ${{ github.actor }}

diff --git a/.github/workflows/publish-snapshot-nexus.yml b/.github/workflows/publish-snapshot-nexus.yml
@@ -9,11 +9,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: Build with Gradle
  env:
  packageUser: ${{ secrets.BALLERINA_BOT_USERNAME }}

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -12,11 +12,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 }}
@@ -35,11 +35,11 @@ jobs:
  runs-on: windows-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/.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
@@ -179,8 +179,8 @@ 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).
- * [Oracle](https://www.oracle.com/java/technologies/javase-jdk11-downloads.html)
+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-jdk17-downloads.html)
  * [OpenJDK](https://adoptium.net/)
 
 2. Export your GitHub personal access token with the read package permissions as follows.

diff --git a/ballerina/Ballerina.toml b/ballerina/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.persist"
 artifactId = "persist-native"
 version = "1.1.0"

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.persist"
 artifactId = "persist-native"
 version = "@toml.version@"

diff --git a/compiler-plugin-test/build.gradle b/compiler-plugin-test/build.gradle
@@ -24,7 +24,7 @@ plugins {
 }
 
 jacoco {
- toolVersion = "0.8.6"
+ toolVersion = "0.8.10"
 }
 
 description = 'Ballerina - Persist Compiler Plugin Test'
@@ -39,6 +39,7 @@ dependencies {
  testImplementation group: 'org.ballerinalang', name: 'ballerina-tools-api', version: "${ballerinaLangVersion}"
  testImplementation group: 'org.ballerinalang', name: 'ballerina-parser', version: "${ballerinaLangVersion}"
  implementation group: 'org.testng', name: 'testng', version: "${testngVersion}"
+ testImplementation 'org.testng:testng'
  testImplementation group: 'com.google.code.gson', name: 'gson', version: "${gsonVersion}"
 }
 
@@ -74,7 +75,7 @@ jacocoTestReport {
  additionalClassDirs files(it.sourceSets.main.output)
  }
  reports {
- xml.enabled true
+ xml.required = true
  }
 }
 

diff --git a/compiler-plugin-test/src/test/resources/testng.xml b/compiler-plugin-test/src/test/resources/testng.xml
@@ -16,7 +16,7 @@
  ~ under the License.
  -->
 
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+<!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd" >
 
 <suite name="BallerinaPersistCompilerPluginTests">
  <test name="UnitTests">

diff --git a/gradle.properties b/gradle.properties
@@ -1,15 +1,15 @@
 group=io.ballerina.stdlib
 version=1.1.0-SNAPSHOT
 
-puppycrawlCheckstyleVersion=8.18
+puppycrawlCheckstyleVersion=10.12.0
 checkstyleToolVersion=7.8.2
-githubSpotbugsVersion=4.0.5
-githubJohnrengelmanShadowVersion=5.2.0
-underCouchDownloadVersion=4.0.4
+githubSpotbugsVersion=5.0.14
+githubJohnrengelmanShadowVersion=8.1.0
+underCouchDownloadVersion=5.4.0
 researchgateReleaseVersion=2.8.0
-testngVersion=7.4.0
-gsonVersion=2.10
-ballerinaGradlePluginVersion=1.1.0
+testngVersion=7.6.1
+gsonVersion=2.10.1
+ballerinaGradlePluginVersion=2.0.0
 
 ballerinaLangVersion= 2201.7.0-20230622-064700-4a2dc6dd
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 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.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/native/build.gradle b/native/build.gradle
@@ -45,7 +45,7 @@ tasks.withType(JavaCompile) {
 sourceCompatibility = JavaVersion.VERSION_11
 
 jacoco {
- toolVersion = "0.8.6"
+ toolVersion = "0.8.10"
 }
 
 test {
@@ -70,7 +70,7 @@ test {
 jacocoTestReport {
  dependsOn test
  reports {
- xml.enabled true
+ xml.required = true
  }
 }
 

diff --git a/settings.gradle b/settings.gradle
@@ -8,7 +8,7 @@
  */
 
 plugins {
- id "com.gradle.enterprise" version "3.2"
+ id "com.gradle.enterprise" version "3.13.2"
 }
 
 rootProject.name = 'ballerina-persist'

diff --git a/spotbugs-exclude.xml b/spotbugs-exclude.xml
@@ -0,0 +1,27 @@
+<!--
+ ~ Copyright (c) 2023, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ ~
+ ~ WSO2 Inc. licenses this file to you under the Apache License,
+ ~ Version 2.0 (the "License"); you may not use this file except
+ ~ in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<FindBugsFilter>
+ <Match>
+ <Class name="io.ballerina.stdlib.persist.compiler.model.Entity"/>
+ <Bug pattern="EI_EXPOSE_REP, EI_EXPOSE_REP2"/>
+ </Match>
+ <Match>
+ <Class name="io.ballerina.stdlib.persist.compiler.model.GroupedRelationField"/>
+ <Bug pattern="EI_EXPOSE_REP"/>
+ </Match>
+</FindBugsFilter>