From f6cf8ae6d69e4e234861c044714e934af1427c55 Mon Sep 17 00:00:00 2001 From: Kaneel Dias Date: Thu, 15 Jun 2023 23:11:06 +0530 Subject: [PATCH 1/2] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 17 +++++++----- ballerina/CompilerPlugin.toml | 2 +- ballerina/Dependencies.toml | 52 +++++++++++++++++++++-------------- 3 files changed, 42 insertions(+), 29 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 1d415722..05044163 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -1,30 +1,33 @@ [package] org = "ballerinax" name = "java.jdbc" -version = "1.9.0" +version = "1.10.0" authors = ["Ballerina"] keywords = ["database", "client", "network", "SQL", "RDBMS", "JDBC"] repository = "https://github.com/ballerina-platform/module-ballerinax-java.jdbc" icon = "icon.png" license = ["Apache-2.0"] -distribution = "2201.5.0" +distribution = "2201.7.0" + +[platform.java11] +graalvmCompatible = true [[platform.java11.dependency]] groupId = "io.ballerina.stdlib" artifactId = "java.jdbc-native" -version = "1.9.0" -path = "../native/build/libs/java.jdbc-native-1.9.0.jar" +version = "1.10.0" +path = "../native/build/libs/java.jdbc-native-1.10.0-SNAPSHOT.jar" [[platform.java11.dependency]] groupId = "io.ballerina.stdlib" artifactId = "sql-native" -version = "1.9.0" -path = "./lib/sql-native-1.9.0.jar" +version = "1.10.0" +path = "./lib/sql-native-1.10.0-20230615-195700-94a9c75.jar" [[platform.java11.dependency]] path = "./lib/h2-2.1.212.jar" scope = "testOnly" [[platform.java11.dependency]] -path = "../native-image-configs/build/libs/java.jdbc-native-image-configs-1.9.0.jar" +path = "../native-image-configs/build/libs/java.jdbc-native-image-configs-1.10.0-SNAPSHOT.jar" scope = "testOnly" diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml index 3c673f07..331f7f1f 100644 --- a/ballerina/CompilerPlugin.toml +++ b/ballerina/CompilerPlugin.toml @@ -3,4 +3,4 @@ id = "jdbc-compiler-plugin" class = "io.ballerina.stdlib.java.jdbc.compiler.JDBCCompilerPlugin" [[dependency]] -path = "../compiler-plugin/build/libs/java.jdbc-compiler-plugin-1.9.0.jar" +path = "../compiler-plugin/build/libs/java.jdbc-compiler-plugin-1.10.0-SNAPSHOT.jar" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index 100999d2..b07a6504 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -5,12 +5,12 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.5.0" +distribution-version = "2201.6.0-20230614-102000-d1aade7d" [[package]] org = "ballerina" name = "auth" -version = "2.8.0" +version = "2.9.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "crypto"}, @@ -23,7 +23,7 @@ dependencies = [ [[package]] org = "ballerina" name = "cache" -version = "3.5.0" +version = "3.6.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "constraint"}, @@ -35,7 +35,7 @@ dependencies = [ [[package]] org = "ballerina" name = "constraint" -version = "1.2.0" +version = "1.3.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} @@ -44,7 +44,7 @@ dependencies = [ [[package]] org = "ballerina" name = "crypto" -version = "2.3.1" +version = "2.4.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, @@ -54,7 +54,7 @@ dependencies = [ [[package]] org = "ballerina" name = "file" -version = "1.7.1" +version = "1.8.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -69,7 +69,7 @@ modules = [ [[package]] org = "ballerina" name = "http" -version = "2.8.0" +version = "2.9.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "auth"}, @@ -98,7 +98,7 @@ dependencies = [ [[package]] org = "ballerina" name = "io" -version = "1.4.1" +version = "1.5.0" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.value"} @@ -118,7 +118,7 @@ modules = [ [[package]] org = "ballerina" name = "jwt" -version = "2.8.0" +version = "2.9.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "cache"}, @@ -159,6 +159,15 @@ 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" @@ -230,7 +239,7 @@ dependencies = [ [[package]] org = "ballerina" name = "log" -version = "2.7.1" +version = "2.8.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -242,7 +251,7 @@ dependencies = [ [[package]] org = "ballerina" name = "mime" -version = "2.7.1" +version = "2.8.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -253,7 +262,7 @@ dependencies = [ [[package]] org = "ballerina" name = "oauth2" -version = "2.8.0" +version = "2.9.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "cache"}, @@ -267,7 +276,7 @@ dependencies = [ [[package]] org = "ballerina" name = "observe" -version = "1.0.7" +version = "1.1.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} @@ -276,7 +285,7 @@ dependencies = [ [[package]] org = "ballerina" name = "os" -version = "1.6.0" +version = "1.7.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -286,7 +295,7 @@ dependencies = [ [[package]] org = "ballerina" name = "sql" -version = "1.9.0" +version = "1.10.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -300,7 +309,7 @@ modules = [ [[package]] org = "ballerina" name = "task" -version = "2.3.2" +version = "2.4.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, @@ -313,7 +322,8 @@ name = "test" version = "0.0.0" scope = "testOnly" dependencies = [ - {org = "ballerina", name = "jballerina.java"} + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.error"} ] modules = [ {org = "ballerina", packageName = "test", moduleName = "test"} @@ -322,7 +332,7 @@ modules = [ [[package]] org = "ballerina" name = "time" -version = "2.2.4" +version = "2.3.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -333,7 +343,7 @@ modules = [ [[package]] org = "ballerina" name = "url" -version = "2.2.3" +version = "2.3.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} @@ -342,7 +352,7 @@ dependencies = [ [[package]] org = "ballerina" name = "uuid" -version = "1.5.1" +version = "1.6.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "crypto"}, @@ -376,7 +386,7 @@ modules = [ [[package]] org = "ballerinax" name = "java.jdbc" -version = "1.9.0" +version = "1.10.0" dependencies = [ {org = "ballerina", name = "file"}, {org = "ballerina", name = "io"}, From 7c77648f8a94d3d59adb4a54e3d24608bfaf1fdb Mon Sep 17 00:00:00 2001 From: Kaneel Dias Date: Thu, 15 Jun 2023 23:11:15 +0530 Subject: [PATCH 2/2] Mark GraalVM compatibility --- build-config/resources/Ballerina.toml | 5 ++- gradle.properties | 44 +++++++++++++-------------- 2 files changed, 26 insertions(+), 23 deletions(-) diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml index cb160595..b9fd7c39 100644 --- a/build-config/resources/Ballerina.toml +++ b/build-config/resources/Ballerina.toml @@ -7,7 +7,10 @@ keywords = ["database", "client", "network", "SQL", "RDBMS", "JDBC"] repository = "https://github.com/ballerina-platform/module-ballerinax-java.jdbc" icon = "icon.png" license = ["Apache-2.0"] -distribution = "2201.5.0" +distribution = "2201.7.0" + +[platform.java11] +graalvmCompatible = true [[platform.java11.dependency]] groupId = "io.ballerina.stdlib" diff --git a/gradle.properties b/gradle.properties index 8a02ca1f..a7f0e6e4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group=io.ballerina.stdlib -version=1.9.1-SNAPSHOT +version=1.10.0-SNAPSHOT puppycrawlCheckstyleVersion=8.18 checkstyleToolVersion=7.8.2 @@ -11,47 +11,47 @@ ballerinaGradlePluginVersion=1.1.0 testngVersion=7.4.0 h2DriverVersion=2.1.212 -ballerinaLangVersion=2201.5.0 +ballerinaLangVersion=2201.6.0-20230614-102000-d1aade7d -stdlibSqlVersion=1.9.0 +stdlibSqlVersion=1.10.0-20230615-195700-94a9c75 # Direct Dependencies # Level 01 -stdlibIoVersion=1.4.1 -stdlibTimeVersion=2.2.4 +stdlibIoVersion=1.5.0-20230614-150600-6387868 +stdlibTimeVersion=2.3.0-20230614-151000-47027a9 # Level 02 -stdlibLogVersion=2.7.1 -stdlibOsVersion=1.6.0 +stdlibLogVersion=2.8.0-20230614-193000-9f7edcd +stdlibOsVersion=1.7.0-20230614-193300-1fcd23f # Level 03 -stdlibFileVersion=1.7.1 +stdlibFileVersion=1.8.0-20230615-104200-e8d70cb # Ballerinax Observer -observeVersion=1.0.7 -observeInternalVersion=1.0.6 +observeVersion=1.1.0-20230614-170700-802c054 +observeInternalVersion=1.1.0-20230614-173400-75b87c5 # Transitive Dependencies # Level 01 -stdlibConstraintVersion=1.2.0 -stdlibUrlVersion=2.2.3 +stdlibConstraintVersion=1.3.0-20230614-161700-f1a0fb3 +stdlibUrlVersion=2.3.0-20230614-141500-7a93dbb # Level 02 -stdlibCryptoVersion=2.3.1 -stdlibTaskVersion=2.3.2 +stdlibCryptoVersion=2.4.0-20230614-154200-1745f32 +stdlibTaskVersion=2.4.0-20230614-193200-996af8b # Level 03 -stdlibCacheVersion=3.5.0 -stdlibMimeVersion=2.7.1 -stdlibUuidVersion=1.5.1 +stdlibCacheVersion=3.6.0-20230615-100200-8b6d451 +stdlibMimeVersion=2.8.0-20230614-201600-ffa7634 +stdlibUuidVersion=1.6.0-20230615-104100-07dba2e # Level 04 -stdlibAuthVersion=2.8.0 -stdlibJwtVersion=2.8.0 -stdlibOAuth2Version=2.8.0 +stdlibAuthVersion=2.9.0-20230615-113100-5d474fe +stdlibJwtVersion=2.9.0-20230615-112200-5ee0b41 +stdlibOAuth2Version=2.9.0-20230615-113100-5eaea6c # Level 05 -stdlibHttpVersion=2.8.0 +stdlibHttpVersion=2.9.0-20230615-133700-5613017 # Level 06 -stdlibTransactionVersion=1.6.0 +stdlibTransactionVersion=1.7.0-20230615-165500-bcec15b