From 428c5853d95768d24d37a39a30487e46e85a2616 Mon Sep 17 00:00:00 2001 From: Danesh Kuruppu Date: Mon, 10 Feb 2025 07:54:25 +0530 Subject: [PATCH 1/4] prepare u11 release --- gradle.properties | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/gradle.properties b/gradle.properties index 174ab28e..5238fafb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ group=io.ballerina.stdlib version=1.14.0-SNAPSHOT -ballerinaLangVersion=2201.11.0-20250127-101700-a4b67fe5 +ballerinaLangVersion=2201.11.0 checkstylePluginVersion=10.12.1 spotbugsPluginVersion=6.0.18 @@ -12,50 +12,50 @@ ballerinaGradlePluginVersion=2.0.1 msSQLDriverVersion=12.8.1.jre11 testngVersion=7.6.1 -stdlibSqlVersion=1.15.0-20250129-120500-a886350 +stdlibSqlVersion=1.15.0 # Direct Dependencies # Level 01 -stdlibIoVersion=1.7.0-20250127-170200-0d36f73 -stdlibTimeVersion=2.6.0-20250127-170200-86bdc5a +stdlibIoVersion=1.7.0 +stdlibTimeVersion=2.6.0 # Level 02 -stdlibLogVersion=2.11.0-20250127-173700-45079a8 -stdlibOsVersion=1.9.0-20250127-170900-54f2a57 +stdlibLogVersion=2.11.0 +stdlibOsVersion=1.9.0 # Level 03 -stdlibFileVersion=1.11.0-20250128-125300-1f45bfa +stdlibFileVersion=1.11.0 # Ballerinax Observer -observeVersion=1.4.0-20250127-170200-f9c0dec -observeInternalVersion=1.4.0-20250127-171000-b05ff1d +observeVersion=1.4.0 +observeInternalVersion=1.4.0 # Transitive Dependencies # Level 01 -stdlibConstraintVersion=1.6.0-20250127-170900-48ad9ae -stdlibUrlVersion=2.5.0-20250127-170200-e4cac31 +stdlibConstraintVersion=1.6.0 +stdlibUrlVersion=2.5.0 # Level 02 -stdlibCryptoVersion=2.8.0-20250127-170800-6c52ac3 -stdlibTaskVersion=2.6.0-20250127-171400-af6480d +stdlibCryptoVersion=2.8.0 +stdlibTaskVersion=2.6.0 # Level 03 -stdlibCacheVersion=3.9.0-20250127-173100-ebe1e73 -stdlibMimeVersion=2.11.0-20250127-182500-46c9896 -stdlibUuidVersion=1.9.0-20250127-181300-0f9a3f6 +stdlibCacheVersion=3.9.0 +stdlibMimeVersion=2.11.0 +stdlibUuidVersion=1.9.0 # Level 04 -stdlibDataJsonDataVersion=1.0.0-20250128-132900-8fbc703 -stdlibAuthVersion=2.13.0-20250127-182300-e14b66f -stdlibJwtVersion=2.14.0-20250127-182500-ce5b71c -stdlibOAuth2Version=2.13.0-20250127-182700-5ce88a0 +stdlibDataJsonDataVersion=1.0.0 +stdlibAuthVersion=2.13.0 +stdlibJwtVersion=2.14.0 +stdlibOAuth2Version=2.13.0 # Level 05 -stdlibHttpVersion=2.13.0-20250129-095000-ebfea77 +stdlibHttpVersion=2.13.0 # Level 06 -stdlibTransactionVersion=1.11.0-20250129-105700-896d927 +stdlibTransactionVersion=1.11.0 # Ballerina library -stdlibMssqlDriverVersion=1.7.0-20241126-144300-5155121 +stdlibMssqlDriverVersion=1.7.0 From d3b275486f7fc652d99913292ea80e9386d6788d Mon Sep 17 00:00:00 2001 From: Nuvindu Date: Mon, 10 Feb 2025 12:11:40 +0530 Subject: [PATCH 2/4] Update buildscript for the Gradle plugin --- ballerina/build.gradle | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/ballerina/build.gradle b/ballerina/build.gradle index 73c235c5..5e46e789 100644 --- a/ballerina/build.gradle +++ b/ballerina/build.gradle @@ -17,8 +17,19 @@ import org.apache.tools.ant.taskdefs.condition.Os -plugins { - id 'io.ballerina.plugin' +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}" + } } description = 'Ballerina - MSSQL Ballerina Generator' @@ -46,6 +57,8 @@ def stripBallerinaExtensionVersion(String extVersion) { } } +apply plugin: 'io.ballerina.plugin' + ballerina { packageOrganization = packageOrg module = packageName From 91f2bc971fdd8b39a3551bc74827e81e83104d5b Mon Sep 17 00:00:00 2001 From: Nuvindu Date: Mon, 10 Feb 2025 12:34:01 +0530 Subject: [PATCH 3/4] Update the Gradle plugin version to 2.3.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 5238fafb..f2adb189 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ spotbugsPluginVersion=6.0.18 downloadPluginVersion=5.4.0 shadowJarPluginVersion=8.1.1 releasePluginVersion=2.8.0 -ballerinaGradlePluginVersion=2.0.1 +ballerinaGradlePluginVersion=2.3.0 msSQLDriverVersion=12.8.1.jre11 testngVersion=7.6.1 From 46b9e5b197f0d62d8880cba61aa91e953334496b Mon Sep 17 00:00:00 2001 From: Nuvindu Date: Mon, 10 Feb 2025 12:34:33 +0530 Subject: [PATCH 4/4] Add jBallerina tools dependency --- build.gradle | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0d010d63..33774154 100644 --- a/build.gradle +++ b/build.gradle @@ -69,10 +69,13 @@ subprojects { configurations { externalJars ballerinaStdLibs + jbalTools } dependencies { - + jbalTools ("org.ballerinalang:jballerina-tools:${ballerinaLangVersion}") { + transitive = false + } ballerinaStdLibs "io.ballerina.stdlib:sql-ballerina:${stdlibSqlVersion}" ballerinaStdLibs "io.ballerina.stdlib:io-ballerina:${stdlibIoVersion}" ballerinaStdLibs "io.ballerina.stdlib:constraint-ballerina:${stdlibConstraintVersion}"