Skip to content

Commit

Permalink
Merge pull request #100 from Chuhaa/ga
Browse files Browse the repository at this point in the history
Remove runtime dependency from native dependency jar
  • Loading branch information
LakshanSS authored Mar 9, 2022
2 parents 80f4f82 + 23b153b commit b57f8ab
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 6 deletions.
6 changes: 3 additions & 3 deletions asb-ballerina/Ballerina.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
distribution = "2201.0.0"
org = "ballerinax"
name = "asb"
version = "2.2.0"
version = "2.2.1"
license= ["Apache-2.0"]
authors = ["Ballerina"]
keywords = ["IT Operations/Message Brokers", "Cost/Paid", "Vendor/Microsoft"]
Expand All @@ -13,8 +13,8 @@ repository = "https://github.com/ballerina-platform/module-ballerinax-azure-serv
observabilityIncluded = true

[[platform.java11.dependency]]
path = "../asb-native/build/libs/asb-native-2.2.0-all.jar"
path = "../asb-native/build/libs/asb-native-2.2.1.jar"
groupId = "org.ballerinax"
artifactId = "asb-native"
module = "asb-native"
version = "2.2.0"
version = "2.2.1"
2 changes: 1 addition & 1 deletion asb-ballerina/Dependencies.toml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ modules = [
[[package]]
org = "ballerinax"
name = "asb"
version = "2.2.0"
version = "2.2.1"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "log"},
Expand Down
19 changes: 18 additions & 1 deletion asb-native/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ plugins {
group project.group
version project.version

configurations {
dist {
transitive true
}
}

repositories {
mavenCentral()

Expand All @@ -20,10 +26,21 @@ repositories {

dependencies {
implementation group: 'com.microsoft.azure', name: 'azure-servicebus', version: '3.5.1'
dist group: 'com.microsoft.azure', name: 'azure-servicebus', version: '3.5.1'
implementation group: 'log4j', name: 'log4j', version: '1.2.17'
dist group: 'log4j', name: 'log4j', version: '1.2.17'
compile group: 'org.ballerinalang', name: 'ballerina-lang', version: project.ballerinaLangVersion
compile(group: 'org.ballerinalang', name: 'ballerina-runtime', version: project.ballerinaLangVersion) {
transitive = false
transitive = true
}
}

jar {
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
dependsOn configurations.dist
from { configurations.dist.collect { it.isDirectory() ? it : zipTree(it) } } {
exclude 'META-INF/*.RSA', 'META-INF/*.SF', 'META-INF/*.DSA', 'io/netty/**', 'com/google/gson/**',
'org/slf4j/**', 'org/apache/commons/lang3/**'
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
org.gradle.caching=true
group=org.ballerinax.azure.servicebus
version=2.2.0
version=2.2.1
ballerinaLangVersion=2201.0.0

0 comments on commit b57f8ab

Please sign in to comment.