From f3b7e5511405d4e570e81ac8b3f829c737e25a0d Mon Sep 17 00:00:00 2001 From: prakanth <50439067+prakanth97@users.noreply.github.com> Date: Thu, 1 Aug 2024 16:39:29 +0530 Subject: [PATCH 1/4] Publish jsondata native --- native/build.gradle | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/native/build.gradle b/native/build.gradle index d8ba5e9..4bff8f3 100644 --- a/native/build.gradle +++ b/native/build.gradle @@ -70,6 +70,28 @@ spotbugsTest { enabled = false } +publishing { + publications { + mavenJava(MavenPublication) { + groupId project.group + artifactId "data.jsondata-native" + version = project.version + artifact jar + } + } + + repositories { + maven { + name = "GitHubPackages" + url = uri("https://maven.pkg.github.com/ballerina-platform/module-ballerina-data.jsondata") + credentials { + username = System.getenv("publishUser") + password = System.getenv("publishPAT") + } + } + } +} + compileJava { doFirst { options.compilerArgs = [ From a33b3e35fac8901c4d87f6aa8a04be40477f6272 Mon Sep 17 00:00:00 2001 From: prakanth <50439067+prakanth97@users.noreply.github.com> Date: Fri, 2 Aug 2024 11:36:43 +0530 Subject: [PATCH 2/4] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 6 +++--- ballerina/CompilerPlugin.toml | 2 +- ballerina/Dependencies.toml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index b2062f0..6da8ee7 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -1,7 +1,7 @@ [package] org = "ballerina" name = "data.jsondata" -version = "0.1.1" +version = "0.2.0" authors = ["Ballerina"] keywords = ["json", "json path", "json-transform", "json transform", "json to json", "json-convert", "json convert"] repository = "https://github.com/ballerina-platform/module-ballerina-data.jsondata" @@ -15,8 +15,8 @@ graalvmCompatible = true [[platform.java17.dependency]] groupId = "io.ballerina.lib" artifactId = "jsondata-native" -version = "0.1.1" -path = "../native/build/libs/data.jsondata-native-0.1.1-SNAPSHOT.jar" +version = "0.2.0" +path = "../native/build/libs/data.jsondata-native-0.2.0-SNAPSHOT.jar" [[platform.java17.dependency]] path = "./lib/json-path-2.9.0.jar" diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml index b9500f5..ab5ffd5 100644 --- a/ballerina/CompilerPlugin.toml +++ b/ballerina/CompilerPlugin.toml @@ -3,4 +3,4 @@ id = "constraint-compiler-plugin" class = "io.ballerina.lib.data.jsondata.compiler.JsondataCompilerPlugin" [[dependency]] -path = "../compiler-plugin/build/libs/data.jsondata-compiler-plugin-0.1.1-SNAPSHOT.jar" +path = "../compiler-plugin/build/libs/data.jsondata-compiler-plugin-0.2.0-SNAPSHOT.jar" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index 6a69e7a..7da10a3 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -22,7 +22,7 @@ modules = [ [[package]] org = "ballerina" name = "data.jsondata" -version = "0.1.1" +version = "0.2.0" dependencies = [ {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "file"}, From 76117d0962998dd8dbfdec0a450db565ad65b6a9 Mon Sep 17 00:00:00 2001 From: prakanth <50439067+prakanth97@users.noreply.github.com> Date: Fri, 2 Aug 2024 11:39:49 +0530 Subject: [PATCH 3/4] Bump version to 0.2.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 3c62a6c..24f7c62 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ org.gradle.caching=true group=io.ballerina.lib -version=0.1.1-SNAPSHOT +version=0.2.0-SNAPSHOT ballerinaLangVersion=2201.9.0 checkstyleToolVersion=10.12.0 From eefde272333bf265d50f8e03640c98d8b62a52a7 Mon Sep 17 00:00:00 2001 From: prakanth <50439067+prakanth97@users.noreply.github.com> Date: Fri, 2 Aug 2024 11:45:13 +0530 Subject: [PATCH 4/4] Rename error properties file --- .../io/ballerina/lib/data/jsondata/utils/DiagnosticLog.java | 2 +- .../data/jsondata-native/resource-config.json | 2 +- .../main/resources/{error.properties => json_error.properties} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename native/src/main/resources/{error.properties => json_error.properties} (100%) diff --git a/native/src/main/java/io/ballerina/lib/data/jsondata/utils/DiagnosticLog.java b/native/src/main/java/io/ballerina/lib/data/jsondata/utils/DiagnosticLog.java index b8d7cfb..4141367 100644 --- a/native/src/main/java/io/ballerina/lib/data/jsondata/utils/DiagnosticLog.java +++ b/native/src/main/java/io/ballerina/lib/data/jsondata/utils/DiagnosticLog.java @@ -35,7 +35,7 @@ public class DiagnosticLog { private static final String ERROR_PREFIX = "error"; private static final String ERROR = "Error"; - private static final ResourceBundle MESSAGES = ResourceBundle.getBundle("error", Locale.getDefault()); + private static final ResourceBundle MESSAGES = ResourceBundle.getBundle("json_error", Locale.getDefault()); public static BError error(DiagnosticErrorCode code, Object... args) { String msg = formatMessage(code, args); diff --git a/native/src/main/resources/META-INF/native-image/io.ballerina.stdlib/data/jsondata-native/resource-config.json b/native/src/main/resources/META-INF/native-image/io.ballerina.stdlib/data/jsondata-native/resource-config.json index befe09e..9bdbb74 100644 --- a/native/src/main/resources/META-INF/native-image/io.ballerina.stdlib/data/jsondata-native/resource-config.json +++ b/native/src/main/resources/META-INF/native-image/io.ballerina.stdlib/data/jsondata-native/resource-config.json @@ -1,6 +1,6 @@ { "bundles":[{ - "name":"error", + "name":"json_error", "locales":[""] }] } diff --git a/native/src/main/resources/error.properties b/native/src/main/resources/json_error.properties similarity index 100% rename from native/src/main/resources/error.properties rename to native/src/main/resources/json_error.properties