From ce67b9f2e1c6c82b00091a52dda2334db24b115d Mon Sep 17 00:00:00 2001 From: gabilang Date: Sun, 25 Jun 2023 15:29:16 +0530 Subject: [PATCH 1/3] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 6ae2bec6..94225083 100755 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -9,34 +9,34 @@ icon = "icon.png" license = ["Apache-2.0"] distribution = "2201.7.0" -[platform.java11] +[platform.java17] graalvmCompatible = true -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "com.sun.mail" artifactId = "javax.mail" version = "1.6.2" path = "./lib/javax.mail-1.6.2.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "com.icegreen" artifactId = "greenmail" version = "1.5.11" path = "./lib/greenmail-1.5.11.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.ballerina.stdlib" artifactId = "email-native" version = "2.8.0" path = "../native/build/libs/email-native-2.8.0-SNAPSHOT.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "io.ballerina.stdlib" artifactId = "email-test-utils" version = "2.8.0" From b14288edfaa271a36d31a6599fabcb0ad8eb6aa6 Mon Sep 17 00:00:00 2001 From: gabilang Date: Sun, 25 Jun 2023 15:30:03 +0530 Subject: [PATCH 2/3] Migrate to Java 17 --- .github/workflows/build-timestamped-master.yml | 4 ++-- .github/workflows/central-publish.yml | 4 ++-- .github/workflows/publish-release.yml | 4 ++-- .github/workflows/pull-request.yml | 8 ++++---- .github/workflows/trivy-scan.yml | 4 ++-- README.md | 4 ++-- build-config/checkstyle/build.gradle | 4 ++-- build-config/resources/Ballerina.toml | 12 ++++++------ build-config/spotbugs-exclude.xml | 4 ++++ gradle.properties | 12 ++++++------ gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 2 +- 12 files changed, 34 insertions(+), 30 deletions(-) diff --git a/.github/workflows/build-timestamped-master.yml b/.github/workflows/build-timestamped-master.yml index f95fcbc0..2a47c8ad 100644 --- a/.github/workflows/build-timestamped-master.yml +++ b/.github/workflows/build-timestamped-master.yml @@ -18,11 +18,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: 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 index 2d1aea76..7a33b4b6 100644 --- 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 index 0c32a404..4063d20e 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -12,11 +12,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/pull-request.yml b/.github/workflows/pull-request.yml index f8dc307c..50421840 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -9,11 +9,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 }} @@ -31,11 +31,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/trivy-scan.yml b/.github/workflows/trivy-scan.yml index 3e3b3389..2939fd12 100644 --- 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 index 6e21e834..a4a53583 100644 --- a/README.md +++ b/README.md @@ -345,9 +345,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/build-config/checkstyle/build.gradle b/build-config/checkstyle/build.gradle index b89ab41f..1dbe8db0 100644 --- 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 index ed74cc2b..2dbdda87 100644 --- a/build-config/resources/Ballerina.toml +++ b/build-config/resources/Ballerina.toml @@ -9,34 +9,34 @@ icon = "icon.png" license = ["Apache-2.0"] distribution = "2201.7.0" -[platform.java11] +[platform.java17] graalvmCompatible = true -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "com.sun.mail" artifactId = "javax.mail" version = "1.6.2" path = "./lib/javax.mail-1.6.2.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "com.icegreen" artifactId = "greenmail" version = "1.5.11" path = "./lib/greenmail-1.5.11.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.ballerina.stdlib" artifactId = "email-native" version = "@toml.version@" path = "../native/build/libs/email-native-@project.version@.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "io.ballerina.stdlib" artifactId = "email-test-utils" version = "@toml.version@" diff --git a/build-config/spotbugs-exclude.xml b/build-config/spotbugs-exclude.xml index 1c0ff5b1..54571610 100644 --- a/build-config/spotbugs-exclude.xml +++ b/build-config/spotbugs-exclude.xml @@ -25,4 +25,8 @@ + + + + diff --git a/gradle.properties b/gradle.properties index 74d0d76f..577620c1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,15 +2,15 @@ org.gradle.caching=true group=io.ballerina.stdlib version=2.8.0-SNAPSHOT slf4jVersion=1.7.30 -testngVersion=7.4.0 +testngVersion=7.6.1 javaMailVersion=1.6.2 greenmailVersion=1.5.11 mimepullVersion=1.9.11 -puppycrawlCheckstyleVersion=8.18 -checkstylePluginVersion=8.18 -githubSpotbugsVersion=4.5.1 -githubJohnrengelmanShadowVersion=5.2.0 -underCouchDownloadVersion=4.0.4 +puppycrawlCheckstyleVersion=10.12.0 +checkstylePluginVersion=10.12.0 +githubSpotbugsVersion=5.0.14 +githubJohnrengelmanShadowVersion=8.1.0 +underCouchDownloadVersion=5.4.0 researchgateReleaseVersion=2.8.0 ballerinaGradlePluginVersion=1.1.0 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 48ccd95d..9b364075 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ #Tue Oct 08 08:23:30 IST 2020 -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index 45b1197a..a11649f7 100644 --- 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 = 'email' From 7e1f1359920ab0b4d8d70d41788fe2bf9f1f6c4c Mon Sep 17 00:00:00 2001 From: gabilang Date: Tue, 27 Jun 2023 13:52:41 +0530 Subject: [PATCH 3/3] Update gradle plugin and workflow action versions --- .github/workflows/build-timestamped-master.yml | 4 ++-- .github/workflows/central-publish.yml | 4 ++-- .github/workflows/publish-release.yml | 4 ++-- .github/workflows/pull-request.yml | 8 ++++---- .github/workflows/trivy-scan.yml | 4 ++-- .github/workflows/update_specs.yml | 2 +- gradle.properties | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build-timestamped-master.yml b/.github/workflows/build-timestamped-master.yml index 2a47c8ad..8f0ee367 100644 --- a/.github/workflows/build-timestamped-master.yml +++ b/.github/workflows/build-timestamped-master.yml @@ -17,9 +17,9 @@ jobs: if: github.repository_owner == 'ballerina-platform' steps: - name: Checkout Repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up JDK 17 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'temurin' java-version: 17 diff --git a/.github/workflows/central-publish.yml b/.github/workflows/central-publish.yml index 7a33b4b6..67725051 100644 --- 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 17 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'temurin' java-version: 17 diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 4063d20e..b2740206 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -11,9 +11,9 @@ jobs: if: github.repository_owner == 'ballerina-platform' steps: - name: Checkout Repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up JDK 17 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'temurin' java-version: 17 diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 50421840..461e3ae4 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -8,9 +8,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up JDK 17 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'temurin' java-version: 17 @@ -30,9 +30,9 @@ jobs: runs-on: windows-latest steps: - name: Checkout Repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up JDK 17 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'temurin' java-version: 17 diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml index 2939fd12..fb502e61 100644 --- 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 17 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'temurin' java-version: 17 diff --git a/.github/workflows/update_specs.yml b/.github/workflows/update_specs.yml index 3af6d4a4..7815278d 100644 --- 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/gradle.properties b/gradle.properties index 577620c1..d0eda103 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ githubSpotbugsVersion=5.0.14 githubJohnrengelmanShadowVersion=8.1.0 underCouchDownloadVersion=5.4.0 researchgateReleaseVersion=2.8.0 -ballerinaGradlePluginVersion=1.1.0 +ballerinaGradlePluginVersion=2.0.0 ballerinaLangVersion= 2201.7.0-20230622-064700-4a2dc6dd stdlibTaskVersion=2.4.0-20230622-115600-696d07f