From b2c224f1e103b0553191b03b2fa7e1051dbe6f5a Mon Sep 17 00:00:00 2001 From: Thisaru Guruge Date: Wed, 27 Nov 2024 15:06:18 +0530 Subject: [PATCH 1/2] [Automated] Update native jar versions in toml files --- ballerina/Ballerina.toml | 10 +++---- ballerina/CompilerPlugin.toml | 2 +- ballerina/Dependencies.toml | 54 ++++++++++++++++++++++------------- 3 files changed, 40 insertions(+), 26 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 7e0a9a99..75ecbedf 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -1,13 +1,13 @@ [package] org = "ballerina" name = "sql" -version = "1.14.2" +version = "1.15.0" authors = ["Ballerina"] keywords = ["database", "client", "network", "SQL", "RDBMS"] repository = "https://github.com/ballerina-platform/module-ballerina-sql" icon = "icon.png" license = ["Apache-2.0"] -distribution = "2201.10.0-20241019-091600-89e54c08" +distribution = "2201.11.0" [platform.java21] graalvmCompatible = true @@ -15,11 +15,11 @@ graalvmCompatible = true [[platform.java21.dependency]] groupId = "io.ballerina.stdlib" artifactId = "sql-native" -version = "1.14.2" -path = "../native/build/libs/sql-native-1.14.2-SNAPSHOT.jar" +version = "1.15.0" +path = "../native/build/libs/sql-native-1.15.0-SNAPSHOT.jar" [[platform.java21.dependency]] -path = "../test-utils/build/libs/sql-test-utils-1.14.2-SNAPSHOT.jar" +path = "../test-utils/build/libs/sql-test-utils-1.15.0-SNAPSHOT.jar" scope = "testOnly" [[platform.java21.dependency]] diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml index de9b2906..12ebb6da 100644 --- a/ballerina/CompilerPlugin.toml +++ b/ballerina/CompilerPlugin.toml @@ -3,4 +3,4 @@ id = "sql-compiler-plugin" class = "io.ballerina.stdlib.sql.compiler.SQLCompilerPlugin" [[dependency]] -path = "../compiler-plugin/build/libs/sql-compiler-plugin-1.14.2-SNAPSHOT.jar" +path = "../compiler-plugin/build/libs/sql-compiler-plugin-1.15.0-SNAPSHOT.jar" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index eebd5468..b1376524 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -5,12 +5,12 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.10.0-20241019-091600-89e54c08" +distribution-version = "2201.11.0-20241121-075100-c4c87cbc" [[package]] org = "ballerina" name = "auth" -version = "2.12.1" +version = "2.13.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "crypto"}, @@ -23,18 +23,19 @@ dependencies = [ [[package]] org = "ballerina" name = "cache" -version = "3.8.1" +version = "3.9.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "task"} + {org = "ballerina", name = "task"}, + {org = "ballerina", name = "time"} ] [[package]] org = "ballerina" name = "constraint" -version = "1.5.1" +version = "1.6.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} @@ -43,17 +44,27 @@ dependencies = [ [[package]] org = "ballerina" name = "crypto" -version = "2.7.3" +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.10.1" +version = "1.11.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -75,6 +86,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"}, @@ -97,7 +109,7 @@ dependencies = [ [[package]] org = "ballerina" name = "io" -version = "1.6.2" +version = "1.7.0" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.value"} @@ -117,7 +129,7 @@ modules = [ [[package]] org = "ballerina" name = "jwt" -version = "2.13.1" +version = "2.14.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "cache"}, @@ -126,7 +138,8 @@ dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.int"}, {org = "ballerina", name = "lang.string"}, - {org = "ballerina", name = "log"} + {org = "ballerina", name = "log"}, + {org = "ballerina", name = "time"} ] [[package]] @@ -243,7 +256,7 @@ dependencies = [ [[package]] org = "ballerina" name = "log" -version = "2.10.1" +version = "2.11.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -255,7 +268,7 @@ dependencies = [ [[package]] org = "ballerina" name = "mime" -version = "2.10.1" +version = "2.11.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -267,20 +280,21 @@ dependencies = [ [[package]] org = "ballerina" name = "oauth2" -version = "2.12.1" +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.3.1" +version = "1.4.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} @@ -289,7 +303,7 @@ dependencies = [ [[package]] org = "ballerina" name = "os" -version = "1.8.1" +version = "1.9.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -299,7 +313,7 @@ dependencies = [ [[package]] org = "ballerina" name = "sql" -version = "1.14.2" +version = "1.15.0" dependencies = [ {org = "ballerina", name = "file"}, {org = "ballerina", name = "io"}, @@ -319,7 +333,7 @@ modules = [ [[package]] org = "ballerina" name = "task" -version = "2.5.1" +version = "2.6.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, @@ -343,7 +357,7 @@ modules = [ [[package]] org = "ballerina" name = "time" -version = "2.5.1" +version = "2.6.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -354,7 +368,7 @@ modules = [ [[package]] org = "ballerina" name = "url" -version = "2.4.1" +version = "2.5.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} @@ -363,7 +377,7 @@ dependencies = [ [[package]] org = "ballerina" name = "uuid" -version = "1.8.1" +version = "1.9.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "crypto"}, From d0b295cd8e8f654c3d96a05d51a5ccc7125dc64e Mon Sep 17 00:00:00 2001 From: Thisaru Guruge Date: Wed, 27 Nov 2024 15:40:24 +0530 Subject: [PATCH 2/2] Bump the depencencies for Update 11 release --- ballerina/build.gradle | 17 +----- build.gradle | 8 +-- compiler-plugin-tests/build.gradle | 4 +- compiler-plugin/build.gradle | 4 +- gradle.properties | 70 ++++++++++-------------- gradle/wrapper/gradle-wrapper.properties | 2 +- native/build.gradle | 4 +- settings.gradle | 21 +++++++ test-utils/build.gradle | 4 +- 9 files changed, 66 insertions(+), 68 deletions(-) diff --git a/ballerina/build.gradle b/ballerina/build.gradle index 0a8c33a8..a951f409 100644 --- a/ballerina/build.gradle +++ b/ballerina/build.gradle @@ -19,19 +19,8 @@ import org.apache.tools.ant.taskdefs.condition.Os import org.apache.tools.ant.taskdefs.condition.Os -buildscript { - repositories { - maven { - url = 'https://maven.pkg.github.com/ballerina-platform/plugin-gradle' - credentials { - username System.getenv('packageUser') - password System.getenv('packagePAT') - } - } - } - dependencies { - classpath "io.ballerina:plugin-gradle:${project.ballerinaGradlePluginVersion}" - } +plugins { + id 'io.ballerina.plugin' } description = 'Ballerina - SQL Ballerina Generator' @@ -59,8 +48,6 @@ def stripBallerinaExtensionVersion(String extVersion) { } } -apply plugin: 'io.ballerina.plugin' - ballerina { packageOrganization = packageOrg module = packageName diff --git a/build.gradle b/build.gradle index e8e20c07..c6232531 100644 --- a/build.gradle +++ b/build.gradle @@ -16,10 +16,10 @@ */ plugins { - id "com.github.spotbugs" version "${githubSpotbugsVersion}" - id "com.github.johnrengelman.shadow" version "${githubJohnrengelmanShadowVersion}" - id "de.undercouch.download" version "${underCouchDownloadVersion}" - id "net.researchgate.release" version "${researchgateReleaseVersion}" + id "com.github.spotbugs-base" + id "com.github.johnrengelman.shadow" + id "de.undercouch.download" + id "net.researchgate.release" } allprojects { diff --git a/compiler-plugin-tests/build.gradle b/compiler-plugin-tests/build.gradle index 012f45ee..a8d7cf81 100644 --- a/compiler-plugin-tests/build.gradle +++ b/compiler-plugin-tests/build.gradle @@ -31,7 +31,7 @@ configurations { dependencies { checkstyle project(':checkstyle') - checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}" + checkstyle "com.puppycrawl.tools:checkstyle:${checkstylePluginVersion}" jacocoRuntime "org.jacoco:org.jacoco.agent:${jacoco.toolVersion}:runtime" @@ -121,7 +121,7 @@ tasks.withType(Checkstyle) { } checkstyle { - toolVersion "${project.puppycrawlCheckstyleVersion}" + toolVersion "${project.checkstylePluginVersion}" configFile rootProject.file("build-config/checkstyle/build/checkstyle.xml") configProperties = ["suppressionFile": file("${rootDir}/build-config/checkstyle/build/suppressions.xml")] } diff --git a/compiler-plugin/build.gradle b/compiler-plugin/build.gradle index dfd6ccaf..bd361fce 100644 --- a/compiler-plugin/build.gradle +++ b/compiler-plugin/build.gradle @@ -26,7 +26,7 @@ description = 'Ballerina - SQL Compiler Plugin' dependencies { checkstyle project(':checkstyle') - checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}" + checkstyle "com.puppycrawl.tools:checkstyle:${checkstylePluginVersion}" implementation group: 'org.ballerinalang', name: 'ballerina-lang', version: "${ballerinaLangVersion}" implementation group: 'org.ballerinalang', name: 'ballerina-tools-api', version: "${ballerinaLangVersion}" @@ -39,7 +39,7 @@ tasks.withType(Checkstyle) { } checkstyle { - toolVersion "${project.puppycrawlCheckstyleVersion}" + toolVersion "${project.checkstylePluginVersion}" configFile rootProject.file("build-config/checkstyle/build/checkstyle.xml") configProperties = ["suppressionFile" : file("${rootDir}/build-config/checkstyle/build/suppressions.xml")] } diff --git a/gradle.properties b/gradle.properties index 94189aef..ec758a10 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,60 +1,50 @@ group=io.ballerina.stdlib version=1.15.0-SNAPSHOT +ballerinaLangVersion=2201.11.0-20241121-075100-c4c87cbc + +checkstylePluginVersion=10.12.1 +spotbugsPluginVersion=6.0.18 +downloadPluginVersion=5.4.0 +shadowJarPluginVersion=8.1.1 +releasePluginVersion=2.8.0 +ballerinaGradlePluginVersion=2.0.1 -puppycrawlCheckstyleVersion=10.12.1 hikkariLibVersion=3.3.1 hsqlDriverVersion=2.7.1 h2Version=1.4.200 atomikosLibVersion=5.0.8 -checkstyleToolVersion=10.12.1 -githubSpotbugsVersion=6.0.18 -githubJohnrengelmanShadowVersion=8.1.1 -underCouchDownloadVersion=5.4.0 -researchgateReleaseVersion=2.8.0 testngVersion=7.6.1 -ballerinaGradlePluginVersion=2.0.1 - -ballerinaLangVersion=2201.11.0-20241117-133400-a3054b77 - -# Direct Dependencies # Level 01 -stdlibIoVersion=1.6.2-20241112-233100-995cf5f -stdlibTimeVersion=2.6.0-20241113-073800-201b904 +stdlibIoVersion=1.7.0-20241121-173300-0fbd5d4 +stdlibTimeVersion=2.6.0-20241122-120400-97742a7 +stdlibUrlVersion=2.5.0-20241122-120400-67af694 # Level 02 -stdlibLogVersion=2.10.1-20241113-120000-4577868 -stdlibOsVersion=1.8.1-20241113-122000-cca973b +stdlibConstraintVersion=1.6.0-20241122-133100-98689e2 +stdlibCryptoVersion=2.8.0-20241122-130800-24f1267 +stdlibLogVersion=2.11.0-20241122-150100-2e1a3ca +stdlibOsVersion=1.9.0-20241122-071800-1fae486 +stdlibTaskVersion=2.6.0-20241122-124800-cb84357 # Level 03 -stdlibFileVersion=1.10.1-20241113-151700-e1a2e38 - -# Ballerinax Observer -observeVersion=1.4.0-20241113-092000-b83ae74 -observeInternalVersion=1.3.1-20241113-101700-265054d - -# Transitive Dependencies -# Level 01 -stdlibConstraintVersion=1.6.0-20241113-090900-d276ad5 -stdlibUrlVersion=2.4.1-20241113-073900-335ff51 - -# Level 02 -stdlibCryptoVersion=2.7.3-20241113-081400-d015a39 -stdlibTaskVersion=2.5.1-20241113-123500-f905281 - -# Level 03 -stdlibCacheVersion=3.8.1-20241113-125700-b75a1bf -stdlibMimeVersion=2.10.2-20241113-154200-d953747 -stdlibUuidVersion=1.8.1-20241113-154400-443c67b +stdlibCacheVersion=3.9.0-20241122-182900-c956a97 +stdlibFileVersion=1.11.0-20241122-180900-dff344c +stdlibMimeVersion=2.11.0-20241125-094600-bbddf94 +stdlibUuidVersion=1.9.0-20241125-110300-5eb185d # Level 04 -stdlibAuthVersion=2.12.1-20241113-162300-ded40eb -stdlibDataJsonDataVersion=0.3.0-20241114-143900-285d739 -stdlibJwtVersion=2.13.1-20241113-162400-b59ccfa -stdlibOAuth2Version=2.12.1-20241113-162400-4c6ddfe +stdlibAuthVersion=2.13.0-20241125-094500-d380c71 +stdlibDataJsonDataVersion=1.0.0-20241125-114000-0c2f457 +stdlibJwtVersion=2.14.0-20241125-085500-10a9526 +stdlibOAuth2Version=2.13.0-20241126-071700-7eb9e0b # Level 05 -stdlibHttpVersion=2.13.0-20241114-182900-7e9f66a +stdlibHttpVersion=2.13.0-20241126-181000-6585cc5 # Level 06 -stdlibTransactionVersion=1.10.1-20241116-112500-189a4e5 +stdlibTransactionVersion=1.11.0-20241127-113000-c3f53c6 + +# Ballerinax Observer +observeVersion=1.4.0-20241122-184200-c596093 +observeInternalVersion=1.4.0-20241122-185200-9e5b1bb diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9f4197d5..e2847c82 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/native/build.gradle b/native/build.gradle index c95e08c8..2056a244 100644 --- a/native/build.gradle +++ b/native/build.gradle @@ -32,7 +32,7 @@ dependencies { jacocoRuntime "org.jacoco:org.jacoco.agent:${jacoco.toolVersion}:runtime" checkstyle project(":checkstyle") - checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}" + checkstyle "com.puppycrawl.tools:checkstyle:${checkstylePluginVersion}" implementation group: 'org.ballerinalang', name: 'ballerina-lang', version: "${ballerinaLangVersion}" implementation group: 'org.ballerinalang', name: 'ballerina-runtime', version: "${ballerinaLangVersion}" implementation group: 'io.ballerina.stdlib', name: 'io-native', version: "${stdlibIoVersion}" @@ -114,7 +114,7 @@ task validateSpotbugs() { } checkstyle { - toolVersion "${checkstyleToolVersion}" + toolVersion "${checkstylePluginVersion}" configFile file("${rootDir}/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 50f9f817..2c5b294e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -7,6 +7,27 @@ * in the user manual at https://docs.gradle.org/6.3/userguide/multi_project_builds.html */ +pluginManagement { + plugins { + id "com.github.spotbugs-base" version "${spotbugsPluginVersion}" + id "com.github.johnrengelman.shadow" version "${shadowJarPluginVersion}" + id "de.undercouch.download" version "${downloadPluginVersion}" + id "net.researchgate.release" version "${releasePluginVersion}" + id "io.ballerina.plugin" version "${ballerinaGradlePluginVersion}" + } + + repositories { + gradlePluginPortal() + maven { + url = 'https://maven.pkg.github.com/ballerina-platform/*' + credentials { + username System.getenv("packageUser") + password System.getenv("packagePAT") + } + } + } +} + plugins { id "com.gradle.enterprise" version "3.2" } diff --git a/test-utils/build.gradle b/test-utils/build.gradle index f9c906db..e11c358f 100644 --- a/test-utils/build.gradle +++ b/test-utils/build.gradle @@ -25,7 +25,7 @@ description = 'Ballerina - SQL test utils' dependencies { checkstyle project(":checkstyle") - checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}" + checkstyle "com.puppycrawl.tools:checkstyle:${checkstylePluginVersion}" implementation group: 'org.ballerinalang', name: 'ballerina-lang', version: "${ballerinaLangVersion}" implementation group: 'org.ballerinalang', name: 'ballerina-runtime', version: "${ballerinaLangVersion}" implementation project(":sql-native") @@ -66,7 +66,7 @@ task validateSpotbugs() { } checkstyle { - toolVersion "${checkstyleToolVersion}" + toolVersion "${checkstylePluginVersion}" configFile file("${rootDir}/build-config/checkstyle/build/checkstyle.xml") configProperties = ["suppressionFile": file("${rootDir}/build-config/checkstyle/build/suppressions.xml")] }