diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 530421b8..88d06e8a 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -2,7 +2,7 @@ distribution = "2201.8.0" org = "ballerinax" name = "asb" -version = "3.8.1" +version = "3.8.2-SNAPSHOT" license= ["Apache-2.0"] authors = ["Ballerina"] keywords = ["IT Operations/Message Brokers", "Cost/Paid", "Vendor/Microsoft"] @@ -19,5 +19,17 @@ graalvmCompatible = true groupId = "org.ballerinax" artifactId = "asb-native" module = "asb-native" -version = "3.8.1" -path = "../native/build/libs/asb-native-3.8.1.jar" +version = "3.8.2-SNAPSHOT" +path = "../native/build/libs/asb-native-3.8.2-SNAPSHOT.jar" + +[[platform.java17.dependency]] +groupId = "com.fasterxml.jackson.core" +artifactId = "jackson-annotations" +version = "2.13.5" +path = "./lib/jackson-annotations-2.13.5.jar" + +[[platform.java17.dependency]] +groupId = "io.netty" +artifactId = "netty-buffer" +version = "4.1.94.Final" +path = "./lib/netty-buffer-4.1.94.Final.jar" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index ce7d51d4..54af2328 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -127,7 +127,7 @@ modules = [ [[package]] org = "ballerinax" name = "asb" -version = "3.8.1" +version = "3.8.2-SNAPSHOT" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.runtime"}, diff --git a/ballerina/build.gradle b/ballerina/build.gradle index 0ff3a024..ef0fcb63 100644 --- a/ballerina/build.gradle +++ b/ballerina/build.gradle @@ -56,10 +56,21 @@ configurations { externalJars } +dependencies { + externalJars(group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: "${jacksonVersion}") { + transitive = false + } + externalJars(group: 'io.netty', name: 'netty-buffer', version: "${nettyVersion}") { + transitive = false + } +} + task updateTomlFiles { doLast { def newBallerinaToml = ballerinaTomlFilePlaceHolder.text.replace("@project.version@", project.version) newBallerinaToml = newBallerinaToml.replace("@toml.version@", tomlVersion) + newBallerinaToml = newBallerinaToml.replace("@jackson.version@", project.jacksonVersion) + newBallerinaToml = newBallerinaToml.replace("@netty.version@", project.nettyVersion) ballerinaTomlFile.text = newBallerinaToml } } diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml index dfc73447..b75a9e66 100644 --- a/build-config/resources/Ballerina.toml +++ b/build-config/resources/Ballerina.toml @@ -21,3 +21,15 @@ artifactId = "asb-native" module = "asb-native" version = "@project.version@" path = "../native/build/libs/asb-native-@project.version@.jar" + +[[platform.java17.dependency]] +groupId = "com.fasterxml.jackson.core" +artifactId = "jackson-annotations" +version = "@jackson.version@" +path = "./lib/jackson-annotations-@jackson.version@.jar" + +[[platform.java17.dependency]] +groupId = "io.netty" +artifactId = "netty-buffer" +version = "@netty.version@" +path = "./lib/netty-buffer-@netty.version@.jar" diff --git a/changelog.md b/changelog.md index a68ea914..3665b800 100644 --- a/changelog.md +++ b/changelog.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Fixed + +- [Application written with `ballerina/asb` connector gives a conflicting JAR warning with `netty-buffer` and `jackson-annotations`](https://github.com/ballerina-platform/ballerina-library/issues/7061) + ## [3.8.1] - 2024-09-30 ### Fixed diff --git a/gradle.properties b/gradle.properties index be94b53f..146cd69a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,3 +12,5 @@ ballerinaGradlePluginVersion=2.2.4 ballerinaLangVersion=2201.8.0 azureServiceBusVersion=7.14.3 slf4jVersion=1.7.30 +nettyVersion=4.1.94.Final +jacksonVersion=2.13.5 diff --git a/native/build.gradle b/native/build.gradle index 3180ba5b..6a85e2e2 100644 --- a/native/build.gradle +++ b/native/build.gradle @@ -43,6 +43,8 @@ dependencies { dist (group: 'com.azure', name: 'azure-messaging-servicebus', version: "${azureServiceBusVersion}") { exclude group: "com.fasterxml.woodstox", module: "woodstox-core" exclude group: "org.codehaus.woodstox", module: "stax2-api" + exclude group: "com.fasterxml.jackson.core", module: "jackson-annotations" + exclude group: "io.netty", module: "netty-buffer" } }