Skip to content

Commit

Permalink
Merge pull request #24 from ayeshLK/dependency_update
Browse files Browse the repository at this point in the history
Add missing dependencies
  • Loading branch information
ayeshLK authored Nov 10, 2023
2 parents 8792364 + 359ecdc commit 56252b4
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 23 deletions.
18 changes: 18 additions & 0 deletions ballerina/Ballerina.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,21 @@ groupId = "com.ibm.mq"
artifactId = "com.ibm.mq.allclient"
version = "9.3.4.0"
path = "./lib/com.ibm.mq.allclient-9.3.4.0.jar"

[[platform.java17.dependency]]
groupId = "com.fasterxml.jackson.core"
artifactId = "jackson-annotations"
version = "2.15.3"
path = "./lib/jackson-annotations-2.15.3.jar"

[[platform.java17.dependency]]
groupId = "com.fasterxml.jackson.core"
artifactId = "jackson-core"
version = "2.15.3"
path = "./lib/jackson-core-2.15.3.jar"

[[platform.java17.dependency]]
groupId = "com.fasterxml.jackson.core"
artifactId = "jackson-databind"
version = "2.15.3"
path = "./lib/jackson-databind-2.15.3.jar"
23 changes: 0 additions & 23 deletions ballerina/Dependencies.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,6 @@
dependencies-toml-version = "2"
distribution-version = "2201.8.0"

[[package]]
org = "ballerina"
name = "io"
version = "1.6.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "lang.value"}
]
modules = [
{org = "ballerina", packageName = "io", moduleName = "io"}
]

[[package]]
org = "ballerina"
name = "jballerina.java"
Expand All @@ -37,15 +24,6 @@ dependencies = [
{org = "ballerina", name = "jballerina.java"}
]

[[package]]
org = "ballerina"
name = "lang.value"
version = "0.0.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "jballerina.java"}
]

[[package]]
org = "ballerina"
name = "test"
Expand Down Expand Up @@ -76,7 +54,6 @@ org = "ballerinax"
name = "ibm.ibmmq"
version = "0.1.1"
dependencies = [
{org = "ballerina", name = "io"},
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "test"},
{org = "ballerina", name = "time"}
Expand Down
12 changes: 12 additions & 0 deletions ballerina/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -75,16 +75,28 @@ dependencies {
externalJars(group: 'com.ibm.mq', name: 'com.ibm.mq.allclient', version: "${ibmMQVersion}") {
transitive = false
}
/* Jackson dependencies */
externalJars(group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: "${jacksonVersion}") {
transitive = false
}
externalJars(group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: "${jacksonVersion}") {
transitive = false
}
externalJars(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jacksonVersion}") {
transitive = false
}
}

task updateTomlFiles {
doLast {
def stdlibDependentIbmMQVersion = project.ibmMQVersion
def stdlibDependentJsonVersion = project.jsonVersion
def stdlibDependentJacksonVersion = project.jacksonVersion;
def newConfig = ballerinaTomlFilePlaceHolder.text.replace("@project.version@", project.version)
newConfig = newConfig.replace("@toml.version@", tomlVersion)
newConfig = newConfig.replace("@ibmmq.version@", stdlibDependentIbmMQVersion)
newConfig = newConfig.replace("@json.version@", stdlibDependentJsonVersion)
newConfig = newConfig.replace("@jackson.version@", stdlibDependentJacksonVersion)
ballerinaTomlFile.text = newConfig
}
}
Expand Down
18 changes: 18 additions & 0 deletions build-config/resources/Ballerina.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,21 @@ groupId = "com.ibm.mq"
artifactId = "com.ibm.mq.allclient"
version = "@ibmmq.version@"
path = "./lib/[email protected]@.jar"

[[platform.java17.dependency]]
groupId = "com.fasterxml.jackson.core"
artifactId = "jackson-annotations"
version = "@jackson.version@"
path = "./lib/[email protected]@.jar"

[[platform.java17.dependency]]
groupId = "com.fasterxml.jackson.core"
artifactId = "jackson-core"
version = "@jackson.version@"
path = "./lib/[email protected]@.jar"

[[platform.java17.dependency]]
groupId = "com.fasterxml.jackson.core"
artifactId = "jackson-databind"
version = "@jackson.version@"
path = "./lib/[email protected]@.jar"
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ ballerinaGradlePluginVersion=2.0.1
# IBM MQ dependencies
ibmMQVersion=9.3.4.0
jsonVersion=20231013
jacksonVersion=2.15.3

#stdlib dependencies

Expand Down

0 comments on commit 56252b4

Please sign in to comment.