Merge pull request #237 from ayeshLK/main

Exclude conflicting JARs from packaging into asb-native JAR
ballerina-platform · Sep 30, 2024 · 94e72ba · 94e72ba
2 parents e705163 + a6b97b9
commit 94e72ba
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml
@@ -10,7 +10,7 @@ distribution-version = "2201.8.0"
 [[package]]
 org = "ballerina"
 name = "io"
-version = "1.6.0"
+version = "1.6.1"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"},
 	{org = "ballerina", name = "lang.value"}

diff --git 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
+
+- [When importing `ballerinax/asb` to package, a conflicting JAR warning is getting printed](https://github.com/ballerina-platform/ballerina-library/issues/7052)
+
 ### Changed
 
 - [Implement ASB sender/receiver client actions in a non-blocking way](https://github.com/ballerina-platform/ballerina-library/issues/4982)

diff --git a/native/build.gradle b/native/build.gradle
@@ -40,7 +40,10 @@ dependencies {
     implementation group: 'org.slf4j', name: 'slf4j-api', version: "${slf4jVersion}"
     implementation group: 'com.azure', name: 'azure-messaging-servicebus', version: "${azureServiceBusVersion}"
 
-    dist group: 'com.azure', name: 'azure-messaging-servicebus', version: "${azureServiceBusVersion}"
+    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"
+    }
 }
 
 tasks.withType(JavaCompile) {