From 2555e27a1bc4af31fbb3b636205967d12664da1b Mon Sep 17 00:00:00 2001 From: Danesh Kuruppu Date: Wed, 27 Nov 2024 17:31:26 +0530 Subject: [PATCH 1/3] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 10 +++++----- ballerina/CompilerPlugin.toml | 2 +- ballerina/Dependencies.toml | 34 +++++++++++++++++----------------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index b55fec4e..ad1b08d2 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -1,13 +1,13 @@ [package] org = "ballerinax" name = "mssql" -version = "1.13.2" +version = "1.14.0" authors = ["Ballerina"] 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.11.0-20241112-214900-6b80ab87" +distribution = "2201.11.0" [platform.java21] graalvmCompatible = true @@ -15,11 +15,11 @@ graalvmCompatible = true [[platform.java21.dependency]] groupId = "io.ballerina.stdlib" artifactId = "mssql-native" -version = "1.13.2" -path = "../native/build/libs/mssql-native-1.13.2-SNAPSHOT.jar" +version = "1.14.0" +path = "../native/build/libs/mssql-native-1.14.0-SNAPSHOT.jar" [[platform.java21.dependency]] groupId = "io.ballerina.stdlib" artifactId = "sql-native" version = "1.15.0" -path = "./lib/sql-native-1.15.0-20241116-124800-0bc6a40.jar" +path = "./lib/sql-native-1.15.0-20241127-162900-c57df5b.jar" diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml index 0f7b7671..c753394e 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.2-SNAPSHOT.jar" +path = "../compiler-plugin/build/libs/mssql-compiler-plugin-1.14.0-SNAPSHOT.jar" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index a40c5ae5..7c7bbf72 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -5,12 +5,12 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.11.0-20241112-214900-6b80ab87" +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,7 +23,7 @@ dependencies = [ [[package]] org = "ballerina" name = "cache" -version = "3.8.1" +version = "3.9.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "constraint"}, @@ -44,7 +44,7 @@ dependencies = [ [[package]] org = "ballerina" name = "crypto" -version = "2.7.3" +version = "2.8.0" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -56,7 +56,7 @@ modules = [ [[package]] org = "ballerina" name = "data.jsondata" -version = "0.3.0" +version = "1.0.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, @@ -66,7 +66,7 @@ dependencies = [ [[package]] org = "ballerina" name = "file" -version = "1.10.1" +version = "1.11.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -111,7 +111,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"} @@ -128,7 +128,7 @@ modules = [ [[package]] org = "ballerina" name = "jwt" -version = "2.13.1" +version = "2.14.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "cache"}, @@ -249,7 +249,7 @@ dependencies = [ [[package]] org = "ballerina" name = "log" -version = "2.10.1" +version = "2.11.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -261,7 +261,7 @@ dependencies = [ [[package]] org = "ballerina" name = "mime" -version = "2.10.2" +version = "2.11.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -273,7 +273,7 @@ dependencies = [ [[package]] org = "ballerina" name = "oauth2" -version = "2.12.1" +version = "2.13.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "cache"}, @@ -296,7 +296,7 @@ dependencies = [ [[package]] org = "ballerina" name = "os" -version = "1.8.1" +version = "1.9.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -320,7 +320,7 @@ modules = [ [[package]] org = "ballerina" name = "task" -version = "2.5.1" +version = "2.6.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, @@ -355,7 +355,7 @@ modules = [ [[package]] org = "ballerina" name = "url" -version = "2.4.1" +version = "2.5.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} @@ -364,7 +364,7 @@ dependencies = [ [[package]] org = "ballerina" name = "uuid" -version = "1.8.1" +version = "1.9.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "crypto"}, @@ -398,7 +398,7 @@ modules = [ [[package]] org = "ballerinax" name = "mssql" -version = "1.13.2" +version = "1.14.0" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "file"}, @@ -418,7 +418,7 @@ modules = [ [[package]] org = "ballerinax" name = "mssql.driver" -version = "1.6.1" +version = "1.7.0" scope = "testOnly" modules = [ {org = "ballerinax", packageName = "mssql.driver", moduleName = "mssql.driver"} From 983109974eec7a0401228ac33eee1c4f8fcbc165 Mon Sep 17 00:00:00 2001 From: Danesh Kuruppu Date: Wed, 27 Nov 2024 17:31:47 +0530 Subject: [PATCH 2/3] Update version for update 11 --- build-config/resources/Ballerina.toml | 2 +- gradle.properties | 48 ++++++++++++------------ gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml index 5ff08a64..0c78c117 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.11.0-20241112-214900-6b80ab87" +distribution = "2201.11.0" [platform.java21] graalvmCompatible = true diff --git a/gradle.properties b/gradle.properties index 2e170943..933acc8a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group=io.ballerina.stdlib -version=1.13.2-SNAPSHOT +version=1.14.0-SNAPSHOT puppycrawlCheckstyleVersion=10.12.0 msSQLDriverVersion=12.8.1.jre11 @@ -11,52 +11,52 @@ researchgateReleaseVersion=2.8.0 testngVersion=7.6.1 ballerinaGradlePluginVersion=2.0.1 -ballerinaLangVersion=2201.11.0-20241112-214900-6b80ab87 +ballerinaLangVersion=2201.11.0-20241121-075100-c4c87cbc -stdlibSqlVersion=1.15.0-20241116-124800-0bc6a40 +stdlibSqlVersion=1.15.0-20241127-162900-c57df5b # 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 # Level 02 -stdlibLogVersion=2.10.1-20241113-120000-4577868 -stdlibOsVersion=1.8.1-20241113-122000-cca973b +stdlibLogVersion=2.11.0-20241122-150100-2e1a3ca +stdlibOsVersion=1.9.0-20241122-071800-1fae486 # Level 03 -stdlibFileVersion=1.10.1-20241113-151700-e1a2e38 +stdlibFileVersion=1.11.0-20241122-180900-dff344c # Ballerinax Observer -observeVersion=1.4.0-20241113-092000-b83ae74 -observeInternalVersion=1.3.1-20241113-101700-265054d +observeVersion=1.4.0-20241122-184200-c596093 +observeInternalVersion=1.4.0-20241122-185200-9e5b1bb # Transitive Dependencies # Level 01 -stdlibConstraintVersion=1.6.0-20241113-090900-d276ad5 -stdlibUrlVersion=2.4.1-20241113-073900-335ff51 +stdlibConstraintVersion=1.6.0-20241122-133100-98689e2 +stdlibUrlVersion=2.5.0-20241122-120400-67af694 # Level 02 -stdlibCryptoVersion=2.7.3-20241113-081400-d015a39 -stdlibTaskVersion=2.5.1-20241113-123500-f905281 +stdlibCryptoVersion=2.8.0-20241122-130800-24f1267 +stdlibTaskVersion=2.6.0-20241122-124800-cb84357 # 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 +stdlibMimeVersion=2.11.0-20241125-094600-bbddf94 +stdlibUuidVersion=1.9.0-20241125-110300-5eb185d # Level 04 -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 +stdlibDataJsonDataVersion=1.0.0-20241125-114000-0c2f457 +stdlibAuthVersion=2.13.0-20241125-094500-d380c71 +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 # Ballerina library -stdlibMssqlDriverVersion=1.6.1-20241119-180800-59ee581 +stdlibMssqlDriverVersion=1.7.0-20241126-144300-5155121 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 From f1470f6cba440badd92dd5aca7674b3f4daaaa7d Mon Sep 17 00:00:00 2001 From: Danesh Kuruppu Date: Wed, 27 Nov 2024 18:09:07 +0530 Subject: [PATCH 3/3] re organize the gradle plugins --- ballerina/build.gradle | 17 ++--------------- build.gradle | 8 ++++---- compiler-plugin-tests/build.gradle | 4 ++-- compiler-plugin/build.gradle | 4 ++-- gradle.properties | 17 ++++++++--------- native/build.gradle | 4 ++-- settings.gradle | 21 +++++++++++++++++++++ 7 files changed, 41 insertions(+), 34 deletions(-) diff --git a/ballerina/build.gradle b/ballerina/build.gradle index 91b1552a..73c235c5 100644 --- a/ballerina/build.gradle +++ b/ballerina/build.gradle @@ -17,19 +17,8 @@ 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 - MSSQL Ballerina Generator' @@ -57,8 +46,6 @@ def stripBallerinaExtensionVersion(String extVersion) { } } -apply plugin: 'io.ballerina.plugin' - ballerina { packageOrganization = packageOrg module = packageName diff --git a/build.gradle b/build.gradle index 00c0a94d..0d010d63 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" } description = 'Ballerina - MSSQL' diff --git a/compiler-plugin-tests/build.gradle b/compiler-plugin-tests/build.gradle index bc90e8de..36d2a5d6 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:0.8.6:runtime" @@ -117,7 +117,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 56689562..50a93a65 100644 --- a/compiler-plugin/build.gradle +++ b/compiler-plugin/build.gradle @@ -26,7 +26,7 @@ description = 'Ballerina - MSSQL 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 933acc8a..c2343762 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,17 +1,16 @@ group=io.ballerina.stdlib version=1.14.0-SNAPSHOT +ballerinaLangVersion=2201.11.0-20241121-075100-c4c87cbc -puppycrawlCheckstyleVersion=10.12.0 -msSQLDriverVersion=12.8.1.jre11 -checkstyleToolVersion=10.12.0 -githubSpotbugsVersion=6.0.18 -githubJohnrengelmanShadowVersion=8.1.0 -underCouchDownloadVersion=5.4.0 -researchgateReleaseVersion=2.8.0 -testngVersion=7.6.1 +checkstylePluginVersion=10.12.1 +spotbugsPluginVersion=6.0.18 +downloadPluginVersion=5.4.0 +shadowJarPluginVersion=8.1.1 +releasePluginVersion=2.8.0 ballerinaGradlePluginVersion=2.0.1 -ballerinaLangVersion=2201.11.0-20241121-075100-c4c87cbc +msSQLDriverVersion=12.8.1.jre11 +testngVersion=7.6.1 stdlibSqlVersion=1.15.0-20241127-162900-c57df5b diff --git a/native/build.gradle b/native/build.gradle index 512b6501..81324daf 100644 --- a/native/build.gradle +++ b/native/build.gradle @@ -31,7 +31,7 @@ configurations { 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-runtime', version: "${ballerinaLangVersion}" implementation group: 'io.ballerina.stdlib', name: 'sql-native', version: "${stdlibSqlVersion}" @@ -99,7 +99,7 @@ task validateSpotbugs() { checkstyle { ignoreFailures = false - 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 2f5d5fc2..68b0fc02 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" }