From 14467b940a6ead89f022367153252545d4da6f42 Mon Sep 17 00:00:00 2001
From: Thisaru Guruge <thisaru@wso2.com>
Date: Fri, 31 Jan 2025 15:04:54 +0530
Subject: [PATCH 1/3] Update the Ballerina Gradle Plugin version

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 82c01f7..9c45fff 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,7 +11,7 @@ spotbugsVersion=6.0.18
 shadowJarPluginVersion=8.1.1
 downloadPluginVersion=4.0.4
 releasePluginVersion=2.8.0
-ballerinaGradlePluginVersion=2.0.1
+ballerinaGradlePluginVersion=2.3.0
 javaJsonPathVersion=2.9.0
 javaJsonSmartVersion=2.4.11
 javaAccessorsSmartVersion=2.4.7

From c774a16733aaeb20d7ef3e7f7995d59ee2ac4aac Mon Sep 17 00:00:00 2001
From: Thisaru Guruge <thisaru@wso2.com>
Date: Fri, 31 Jan 2025 15:27:44 +0530
Subject: [PATCH 2/3] Fix build script issues

---
 build.gradle | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/build.gradle b/build.gradle
index 0937d11..2c3592f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -63,9 +63,15 @@ subprojects {
 
     configurations {
         ballerinaStdLibs
+        jbalTools
     }
 
     dependencies {
+        /* JBallerina Tools */
+        jbalTools ("org.ballerinalang:jballerina-tools:${ballerinaLangVersion}") {
+            transitive = false
+        }
+
         /* Standard libraries */
         ballerinaStdLibs "io.ballerina.stdlib:file-ballerina:${stdlibFileVersion}"
         ballerinaStdLibs "io.ballerina.stdlib:io-ballerina:${stdlibIoVersion}"

From 333c60717ed50c0cb563638fa70b5eae0feafbca Mon Sep 17 00:00:00 2001
From: Thisaru Guruge <thisaru@wso2.com>
Date: Fri, 31 Jan 2025 15:34:11 +0530
Subject: [PATCH 3/3] Fix build script

---
 compiler-plugin-test/build.gradle | 4 ++--
 compiler-plugin/build.gradle      | 4 ++--
 gradle.properties                 | 1 -
 native/build.gradle               | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/compiler-plugin-test/build.gradle b/compiler-plugin-test/build.gradle
index c60bd94..61733df 100644
--- a/compiler-plugin-test/build.gradle
+++ b/compiler-plugin-test/build.gradle
@@ -26,7 +26,7 @@ description = 'Ballerina - Jsondata Compiler Plugin Tests'
 
 dependencies {
     checkstyle project(':checkstyle')
-    checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}"
+    checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleToolVersion}"
 
     implementation project(':data.jsondata-compiler-plugin')
 
@@ -41,7 +41,7 @@ tasks.withType(Checkstyle) {
 }
 
 checkstyle {
-    toolVersion "${project.puppycrawlCheckstyleVersion}"
+    toolVersion "${project.checkstyleToolVersion}"
     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 c1b8a12..19367f9 100644
--- a/compiler-plugin/build.gradle
+++ b/compiler-plugin/build.gradle
@@ -26,7 +26,7 @@ description = 'Ballerina - JsonData Compiler Plugin'
 
 dependencies {
     checkstyle project(':checkstyle')
-    checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}"
+    checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleToolVersion}"
 
     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.checkstyleToolVersion}"
     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 9c45fff..70388a6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,6 @@ version=1.0.0-SNAPSHOT
 ballerinaLangVersion=2201.11.0-20250127-101700-a4b67fe5
 
 checkstyleToolVersion=10.12.0
-puppycrawlCheckstyleVersion=10.12.0
 testngVersion=7.6.1
 slf4jVersion=2.0.7
 spotbugsVersion=6.0.18
diff --git a/native/build.gradle b/native/build.gradle
index 0f2ada4..12cad67 100644
--- a/native/build.gradle
+++ b/native/build.gradle
@@ -27,7 +27,7 @@ description = 'Ballerina - Data.Json Java Utils'
 dependencies {
     implementation 'junit:junit:4.13.1'
     checkstyle project(':checkstyle')
-    checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}"
+    checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleToolVersion}"
     implementation 'org.apache.commons:commons-lang3:3.6'
 
     implementation group: 'org.ballerinalang', name: 'ballerina-lang', version: "${ballerinaLangVersion}"