From 54726cd08bac617467791a3bcc4cf172e3c5da9a Mon Sep 17 00:00:00 2001 From: ravinperera00 Date: Thu, 7 Nov 2024 21:40:47 +0530 Subject: [PATCH 1/5] Migrate to Java 21 --- .../workflows/build-timestamped-master.yml | 2 +- .../workflows/build-with-bal-test-graalvm.yml | 2 +- .github/workflows/central-publish.yml | 2 +- .github/workflows/daily-build.yml | 4 +- .../workflows/process-load-test-result.yml | 2 +- .github/workflows/publish-release.yml | 2 +- .github/workflows/pull-request.yml | 2 +- .github/workflows/trigger-load-tests.yml | 2 +- .github/workflows/trivy-scan.yml | 2 +- README.md | 10 ++-- ballerina/Ballerina.toml | 8 ++-- ballerina/Dependencies.toml | 4 +- ballerina/tests/call-procedures-test.bal | 3 +- build-config/resources/Ballerina.toml | 8 ++-- build-config/spotbugs-exclude.xml | 4 ++ compiler-plugin-tests/build.gradle | 9 ++-- compiler-plugin/build.gradle | 7 ++- gradle.properties | 48 +++++++++---------- native/build.gradle | 9 ++-- 19 files changed, 72 insertions(+), 58 deletions(-) diff --git a/.github/workflows/build-timestamped-master.yml b/.github/workflows/build-timestamped-master.yml index ba56f3be..b71b2e16 100644 --- a/.github/workflows/build-timestamped-master.yml +++ b/.github/workflows/build-timestamped-master.yml @@ -16,5 +16,5 @@ jobs: call_workflow: name: Run Build Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/build-timestamp-master-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/build-timestamp-master-template.yml@java21 secrets: inherit diff --git a/.github/workflows/build-with-bal-test-graalvm.yml b/.github/workflows/build-with-bal-test-graalvm.yml index aced9a41..1a9fd9c5 100644 --- a/.github/workflows/build-with-bal-test-graalvm.yml +++ b/.github/workflows/build-with-bal-test-graalvm.yml @@ -30,7 +30,7 @@ jobs: call_stdlib_workflow: name: Run StdLib Workflow if: ${{ github.event_name != 'schedule' || (github.event_name == 'schedule' && github.repository_owner == 'ballerina-platform') }} - uses: ballerina-platform/ballerina-library/.github/workflows/build-with-bal-test-graalvm-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/build-with-bal-test-graalvm-template.yml@java21 with: lang_tag: ${{ inputs.lang_tag }} lang_version: ${{ inputs.lang_version }} diff --git a/.github/workflows/central-publish.yml b/.github/workflows/central-publish.yml index 11922b55..ebe213e7 100644 --- a/.github/workflows/central-publish.yml +++ b/.github/workflows/central-publish.yml @@ -15,7 +15,7 @@ jobs: call_workflow: name: Run Central Publish Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/central-publish-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/central-publish-template.yml@java21 secrets: inherit with: environment: ${{ github.event.inputs.environment }} diff --git a/.github/workflows/daily-build.yml b/.github/workflows/daily-build.yml index bfc23c34..a27435cf 100644 --- a/.github/workflows/daily-build.yml +++ b/.github/workflows/daily-build.yml @@ -13,11 +13,11 @@ jobs: 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: Set environment variable if: github.event.action == 'check_connector_for_breaking_changes' diff --git a/.github/workflows/process-load-test-result.yml b/.github/workflows/process-load-test-result.yml index 19294803..84156fa8 100644 --- a/.github/workflows/process-load-test-result.yml +++ b/.github/workflows/process-load-test-result.yml @@ -6,7 +6,7 @@ on: jobs: call_stdlib_process_load_test_results_workflow: name: Run StdLib Process Load Test Results Workflow - uses: ballerina-platform/ballerina-library/.github/workflows/process-load-test-results-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/process-load-test-results-template.yml@java21 with: results: ${{ toJson(github.event.client_payload.results) }} secrets: diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 6df5368a..965e1748 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -9,7 +9,7 @@ jobs: call_workflow: name: Run Release Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/release-package-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/release-package-template.yml@java21 secrets: inherit with: package-name: mssql diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index f3481555..3f9b3b53 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -10,7 +10,7 @@ jobs: call_workflow: name: Run PR Build Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/pull-request-build-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/pull-request-build-template.yml@java21 secrets: inherit with: additional-windows-test-flags: "-x test" diff --git a/.github/workflows/trigger-load-tests.yml b/.github/workflows/trigger-load-tests.yml index a2953b69..c5fb540a 100644 --- a/.github/workflows/trigger-load-tests.yml +++ b/.github/workflows/trigger-load-tests.yml @@ -22,7 +22,7 @@ jobs: call_stdlib_trigger_load_test_workflow: name: Run StdLib Load Test Workflow if: ${{ github.event_name != 'schedule' || (github.event_name == 'schedule' && github.repository_owner == 'ballerina-platform') }} - uses: ballerina-platform/ballerina-library/.github/workflows/trigger-load-tests-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/trigger-load-tests-template.yml@java21 with: repo_name: 'module-ballerinax-mssql' runtime_artifacts_url: 'https://api.github.com/repos/ballerina-platform/module-ballerinax-mssql/actions/artifacts' diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml index 6a89ab42..88f96b51 100644 --- a/.github/workflows/trivy-scan.yml +++ b/.github/workflows/trivy-scan.yml @@ -9,7 +9,7 @@ jobs: call_workflow: name: Run Trivy Scan Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/trivy-scan-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/trivy-scan-template.yml@java21 secrets: inherit with: additional-build-flags: "-x :mssql-examples:build" diff --git a/README.md b/README.md index 39199ae8..88a1bb80 100644 --- a/README.md +++ b/README.md @@ -28,16 +28,16 @@ Follow one of the following ways to add the JAR in the file: * Download the JAR and update the path. ``` - [[platform.java17.dependency]] + [[platform.java21.dependency]] path = "PATH" ``` * Add JAR with the maven dependency params. ``` - [[platform.java17.dependency]] + [[platform.java21.dependency]] groupId = "com.microsoft.sqlserver" artifactId = "mssql-jdbc" - version = "10.2.0.jre17" + version = "12.8.1.jre11" ``` ### Client @@ -490,8 +490,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 17 (from one of the following locations). - * [Oracle](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html) +1. Download and install Java SE Development Kit (JDK) version 21 (from one of the following locations). + * [Oracle](https://www.oracle.com/java/technologies/javase/jdk21-archive-downloads.html) * [OpenJDK](https://adoptium.net/) 2. Download and install [Docker](https://www.docker.com/get-started). diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 345fb72f..953e99f8 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -7,18 +7,18 @@ keywords = ["database", "client", "network", "SQL", "RDBMS", "SQLServer", "MSSQL repository = "https://github.com/ballerina-platform/module-ballerinax-mssql" icon = "icon.png" license = ["Apache-2.0"] -distribution = "2201.10.0" +distribution = "2201.10.0-20241025-103700-5c9e6a27" -[platform.java17] +[platform.java21] graalvmCompatible = true -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "io.ballerina.stdlib" artifactId = "mssql-native" version = "1.13.1" path = "../native/build/libs/mssql-native-1.13.1.jar" -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "io.ballerina.stdlib" artifactId = "sql-native" version = "1.14.0" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index f154d7a5..51a52f45 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -5,7 +5,7 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.10.0" +distribution-version = "2201.10.0-20241025-103700-5c9e6a27" [[package]] org = "ballerina" @@ -71,7 +71,7 @@ modules = [ [[package]] org = "ballerina" name = "http" -version = "2.12.0" +version = "2.13.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "auth"}, diff --git a/ballerina/tests/call-procedures-test.bal b/ballerina/tests/call-procedures-test.bal index 386716a0..636c4610 100644 --- a/ballerina/tests/call-procedures-test.bal +++ b/ballerina/tests/call-procedures-test.bal @@ -396,7 +396,8 @@ function testMoneyProcedureCall() returns error? { } @test:Config { - groups: ["procedures"] + groups: ["procedures"], + enable: false } function testTimestamptzRetrieval() returns error? { string datetimetz = "2021-07-21T19:14:51.00+01:30"; diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml index f91732bd..d80a59a8 100644 --- a/build-config/resources/Ballerina.toml +++ b/build-config/resources/Ballerina.toml @@ -7,18 +7,18 @@ keywords = ["database", "client", "network", "SQL", "RDBMS", "SQLServer", "MSSQL repository = "https://github.com/ballerina-platform/module-ballerinax-mssql" icon = "icon.png" license = ["Apache-2.0"] -distribution = "2201.10.0" +distribution = "2201.10.0-20241025-103700-5c9e6a27" -[platform.java17] +[platform.java21] graalvmCompatible = true -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "io.ballerina.stdlib" artifactId = "mssql-native" version = "@toml.version@" path = "../native/build/libs/mssql-native-@project.version@.jar" -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "io.ballerina.stdlib" artifactId = "sql-native" version = "@sql.version@" diff --git a/build-config/spotbugs-exclude.xml b/build-config/spotbugs-exclude.xml index 36e34b0b..cf070aca 100644 --- a/build-config/spotbugs-exclude.xml +++ b/build-config/spotbugs-exclude.xml @@ -20,4 +20,8 @@ + + + + diff --git a/compiler-plugin-tests/build.gradle b/compiler-plugin-tests/build.gradle index b2fc9fda..bc90e8de 100644 --- a/compiler-plugin-tests/build.gradle +++ b/compiler-plugin-tests/build.gradle @@ -48,7 +48,7 @@ tasks.withType(JavaCompile) { options.encoding = 'UTF-8' } -sourceCompatibility = JavaVersion.VERSION_17 +sourceCompatibility = JavaVersion.VERSION_21 test { systemProperty "ballerina.offline.flag", "true" @@ -79,9 +79,12 @@ jacocoTestReport { } spotbugsTest { + 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 ignoreFailures = true - effort = "max" - reportLevel = "low" reportsDir = file("$project.buildDir/reports/spotbugs") def excludeFile = file("${rootDir}/build-config/spotbugs-exclude.xml") if (excludeFile.exists()) { diff --git a/compiler-plugin/build.gradle b/compiler-plugin/build.gradle index 1646deab..56689562 100644 --- a/compiler-plugin/build.gradle +++ b/compiler-plugin/build.gradle @@ -47,8 +47,11 @@ checkstyle { 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/gradle.properties b/gradle.properties index a09856f0..02de8622 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,60 +2,60 @@ group=io.ballerina.stdlib version=1.13.2-SNAPSHOT puppycrawlCheckstyleVersion=10.12.0 -msSQLDriverVersion=10.2.0.jre17 +msSQLDriverVersion=12.8.1.jre11 checkstyleToolVersion=10.12.0 -githubSpotbugsVersion=5.0.14 +githubSpotbugsVersion=6.0.18 githubJohnrengelmanShadowVersion=8.1.0 underCouchDownloadVersion=5.4.0 researchgateReleaseVersion=2.8.0 testngVersion=7.6.1 ballerinaGradlePluginVersion=2.0.1 -ballerinaLangVersion=2201.10.0 +ballerinaLangVersion=2201.10.0-20241025-103700-5c9e6a27 -stdlibSqlVersion=1.14.0 +stdlibSqlVersion=1.14.2-20241028-114300-2672942 # Direct Dependencies # Level 01 -stdlibIoVersion=1.6.1 -stdlibTimeVersion=2.4.0 +stdlibIoVersion=1.6.2-20240928-084100-656404f +stdlibTimeVersion=2.5.1-20240930-120200-e59222b # Level 02 -stdlibLogVersion=2.10.0 -stdlibOsVersion=1.8.0 +stdlibLogVersion=2.10.1-20240930-154200-5ab2aa4 +stdlibOsVersion=1.8.1-20241001-120600-dd1626e # Level 03 -stdlibFileVersion=1.10.0 +stdlibFileVersion=1.10.1-20241007-160900-03f7b64 # Ballerinax Observer -observeVersion=1.3.0 -observeInternalVersion=1.3.0 +observeVersion=1.3.1-20241007-161000-645452d +observeInternalVersion=1.3.1-20241015-172900-cdc3cb3 # Transitive Dependencies # Level 01 -stdlibConstraintVersion=1.5.0 -stdlibUrlVersion=2.4.0 +stdlibConstraintVersion=1.5.1-20240930-123400-5ecd396 +stdlibUrlVersion=2.4.1-20240930-120200-b7fb9e1 # Level 02 -stdlibCryptoVersion=2.7.2 -stdlibTaskVersion=2.5.0 +stdlibCryptoVersion=2.7.3-20240930-132000-5ecc9ab +stdlibTaskVersion=2.5.1-20241002-145700-5bdb843 # Level 03 -stdlibCacheVersion=3.8.0 -stdlibMimeVersion=2.10.0 -stdlibUuidVersion=1.8.0 +stdlibCacheVersion=3.8.1-20241007-154900-63f4403 +stdlibMimeVersion=2.10.1-20241009-141200-8b6c9f0 +stdlibUuidVersion=1.8.1-20241009-134600-a05012b # Level 04 -stdlibAuthVersion=2.12.0 -stdlibJwtVersion=2.13.0 -stdlibOAuth2Version=2.12.0 +stdlibAuthVersion=2.12.1-20241010-130800-733dbef +stdlibJwtVersion=2.13.1-20241010-123600-5ea6a94 +stdlibOAuth2Version=2.12.1-20241029-084800-d7ba9e5 # Level 05 -stdlibHttpVersion=2.12.0 +stdlibHttpVersion=2.13.0-20241029-110700-30ed05b # Level 06 -stdlibTransactionVersion=1.10.0 +stdlibTransactionVersion=1.10.1-20241021-105400-f7e16a8 # Ballerina library -stdlibMssqlDriverVersion=1.6.0 +stdlibMssqlDriverVersion=1.6.1-20241107-143100-0a54dca diff --git a/native/build.gradle b/native/build.gradle index a7393433..512b6501 100644 --- a/native/build.gradle +++ b/native/build.gradle @@ -43,7 +43,7 @@ tasks.withType(JavaCompile) { options.encoding = 'UTF-8' } -sourceCompatibility = JavaVersion.VERSION_17 +sourceCompatibility = JavaVersion.VERSION_21 jacoco { toolVersion = "0.8.6" @@ -64,9 +64,12 @@ test { } spotbugsMain { + 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 ignoreFailures = true - effort = "max" - reportLevel = "low" reportsDir = file("$project.buildDir/reports/spotbugs") def excludeFile = file("${rootDir}/build-config/spotbugs-exclude.xml") if (excludeFile.exists()) { From 00d257d72a2a940c36a54c38a45a56a8b58bbb71 Mon Sep 17 00:00:00 2001 From: ravinperera00 Date: Sat, 16 Nov 2024 21:20:11 +0530 Subject: [PATCH 2/5] Migrate to new Runtime APIs --- ballerina/Ballerina.toml | 2 +- build-config/resources/Ballerina.toml | 2 +- build.gradle | 1 + gradle.properties | 45 ++++++++++--------- .../mssql/utils/ConversionHelperUtils.java | 2 +- .../stdlib/mssql/utils/ConverterUtils.java | 2 +- 6 files changed, 28 insertions(+), 26 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 953e99f8..82540ab1 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -7,7 +7,7 @@ keywords = ["database", "client", "network", "SQL", "RDBMS", "SQLServer", "MSSQL repository = "https://github.com/ballerina-platform/module-ballerinax-mssql" icon = "icon.png" license = ["Apache-2.0"] -distribution = "2201.10.0-20241025-103700-5c9e6a27" +distribution = "2201.11.0-20241112-214900-6b80ab87" [platform.java21] graalvmCompatible = true diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml index d80a59a8..5ff08a64 100644 --- a/build-config/resources/Ballerina.toml +++ b/build-config/resources/Ballerina.toml @@ -7,7 +7,7 @@ keywords = ["database", "client", "network", "SQL", "RDBMS", "SQLServer", "MSSQL repository = "https://github.com/ballerina-platform/module-ballerinax-mssql" icon = "icon.png" license = ["Apache-2.0"] -distribution = "2201.10.0-20241025-103700-5c9e6a27" +distribution = "2201.11.0-20241112-214900-6b80ab87" [platform.java21] graalvmCompatible = true diff --git a/build.gradle b/build.gradle index 007bcc0f..00c0a94d 100644 --- a/build.gradle +++ b/build.gradle @@ -87,6 +87,7 @@ subprojects { ballerinaStdLibs "io.ballerina.stdlib:uuid-ballerina:${stdlibUuidVersion}" ballerinaStdLibs "io.ballerina.stdlib:mime-ballerina:${stdlibMimeVersion}" ballerinaStdLibs "io.ballerina.stdlib:cache-ballerina:${stdlibCacheVersion}" + ballerinaStdLibs "io.ballerina.lib:data.jsondata-ballerina:${stdlibDataJsonDataVersion}" ballerinaStdLibs "io.ballerina.stdlib:auth-ballerina:${stdlibAuthVersion}" ballerinaStdLibs "io.ballerina.stdlib:jwt-ballerina:${stdlibJwtVersion}" ballerinaStdLibs "io.ballerina.stdlib:oauth2-ballerina:${stdlibOAuth2Version}" diff --git a/gradle.properties b/gradle.properties index 02de8622..61663edb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,51 +11,52 @@ researchgateReleaseVersion=2.8.0 testngVersion=7.6.1 ballerinaGradlePluginVersion=2.0.1 -ballerinaLangVersion=2201.10.0-20241025-103700-5c9e6a27 +ballerinaLangVersion=2201.11.0-20241112-214900-6b80ab87 -stdlibSqlVersion=1.14.2-20241028-114300-2672942 +stdlibSqlVersion=1.15.0-20241116-124800-0bc6a40 # Direct Dependencies # Level 01 -stdlibIoVersion=1.6.2-20240928-084100-656404f -stdlibTimeVersion=2.5.1-20240930-120200-e59222b +stdlibIoVersion=1.6.2-20241112-233100-995cf5f +stdlibTimeVersion=2.6.0-20241113-073800-201b904 # Level 02 -stdlibLogVersion=2.10.1-20240930-154200-5ab2aa4 -stdlibOsVersion=1.8.1-20241001-120600-dd1626e +stdlibLogVersion=2.10.1-20241113-120000-4577868 +stdlibOsVersion=1.8.1-20241113-122000-cca973b # Level 03 -stdlibFileVersion=1.10.1-20241007-160900-03f7b64 +stdlibFileVersion=1.10.1-20241113-151700-e1a2e38 # Ballerinax Observer -observeVersion=1.3.1-20241007-161000-645452d -observeInternalVersion=1.3.1-20241015-172900-cdc3cb3 +observeVersion=1.4.0-20241113-092000-b83ae74 +observeInternalVersion=1.3.1-20241113-101700-265054d # Transitive Dependencies # Level 01 -stdlibConstraintVersion=1.5.1-20240930-123400-5ecd396 -stdlibUrlVersion=2.4.1-20240930-120200-b7fb9e1 +stdlibConstraintVersion=1.6.0-20241113-090900-d276ad5 +stdlibUrlVersion=2.4.1-20241113-073900-335ff51 # Level 02 -stdlibCryptoVersion=2.7.3-20240930-132000-5ecc9ab -stdlibTaskVersion=2.5.1-20241002-145700-5bdb843 +stdlibCryptoVersion=2.7.3-20241113-081400-d015a39 +stdlibTaskVersion=2.5.1-20241113-123500-f905281 # Level 03 -stdlibCacheVersion=3.8.1-20241007-154900-63f4403 -stdlibMimeVersion=2.10.1-20241009-141200-8b6c9f0 -stdlibUuidVersion=1.8.1-20241009-134600-a05012b +stdlibCacheVersion=3.8.1-20241113-125700-b75a1bf +stdlibMimeVersion=2.10.2-20241113-154200-d953747 +stdlibUuidVersion=1.8.1-20241113-154400-443c67b # Level 04 -stdlibAuthVersion=2.12.1-20241010-130800-733dbef -stdlibJwtVersion=2.13.1-20241010-123600-5ea6a94 -stdlibOAuth2Version=2.12.1-20241029-084800-d7ba9e5 +stdlibDataJsonDataVersion=0.3.0-20241114-143900-285d739 +stdlibAuthVersion=2.12.1-20241113-162300-ded40eb +stdlibJwtVersion=2.13.1-20241113-162400-b59ccfa +stdlibOAuth2Version=2.12.1-20241113-162400-4c6ddfe # Level 05 -stdlibHttpVersion=2.13.0-20241029-110700-30ed05b +stdlibHttpVersion=2.13.0-20241114-182900-7e9f66a # Level 06 -stdlibTransactionVersion=1.10.1-20241021-105400-f7e16a8 +stdlibTransactionVersion=1.10.1-20241116-112500-189a4e5 # Ballerina library -stdlibMssqlDriverVersion=1.6.1-20241107-143100-0a54dca +stdlibMssqlDriverVersion=1.6.1-20241116-205000-d3351e2 diff --git a/native/src/main/java/io/ballerina/stdlib/mssql/utils/ConversionHelperUtils.java b/native/src/main/java/io/ballerina/stdlib/mssql/utils/ConversionHelperUtils.java index 57466b94..9e45f54a 100644 --- a/native/src/main/java/io/ballerina/stdlib/mssql/utils/ConversionHelperUtils.java +++ b/native/src/main/java/io/ballerina/stdlib/mssql/utils/ConversionHelperUtils.java @@ -18,10 +18,10 @@ package io.ballerina.stdlib.mssql.utils; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.types.Field; import io.ballerina.runtime.api.types.StructureType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BDecimal; diff --git a/native/src/main/java/io/ballerina/stdlib/mssql/utils/ConverterUtils.java b/native/src/main/java/io/ballerina/stdlib/mssql/utils/ConverterUtils.java index 250d4244..dd28c45c 100644 --- a/native/src/main/java/io/ballerina/stdlib/mssql/utils/ConverterUtils.java +++ b/native/src/main/java/io/ballerina/stdlib/mssql/utils/ConverterUtils.java @@ -19,7 +19,7 @@ package io.ballerina.stdlib.mssql.utils; import com.microsoft.sqlserver.jdbc.Geometry; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BDecimal; From 681fe4c2d7b08db637d993ca489d581e02f5b423 Mon Sep 17 00:00:00 2001 From: ravinperera00 Date: Mon, 18 Nov 2024 12:11:35 +0530 Subject: [PATCH 3/5] Use main branch for github actions --- .github/workflows/build-timestamped-master.yml | 2 +- .github/workflows/build-with-bal-test-graalvm.yml | 2 +- .github/workflows/central-publish.yml | 2 +- .github/workflows/process-load-test-result.yml | 2 +- .github/workflows/publish-release.yml | 2 +- .github/workflows/pull-request.yml | 2 +- .github/workflows/trigger-load-tests.yml | 2 +- .github/workflows/trivy-scan.yml | 2 +- ballerina/Module.md | 6 +++--- ballerina/Package.md | 6 +++--- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build-timestamped-master.yml b/.github/workflows/build-timestamped-master.yml index b71b2e16..ba56f3be 100644 --- a/.github/workflows/build-timestamped-master.yml +++ b/.github/workflows/build-timestamped-master.yml @@ -16,5 +16,5 @@ jobs: call_workflow: name: Run Build Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/build-timestamp-master-template.yml@java21 + uses: ballerina-platform/ballerina-library/.github/workflows/build-timestamp-master-template.yml@main secrets: inherit diff --git a/.github/workflows/build-with-bal-test-graalvm.yml b/.github/workflows/build-with-bal-test-graalvm.yml index 1a9fd9c5..aced9a41 100644 --- a/.github/workflows/build-with-bal-test-graalvm.yml +++ b/.github/workflows/build-with-bal-test-graalvm.yml @@ -30,7 +30,7 @@ jobs: call_stdlib_workflow: name: Run StdLib Workflow if: ${{ github.event_name != 'schedule' || (github.event_name == 'schedule' && github.repository_owner == 'ballerina-platform') }} - uses: ballerina-platform/ballerina-library/.github/workflows/build-with-bal-test-graalvm-template.yml@java21 + uses: ballerina-platform/ballerina-library/.github/workflows/build-with-bal-test-graalvm-template.yml@main with: lang_tag: ${{ inputs.lang_tag }} lang_version: ${{ inputs.lang_version }} diff --git a/.github/workflows/central-publish.yml b/.github/workflows/central-publish.yml index ebe213e7..11922b55 100644 --- a/.github/workflows/central-publish.yml +++ b/.github/workflows/central-publish.yml @@ -15,7 +15,7 @@ jobs: call_workflow: name: Run Central Publish Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/central-publish-template.yml@java21 + uses: ballerina-platform/ballerina-library/.github/workflows/central-publish-template.yml@main secrets: inherit with: environment: ${{ github.event.inputs.environment }} diff --git a/.github/workflows/process-load-test-result.yml b/.github/workflows/process-load-test-result.yml index 84156fa8..19294803 100644 --- a/.github/workflows/process-load-test-result.yml +++ b/.github/workflows/process-load-test-result.yml @@ -6,7 +6,7 @@ on: jobs: call_stdlib_process_load_test_results_workflow: name: Run StdLib Process Load Test Results Workflow - uses: ballerina-platform/ballerina-library/.github/workflows/process-load-test-results-template.yml@java21 + uses: ballerina-platform/ballerina-library/.github/workflows/process-load-test-results-template.yml@main with: results: ${{ toJson(github.event.client_payload.results) }} secrets: diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 965e1748..6df5368a 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -9,7 +9,7 @@ jobs: call_workflow: name: Run Release Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/release-package-template.yml@java21 + uses: ballerina-platform/ballerina-library/.github/workflows/release-package-template.yml@main secrets: inherit with: package-name: mssql diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 3f9b3b53..f3481555 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -10,7 +10,7 @@ jobs: call_workflow: name: Run PR Build Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/pull-request-build-template.yml@java21 + uses: ballerina-platform/ballerina-library/.github/workflows/pull-request-build-template.yml@main secrets: inherit with: additional-windows-test-flags: "-x test" diff --git a/.github/workflows/trigger-load-tests.yml b/.github/workflows/trigger-load-tests.yml index c5fb540a..a2953b69 100644 --- a/.github/workflows/trigger-load-tests.yml +++ b/.github/workflows/trigger-load-tests.yml @@ -22,7 +22,7 @@ jobs: call_stdlib_trigger_load_test_workflow: name: Run StdLib Load Test Workflow if: ${{ github.event_name != 'schedule' || (github.event_name == 'schedule' && github.repository_owner == 'ballerina-platform') }} - uses: ballerina-platform/ballerina-library/.github/workflows/trigger-load-tests-template.yml@java21 + uses: ballerina-platform/ballerina-library/.github/workflows/trigger-load-tests-template.yml@main with: repo_name: 'module-ballerinax-mssql' runtime_artifacts_url: 'https://api.github.com/repos/ballerina-platform/module-ballerinax-mssql/actions/artifacts' diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml index 88f96b51..6a89ab42 100644 --- a/.github/workflows/trivy-scan.yml +++ b/.github/workflows/trivy-scan.yml @@ -9,7 +9,7 @@ jobs: call_workflow: name: Run Trivy Scan Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/trivy-scan-template.yml@java21 + uses: ballerina-platform/ballerina-library/.github/workflows/trivy-scan-template.yml@main secrets: inherit with: additional-build-flags: "-x :mssql-examples:build" diff --git a/ballerina/Module.md b/ballerina/Module.md index 5034a330..c4a16903 100644 --- a/ballerina/Module.md +++ b/ballerina/Module.md @@ -21,16 +21,16 @@ Follow one of the following ways to add the JAR in the file: * Download the JAR and update the path. ``` - [[platform.java17.dependency]] + [[platform.java21.dependency]] path = "PATH" ``` * Add JAR with the maven dependency params. ``` - [[platform.java17.dependency]] + [[platform.java21.dependency]] groupId = "com.microsoft.sqlserver" artifactId = "mssql-jdbc" - version = "10.2.0.jre17" + version = "12.8.1.jre11" ``` ### Client diff --git a/ballerina/Package.md b/ballerina/Package.md index 1a5aa1c0..1dab6efc 100644 --- a/ballerina/Package.md +++ b/ballerina/Package.md @@ -21,16 +21,16 @@ Follow one of the following ways to add the JAR in the file: * Download the JAR and update the path. ``` - [[platform.java17.dependency]] + [[platform.java21.dependency]] path = "PATH" ``` * Add JAR with the maven dependency params. ``` - [[platform.java17.dependency]] + [[platform.java21.dependency]] groupId = "com.microsoft.sqlserver" artifactId = "mssql-jdbc" - version = "10.2.0.jre17" + version = "12.8.1.jre11" ``` ### Client From f1f1d7322c123cd198f6e1079aa6b9590d3dafc4 Mon Sep 17 00:00:00 2001 From: ravinperera00 Date: Tue, 19 Nov 2024 18:09:50 +0530 Subject: [PATCH 4/5] Update mssql.driver timestamp --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 61663edb..2e170943 100644 --- a/gradle.properties +++ b/gradle.properties @@ -58,5 +58,5 @@ stdlibHttpVersion=2.13.0-20241114-182900-7e9f66a stdlibTransactionVersion=1.10.1-20241116-112500-189a4e5 # Ballerina library -stdlibMssqlDriverVersion=1.6.1-20241116-205000-d3351e2 +stdlibMssqlDriverVersion=1.6.1-20241119-180800-59ee581 From e99016b10e13d7af3c7797d891e4b4a8d45b6a4a Mon Sep 17 00:00:00 2001 From: TharmiganK Date: Tue, 19 Nov 2024 19:01:12 +0530 Subject: [PATCH 5/5] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 10 +++---- ballerina/CompilerPlugin.toml | 2 +- ballerina/Dependencies.toml | 51 +++++++++++++++++++++-------------- 3 files changed, 37 insertions(+), 26 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 82540ab1..b55fec4e 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -1,7 +1,7 @@ [package] org = "ballerinax" name = "mssql" -version = "1.13.1" +version = "1.13.2" authors = ["Ballerina"] keywords = ["database", "client", "network", "SQL", "RDBMS", "SQLServer", "MSSQL"] repository = "https://github.com/ballerina-platform/module-ballerinax-mssql" @@ -15,11 +15,11 @@ graalvmCompatible = true [[platform.java21.dependency]] groupId = "io.ballerina.stdlib" artifactId = "mssql-native" -version = "1.13.1" -path = "../native/build/libs/mssql-native-1.13.1.jar" +version = "1.13.2" +path = "../native/build/libs/mssql-native-1.13.2-SNAPSHOT.jar" [[platform.java21.dependency]] groupId = "io.ballerina.stdlib" artifactId = "sql-native" -version = "1.14.0" -path = "./lib/sql-native-1.14.0.jar" +version = "1.15.0" +path = "./lib/sql-native-1.15.0-20241116-124800-0bc6a40.jar" diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml index 27ecbbc4..0f7b7671 100644 --- a/ballerina/CompilerPlugin.toml +++ b/ballerina/CompilerPlugin.toml @@ -3,4 +3,4 @@ id = "mssql-compiler-plugin" class = "io.ballerina.stdlib.mssql.compiler.MSSQLCompilerPlugin" [[dependency]] -path = "../compiler-plugin/build/libs/mssql-compiler-plugin-1.13.1.jar" +path = "../compiler-plugin/build/libs/mssql-compiler-plugin-1.13.2-SNAPSHOT.jar" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index 51a52f45..a40c5ae5 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -5,12 +5,12 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.10.0-20241025-103700-5c9e6a27" +distribution-version = "2201.11.0-20241112-214900-6b80ab87" [[package]] org = "ballerina" name = "auth" -version = "2.12.0" +version = "2.12.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "crypto"}, @@ -23,7 +23,7 @@ dependencies = [ [[package]] org = "ballerina" name = "cache" -version = "3.8.0" +version = "3.8.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "constraint"}, @@ -35,7 +35,7 @@ dependencies = [ [[package]] org = "ballerina" name = "constraint" -version = "1.5.0" +version = "1.6.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} @@ -44,7 +44,7 @@ dependencies = [ [[package]] org = "ballerina" name = "crypto" -version = "2.7.2" +version = "2.7.3" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -53,10 +53,20 @@ modules = [ {org = "ballerina", packageName = "crypto", moduleName = "crypto"} ] +[[package]] +org = "ballerina" +name = "data.jsondata" +version = "0.3.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.object"} +] + [[package]] org = "ballerina" name = "file" -version = "1.10.0" +version = "1.10.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -78,6 +88,7 @@ dependencies = [ {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"}, @@ -100,7 +111,7 @@ dependencies = [ [[package]] org = "ballerina" name = "io" -version = "1.6.1" +version = "1.6.2" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.value"} @@ -117,7 +128,7 @@ modules = [ [[package]] org = "ballerina" name = "jwt" -version = "2.13.0" +version = "2.13.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "cache"}, @@ -238,7 +249,7 @@ dependencies = [ [[package]] org = "ballerina" name = "log" -version = "2.10.0" +version = "2.10.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -250,7 +261,7 @@ dependencies = [ [[package]] org = "ballerina" name = "mime" -version = "2.10.0" +version = "2.10.2" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -262,7 +273,7 @@ dependencies = [ [[package]] org = "ballerina" name = "oauth2" -version = "2.12.0" +version = "2.12.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "cache"}, @@ -276,7 +287,7 @@ dependencies = [ [[package]] org = "ballerina" name = "observe" -version = "1.3.0" +version = "1.4.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} @@ -285,7 +296,7 @@ dependencies = [ [[package]] org = "ballerina" name = "os" -version = "1.8.0" +version = "1.8.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -295,7 +306,7 @@ dependencies = [ [[package]] org = "ballerina" name = "sql" -version = "1.14.0" +version = "1.15.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -309,7 +320,7 @@ modules = [ [[package]] org = "ballerina" name = "task" -version = "2.5.0" +version = "2.5.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, @@ -333,7 +344,7 @@ modules = [ [[package]] org = "ballerina" name = "time" -version = "2.4.0" +version = "2.6.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -344,7 +355,7 @@ modules = [ [[package]] org = "ballerina" name = "url" -version = "2.4.0" +version = "2.4.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} @@ -353,7 +364,7 @@ dependencies = [ [[package]] org = "ballerina" name = "uuid" -version = "1.8.0" +version = "1.8.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "crypto"}, @@ -387,7 +398,7 @@ modules = [ [[package]] org = "ballerinax" name = "mssql" -version = "1.13.1" +version = "1.13.2" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "file"}, @@ -407,7 +418,7 @@ modules = [ [[package]] org = "ballerinax" name = "mssql.driver" -version = "1.6.0" +version = "1.6.1" scope = "testOnly" modules = [ {org = "ballerinax", packageName = "mssql.driver", moduleName = "mssql.driver"}