diff --git a/.github/workflows/build-timestamped-master.yml b/.github/workflows/build-timestamped-master.yml index 7b2e21e6..7da73ba5 100644 --- a/.github/workflows/build-timestamped-master.yml +++ b/.github/workflows/build-timestamped-master.yml @@ -14,12 +14,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' - 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..67725051 100644 --- a/.github/workflows/central-publish.yml +++ b/.github/workflows/central-publish.yml @@ -18,12 +18,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 - name: Build with Gradle env: packageUser: ${{ github.actor }} diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index f6e2d3fe..7b141926 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -10,12 +10,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' - name: Build with Gradle env: packageUser: ${{ github.actor }} diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 407d120c..32c15d36 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -8,12 +8,12 @@ jobs: runs-on: ubuntu-latest 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 - name: Build with Gradle env: packageUser: ${{ github.actor }} @@ -30,12 +30,12 @@ jobs: runs-on: windows-latest 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 - name: Build with Gradle env: packageUser: ${{ github.actor }} diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml index 3e3b3389..fb502e61 100644 --- 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 - name: Build with Gradle env: packageUser: ${{ github.actor }} 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/README.md b/README.md index aaa39adb..e0a74f09 100644 --- a/README.md +++ b/README.md @@ -206,9 +206,9 @@ This repository only contains the source code for the package. ### 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-tests/Ballerina.toml b/ballerina-tests/Ballerina.toml index 8bf8ae04..aaa02a89 100644 --- a/ballerina-tests/Ballerina.toml +++ b/ballerina-tests/Ballerina.toml @@ -3,8 +3,8 @@ org = "ballerina" name = "websub_tests" version = "2.9.0" -[platform.java11] +[platform.java17] graalvmCompatible = true -[[platform.java11.dependency]] +[[platform.java17.dependency]] path = "../native/build/libs/websub-native-2.9.0.jar" diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 12c1babd..0e66afd3 100644 --- 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.stdlib" artifactId = "websub-native" version = "2.9.0" 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 99628b3e..28bfafbd 100644 --- 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 = "websub-native" version = "@toml.version@" diff --git a/build-config/resources/BallerinaTest.toml b/build-config/resources/BallerinaTest.toml index 7e296ca2..f051506d 100644 --- a/build-config/resources/BallerinaTest.toml +++ b/build-config/resources/BallerinaTest.toml @@ -3,8 +3,8 @@ org = "ballerina" name = "websub_tests" version = "@toml.version@" -[platform.java11] +[platform.java17] graalvmCompatible = true -[[platform.java11.dependency]] +[[platform.java17.dependency]] path = "../native/build/libs/websub-native-@project.version@.jar" diff --git a/build.gradle b/build.gradle index 72bc7b3a..c3395906 100644 --- 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/src/test/resources/ballerina_sources/sample_19/Ballerina.toml b/compiler-plugin-tests/src/test/resources/ballerina_sources/sample_19/Ballerina.toml index 0772726d..2ddb15a3 100644 --- a/compiler-plugin-tests/src/test/resources/ballerina_sources/sample_19/Ballerina.toml +++ b/compiler-plugin-tests/src/test/resources/ballerina_sources/sample_19/Ballerina.toml @@ -6,7 +6,7 @@ version = "0.0.1-SNAPSHOT" [build-options] observabilityIncluded = true -[[platform.java11.dependency]] +[[platform.java17.dependency]] path = "./webhook-native-0.0.1-SNAPSHOT.jar" groupId = "io.ballerinax.webhook" artifactId = "webhook-native" diff --git a/gradle.properties b/gradle.properties index 0479b1bf..139e1c01 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,9 +2,9 @@ org.gradle.caching=true group=io.ballerina.stdlib version=2.9.1-SNAPSHOT ballerinaLangVersion= 2201.7.0 -puppycrawlCheckstyleVersion=8.18 -testngVersion=7.4.0 -ballerinaGradlePluginVersion=1.1.0 +puppycrawlCheckstyleVersion=10.12.0 +testngVersion=7.6.1 +ballerinaGradlePluginVersion=2.0.0 gsonVersion=2.8.8 # Direct Dependencies diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 69a97150..98debb84 100644 --- 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-7.6.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/native/build.gradle b/native/build.gradle index e90571ae..629403f2 100644 --- a/native/build.gradle +++ b/native/build.gradle @@ -56,12 +56,12 @@ test { jacocoTestReport { dependsOn test reports { - xml.enabled true + xml.required = true } } checkstyle { - toolVersion '7.8.2' + toolVersion '10.12.0' configFile rootProject.file("build-config/checkstyle/build/checkstyle.xml") configProperties = ["suppressionFile" : file("${rootDir}/build-config/checkstyle/build/suppressions.xml")] } diff --git a/settings.gradle b/settings.gradle index f1ffd3aa..b0f3cd54 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 = 'websub' diff --git a/spotbugs-exclude.xml b/spotbugs-exclude.xml index feaced49..aa7154dd 100644 --- a/spotbugs-exclude.xml +++ b/spotbugs-exclude.xml @@ -16,4 +16,14 @@ ~ under the License. --> + + + + + + + + + +