diff --git a/.github/workflows/build-timestamped-master.yml b/.github/workflows/build-timestamped-master.yml index 5f175ce..39c43ce 100644 --- a/.github/workflows/build-timestamped-master.yml +++ b/.github/workflows/build-timestamped-master.yml @@ -12,11 +12,11 @@ jobs: if: github.repository_owner == 'ballerina-platform' steps: - uses: actions/checkout@v3 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v3 with: distribution: 'adopt' - java-version: 17.0.7 + java-version: 21.0.3 - name: Change to Timestamped Version run: | startTime=$(TZ="Asia/Kolkata" date +'%Y%m%d-%H%M00') @@ -29,7 +29,7 @@ jobs: run: chmod +x gradlew - uses: graalvm/setup-graalvm@v1 with: - java-version: '17.0.7' + java-version: '21.0.1' distribution: 'graalvm-community' components: 'native-image' github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/central-publish.yml b/.github/workflows/central-publish.yml index fd7bbc5..4463b1a 100644 --- 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@v3 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: 17.0.7 + java-version: 21.0.3 - name: Build with Gradle env: packageUser: ${{ github.actor }} diff --git a/.github/workflows/daily-build.yml b/.github/workflows/daily-build.yml index c2167f3..3231978 100644 --- a/.github/workflows/daily-build.yml +++ b/.github/workflows/daily-build.yml @@ -11,11 +11,11 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v3 with: distribution: adopt - java-version: 17.0.7 + java-version: 21.0.3 # Build the project with Gradle - name: Build with Gradle diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 5d745f0..a5279d1 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -9,11 +9,11 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v3 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v3 with: distribution: adopt - java-version: 17.0.7 + java-version: 21.0.3 - name: Set version env variable run: echo "VERSION=$((grep -w 'version' | cut -d= -f2) < gradle.properties | rev | cut --complement -d- -f1 | rev)" >> $GITHUB_ENV - name: Pre release depenency version update diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index d581210..ab080be 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -11,11 +11,11 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v3 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v3 with: distribution: adopt - java-version: 17.0.7 + java-version: 21.0.3 - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Set Docker Host env variable @@ -40,14 +40,14 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v3 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v3 with: distribution: 'adopt' - java-version: 17.0.7 + java-version: 21.0.3 - uses: graalvm/setup-graalvm@v1 with: - java-version: '17.0.7' + java-version: '21.0.1' distribution: 'graalvm-community' components: 'native-image' github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/README.md b/README.md index 1477a4e..08f1f33 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ This repository is for adding Ballerina support with WSO2 Integration Control Pl ### Setting Up the Prerequisites -1. Download and install Java SE Development Kit (JDK) version 17 (from one of the following locations). +1. Download and install Java SE Development Kit (JDK) version 21 (from one of the following locations). * [Oracle](https://www.oracle.com/java/technologies/downloads/) diff --git a/ballerina-tests/artifacts-tests/Ballerina.toml b/ballerina-tests/artifacts-tests/Ballerina.toml new file mode 100644 index 0000000..93e1a07 --- /dev/null +++ b/ballerina-tests/artifacts-tests/Ballerina.toml @@ -0,0 +1,10 @@ +[package] +org = "ballerinax" +name = "artifacts_tests" +version = "1.0.1" + +[platform.java21] +graalvmCompatible = true + +[build-options] +remoteManagement=true diff --git a/ballerina-tests/artifacts-tests/Dependencies.toml b/ballerina-tests/artifacts-tests/Dependencies.toml new file mode 100644 index 0000000..2154757 --- /dev/null +++ b/ballerina-tests/artifacts-tests/Dependencies.toml @@ -0,0 +1,381 @@ +# AUTO-GENERATED FILE. DO NOT MODIFY. + +# This file is auto-generated by Ballerina for managing dependency versions. +# It should not be modified by hand. + +[ballerina] +dependencies-toml-version = "2" +distribution-version = "2201.11.0-20241218-101200-109f6cc7" + +[[package]] +org = "ballerina" +name = "auth" +version = "2.13.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.array"}, + {org = "ballerina", name = "lang.string"}, + {org = "ballerina", name = "log"} +] + +[[package]] +org = "ballerina" +name = "cache" +version = "3.9.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "constraint"}, + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "task"}, + {org = "ballerina", name = "time"} +] + +[[package]] +org = "ballerina" +name = "constraint" +version = "1.6.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"} +] + +[[package]] +org = "ballerina" +name = "crypto" +version = "2.8.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "time"} +] + +[[package]] +org = "ballerina" +name = "data.jsondata" +version = "1.0.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.object"} +] + +[[package]] +org = "ballerina" +name = "file" +version = "1.11.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "io"}, + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "os"}, + {org = "ballerina", name = "time"} +] + +[[package]] +org = "ballerina" +name = "http" +version = "2.13.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "auth"}, + {org = "ballerina", name = "cache"}, + {org = "ballerina", name = "constraint"}, + {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "data.jsondata"}, + {org = "ballerina", name = "file"}, + {org = "ballerina", name = "io"}, + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "jwt"}, + {org = "ballerina", name = "lang.array"}, + {org = "ballerina", name = "lang.decimal"}, + {org = "ballerina", name = "lang.int"}, + {org = "ballerina", name = "lang.regexp"}, + {org = "ballerina", name = "lang.runtime"}, + {org = "ballerina", name = "lang.string"}, + {org = "ballerina", name = "lang.value"}, + {org = "ballerina", name = "log"}, + {org = "ballerina", name = "mime"}, + {org = "ballerina", name = "oauth2"}, + {org = "ballerina", name = "observe"}, + {org = "ballerina", name = "time"}, + {org = "ballerina", name = "url"} +] +modules = [ + {org = "ballerina", packageName = "http", moduleName = "http"}, + {org = "ballerina", packageName = "http", moduleName = "http.httpscerr"} +] + +[[package]] +org = "ballerina" +name = "io" +version = "1.7.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.value"} +] + +[[package]] +org = "ballerina" +name = "jballerina.java" +version = "0.0.0" +scope = "testOnly" + +[[package]] +org = "ballerina" +name = "jwt" +version = "2.14.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "cache"}, + {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "io"}, + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.int"}, + {org = "ballerina", name = "lang.string"}, + {org = "ballerina", name = "log"}, + {org = "ballerina", name = "time"} +] + +[[package]] +org = "ballerina" +name = "lang.__internal" +version = "0.0.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.object"} +] + +[[package]] +org = "ballerina" +name = "lang.array" +version = "0.0.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.__internal"} +] + +[[package]] +org = "ballerina" +name = "lang.decimal" +version = "0.0.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"} +] + +[[package]] +org = "ballerina" +name = "lang.error" +version = "0.0.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"} +] + +[[package]] +org = "ballerina" +name = "lang.int" +version = "0.0.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.__internal"}, + {org = "ballerina", name = "lang.object"} +] + +[[package]] +org = "ballerina" +name = "lang.object" +version = "0.0.0" +scope = "testOnly" + +[[package]] +org = "ballerina" +name = "lang.regexp" +version = "0.0.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"} +] + +[[package]] +org = "ballerina" +name = "lang.runtime" +version = "0.0.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"} +] + +[[package]] +org = "ballerina" +name = "lang.string" +version = "0.0.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.regexp"} +] + +[[package]] +org = "ballerina" +name = "lang.value" +version = "0.0.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"} +] +modules = [ + {org = "ballerina", packageName = "lang.value", moduleName = "lang.value"} +] + +[[package]] +org = "ballerina" +name = "log" +version = "2.11.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "io"}, + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.value"}, + {org = "ballerina", name = "observe"} +] + +[[package]] +org = "ballerina" +name = "mime" +version = "2.11.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "io"}, + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.int"}, + {org = "ballerina", name = "log"} +] + +[[package]] +org = "ballerina" +name = "oauth2" +version = "2.13.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "cache"}, + {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "log"}, + {org = "ballerina", name = "time"}, + {org = "ballerina", name = "url"} +] + +[[package]] +org = "ballerina" +name = "observe" +version = "1.4.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"} +] + +[[package]] +org = "ballerina" +name = "os" +version = "1.9.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "io"}, + {org = "ballerina", name = "jballerina.java"} +] + +[[package]] +org = "ballerina" +name = "task" +version = "2.6.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "time"} +] + +[[package]] +org = "ballerina" +name = "test" +version = "0.0.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.array"}, + {org = "ballerina", name = "lang.error"} +] +modules = [ + {org = "ballerina", packageName = "test", moduleName = "test"} +] + +[[package]] +org = "ballerina" +name = "time" +version = "2.6.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"} +] + +[[package]] +org = "ballerina" +name = "url" +version = "2.5.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"} +] + +[[package]] +org = "ballerina" +name = "uuid" +version = "1.9.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.int"}, + {org = "ballerina", name = "time"} +] + +[[package]] +org = "ballerinax" +name = "artifacts_tests" +version = "1.0.1" +dependencies = [ + {org = "ballerina", name = "http"}, + {org = "ballerina", name = "lang.value"}, + {org = "ballerina", name = "test"}, + {org = "ballerinax", name = "wso2.controlplane"} +] +modules = [ + {org = "ballerinax", packageName = "artifacts_tests", moduleName = "artifacts_tests"} +] + +[[package]] +org = "ballerinax" +name = "wso2.controlplane" +version = "1.0.1" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "file"}, + {org = "ballerina", name = "http"}, + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "jwt"}, + {org = "ballerina", name = "lang.array"}, + {org = "ballerina", name = "lang.runtime"}, + {org = "ballerina", name = "log"}, + {org = "ballerina", name = "os"}, + {org = "ballerina", name = "uuid"} +] +modules = [ + {org = "ballerinax", packageName = "wso2.controlplane", moduleName = "wso2.controlplane"} +] + diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index a089e53..0f973d1 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -1,13 +1,13 @@ [package] org = "ballerinax" name = "wso2.controlplane" -version = "1.0.0" -distribution = "2201.9.0" +version = "1.0.1" +distribution = "2201.11.0-20241218-101200-109f6cc7" repository = "https://github.com/ballerina-platform/module-ballerinax-wso2.controlplane" license = ["Apache-2.0"] -[platform.java17] +[platform.java21] graalvmCompatible = true -[[platform.java17.dependency]] -path = "../native/build/libs/wso2.controlplane-native-1.0.0.jar" +[[platform.java21.dependency]] +path = "../native/build/libs/wso2.controlplane-native-1.0.1-SNAPSHOT.jar" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index c7c754b..7be627e 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -5,12 +5,12 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.9.0" +distribution-version = "2201.11.0-20241218-101200-109f6cc7" [[package]] org = "ballerina" name = "auth" -version = "2.11.0" +version = "2.13.0" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -22,7 +22,7 @@ dependencies = [ [[package]] org = "ballerina" name = "cache" -version = "3.8.0" +version = "3.9.0" dependencies = [ {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "jballerina.java"}, @@ -33,7 +33,7 @@ dependencies = [ [[package]] org = "ballerina" name = "constraint" -version = "1.5.0" +version = "1.6.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -41,16 +41,25 @@ dependencies = [ [[package]] org = "ballerina" name = "crypto" -version = "2.7.0" +version = "2.8.0" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} ] +[[package]] +org = "ballerina" +name = "data.jsondata" +version = "1.0.0" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.object"} +] + [[package]] org = "ballerina" name = "file" -version = "1.9.0" +version = "1.11.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -64,12 +73,13 @@ modules = [ [[package]] org = "ballerina" name = "http" -version = "2.11.0" +version = "2.13.0" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "data.jsondata"}, {org = "ballerina", name = "file"}, {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -96,7 +106,7 @@ modules = [ [[package]] org = "ballerina" name = "io" -version = "1.6.0" +version = "1.7.0" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.value"} @@ -113,10 +123,11 @@ modules = [ [[package]] org = "ballerina" name = "jwt" -version = "2.11.0" +version = "2.14.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.int"}, {org = "ballerina", name = "lang.string"}, @@ -210,7 +221,7 @@ dependencies = [ [[package]] org = "ballerina" name = "log" -version = "2.9.0" +version = "2.11.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -224,17 +235,18 @@ modules = [ [[package]] org = "ballerina" name = "mime" -version = "2.9.0" +version = "2.11.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "lang.int"} + {org = "ballerina", name = "lang.int"}, + {org = "ballerina", name = "log"} ] [[package]] org = "ballerina" name = "oauth2" -version = "2.11.0" +version = "2.13.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -247,7 +259,7 @@ dependencies = [ [[package]] org = "ballerina" name = "observe" -version = "1.2.3" +version = "1.4.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -255,7 +267,7 @@ dependencies = [ [[package]] org = "ballerina" name = "os" -version = "1.8.0" +version = "1.9.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"} @@ -267,7 +279,7 @@ modules = [ [[package]] org = "ballerina" name = "task" -version = "2.5.0" +version = "2.6.0" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -276,7 +288,7 @@ dependencies = [ [[package]] org = "ballerina" name = "time" -version = "2.4.0" +version = "2.6.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -284,7 +296,7 @@ dependencies = [ [[package]] org = "ballerina" name = "url" -version = "2.4.0" +version = "2.5.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -292,7 +304,7 @@ dependencies = [ [[package]] org = "ballerina" name = "uuid" -version = "1.8.0" +version = "1.9.0" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -306,7 +318,7 @@ modules = [ [[package]] org = "ballerinax" name = "wso2.controlplane" -version = "1.0.0" +version = "1.0.1" dependencies = [ {org = "ballerina", name = "file"}, {org = "ballerina", name = "http"}, diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml index dce4539..bc0dc2b 100644 --- a/build-config/resources/Ballerina.toml +++ b/build-config/resources/Ballerina.toml @@ -2,12 +2,12 @@ org = "ballerinax" name = "wso2.controlplane" version = "@toml.version@" -distribution = "2201.9.0" +distribution = "2201.11.0-20241218-101200-109f6cc7" repository = "https://github.com/ballerina-platform/module-ballerinax-wso2.controlplane" license = ["Apache-2.0"] -[platform.java17] +[platform.java21] graalvmCompatible = true -[[platform.java17.dependency]] +[[platform.java21.dependency]] path = "../native/build/libs/wso2.controlplane-native-@project.version@.jar" diff --git a/build-config/resources/BallerinaTest.toml b/build-config/resources/BallerinaTest.toml index 6f06c10..c61b783 100644 --- a/build-config/resources/BallerinaTest.toml +++ b/build-config/resources/BallerinaTest.toml @@ -3,7 +3,7 @@ org = "ballerinax" name = "@package.name@" version = "@toml.version@" -[platform.java17] +[platform.java21] graalvmCompatible = true [build-options] diff --git a/build.gradle b/build.gradle index f1dc64e..c8a4c6e 100644 --- a/build.gradle +++ b/build.gradle @@ -15,10 +15,10 @@ */ plugins { - 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" + id "com.github.spotbugs" version "${spotbugsPluginVersion}" + id "com.github.johnrengelman.shadow" version "${shadowJarPluginVersion}" + id "de.undercouch.download" version "${downloadPluginVersion}" + id "net.researchgate.release" version "${releasePluginVersion}" } ext.ballerinaLangVersion = project.ballerinaLangVersion @@ -96,6 +96,7 @@ subprojects { ballerinaStdLibs "io.ballerina.stdlib:observe-ballerina:${observeVersion}" ballerinaStdLibs "io.ballerina:observe-ballerina:${observeInternalVersion}" ballerinaStdLibs "io.ballerina.stdlib:uuid-ballerina:${stdlibUuidVersion}" + ballerinaStdLibs "io.ballerina.lib:data.jsondata-ballerina:${stdlibDataJsondataVersion}" } } diff --git a/gradle.properties b/gradle.properties index 4a656ba..5c34142 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,26 +5,31 @@ version=1.0.1-SNAPSHOT puppycrawlCheckstyleVersion=10.12.0 jacocoVersion=0.8.10 testngVersion=7.6.1 -ballerinaLangVersion=2201.9.0 +ballerinaLangVersion=2201.11.0-20241218-101200-109f6cc7 ballerinaTomlParserVersion=1.2.2 +spotbugsPluginVersion=6.0.18 +shadowJarPluginVersion=8.1.1 +downloadPluginVersion=5.4.0 +releasePluginVersion=2.8.0 -stdlibIoVersion=1.6.0 -stdlibHttpVersion=2.11.0 -stdlibLogVersion=2.9.0 -stdlibFileVersion=1.9.0 -stdlibCryptoVersion=2.7.0 -stdlibAuthVersion=2.11.0 -stdlibMimeVersion=2.9.0 -stdlibJwtVersion=2.11.0 -stdlibOAuth2Version=2.11.0 -stdlibConstraintVersion=1.5.0 -stdlibOsVersion=1.8.0 -stdlibTaskVersion=2.5.0 -stdlibTimeVersion=2.4.0 -stdlibCacheVersion=3.8.0 -stdlibUrlVersion=2.4.0 -observeVersion=1.2.3 -observeInternalVersion=1.2.2 -stdlibUuidVersion=1.8.0 +stdlibIoVersion=1.7.0-20241218-111600-1da6a3f +stdlibHttpVersion=2.13.0-20241218-142000-8d9c012 +stdlibDataJsondataVersion=1.0.0-20241218-133400-f0c9ec4 +stdlibLogVersion=2.11.0-20241218-115100-06c729e +stdlibFileVersion=1.11.0-20241218-125000-364d941 +stdlibCryptoVersion=2.8.0-20241218-112400-d6f4922 +stdlibAuthVersion=2.13.0-20241218-124900-9203135 +stdlibMimeVersion=2.11.0-20241218-125100-e28a03b +stdlibJwtVersion=2.14.0-20241218-125000-c952d1e +stdlibOAuth2Version=2.13.0-20241218-125400-c7625c1 +stdlibConstraintVersion=1.6.0-20241218-112400-cd313f2 +stdlibOsVersion=1.9.0-20241218-112400-c81f077 +stdlibTaskVersion=2.6.0-20241218-112900-84f2aea +stdlibTimeVersion=2.6.0-20241218-111600-f57d32a +stdlibCacheVersion=3.9.0-20241218-114600-9f52392 +stdlibUrlVersion=2.5.0-20241218-111600-4f962bc +observeVersion=1.4.0-20241218-111700-4d29d40 +observeInternalVersion=1.4.0-20241218-112700-be9da2c +stdlibUuidVersion=1.9.0-20241218-124000-a38f1c9 ballerinaGradlePluginVersion=2.2.4 diff --git a/gradle/javaProject.gradle b/gradle/javaProject.gradle index 852fef0..c3db666 100644 --- a/gradle/javaProject.gradle +++ b/gradle/javaProject.gradle @@ -39,7 +39,7 @@ tasks.withType(JavaCompile) { options.encoding = 'UTF-8' } -sourceCompatibility = JavaVersion.VERSION_17 +sourceCompatibility = JavaVersion.VERSION_21 jacoco { toolVersion = "0.8.10" diff --git a/native/build.gradle b/native/build.gradle index 942e8ac..6fa09a6 100644 --- a/native/build.gradle +++ b/native/build.gradle @@ -55,8 +55,11 @@ tasks.withType(Checkstyle).configureEach { checkstyleMain.dependsOn(":checkstyle:downloadCheckstyleRuleFiles") spotbugsMain { - effort "max" - reportLevel "low" + def classLoader = plugins["com.github.spotbugs"].class.classLoader + def SpotBugsConfidence = classLoader.findLoadedClass("com.github.spotbugs.snom.Confidence") + def SpotBugsEffort = classLoader.findLoadedClass("com.github.spotbugs.snom.Effort") + effort = SpotBugsEffort.MAX + reportLevel = SpotBugsConfidence.LOW reportsDir = file("$project.buildDir/reports/spotbugs") reports { html.enabled true diff --git a/native/src/main/java/io/ballerina/lib/wso2/controlplane/Artifacts.java b/native/src/main/java/io/ballerina/lib/wso2/controlplane/Artifacts.java index 7e8ebee..40f1c33 100644 --- a/native/src/main/java/io/ballerina/lib/wso2/controlplane/Artifacts.java +++ b/native/src/main/java/io/ballerina/lib/wso2/controlplane/Artifacts.java @@ -16,12 +16,12 @@ package io.ballerina.lib.wso2.controlplane; -import io.ballerina.runtime.api.Artifact; import io.ballerina.runtime.api.Environment; import io.ballerina.runtime.api.Module; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; +import io.ballerina.runtime.api.repository.Artifact; import io.ballerina.runtime.api.types.ArrayType; import io.ballerina.runtime.api.types.Type; import io.ballerina.runtime.api.utils.StringUtils; diff --git a/native/src/main/java/io/ballerina/lib/wso2/controlplane/Listeners.java b/native/src/main/java/io/ballerina/lib/wso2/controlplane/Listeners.java index 167a6fb..3f20762 100644 --- a/native/src/main/java/io/ballerina/lib/wso2/controlplane/Listeners.java +++ b/native/src/main/java/io/ballerina/lib/wso2/controlplane/Listeners.java @@ -16,9 +16,9 @@ package io.ballerina.lib.wso2.controlplane; -import io.ballerina.runtime.api.Artifact; import io.ballerina.runtime.api.Module; import io.ballerina.runtime.api.creators.ValueCreator; +import io.ballerina.runtime.api.repository.Artifact; import io.ballerina.runtime.api.types.Type; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BListInitialValueEntry; diff --git a/native/src/main/java/io/ballerina/lib/wso2/controlplane/Services.java b/native/src/main/java/io/ballerina/lib/wso2/controlplane/Services.java index 41a163c..b31371a 100644 --- a/native/src/main/java/io/ballerina/lib/wso2/controlplane/Services.java +++ b/native/src/main/java/io/ballerina/lib/wso2/controlplane/Services.java @@ -16,15 +16,15 @@ package io.ballerina.lib.wso2.controlplane; -import io.ballerina.runtime.api.Artifact; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; +import io.ballerina.runtime.api.repository.Artifact; import io.ballerina.runtime.api.types.ArrayType; import io.ballerina.runtime.api.types.NetworkObjectType; import io.ballerina.runtime.api.types.ResourceMethodType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BArray; diff --git a/native/src/main/java/io/ballerina/lib/wso2/controlplane/Utils.java b/native/src/main/java/io/ballerina/lib/wso2/controlplane/Utils.java index 16d1755..bc73fc4 100644 --- a/native/src/main/java/io/ballerina/lib/wso2/controlplane/Utils.java +++ b/native/src/main/java/io/ballerina/lib/wso2/controlplane/Utils.java @@ -18,8 +18,8 @@ import io.ballerina.runtime.api.Environment; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.Node; import io.ballerina.runtime.api.creators.ValueCreator; +import io.ballerina.runtime.api.repository.Node; import io.ballerina.runtime.api.types.Type; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BMap;