Skip to content

Commit

Permalink
Merge pull request #41 from ayeshLK/build-ins
Browse files Browse the repository at this point in the history
Remove IBM MQ all-client jar packing from the Ballerina IBM MQ connector
  • Loading branch information
ayeshLK authored Jul 8, 2024
2 parents 7f43227 + 23e23b9 commit f199920
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 6 deletions.
3 changes: 2 additions & 1 deletion ballerina/Ballerina.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ keywords = ["ibm.ibmmq", "client", "messaging", "network", "pubsub"]
repository = "https://github.com/ballerina-platform/module-ballerinax-ibm.ibmmq"
icon = "icon.png"
license = ["Apache-2.0"]
distribution = "2201.8.0"
distribution = "2201.9.0"

[[platform.java17.dependency]]
groupId = "io.ballerina.stdlib"
Expand All @@ -26,6 +26,7 @@ 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"
scope = "provided"

[[platform.java17.dependency]]
groupId = "com.fasterxml.jackson.core"
Expand Down
31 changes: 29 additions & 2 deletions ballerina/Dependencies.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@

[ballerina]
dependencies-toml-version = "2"
distribution-version = "2201.8.0"
distribution-version = "2201.9.0"

[[package]]
org = "ballerina"
name = "crypto"
version = "2.5.0"
version = "2.7.2"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "time"}
Expand All @@ -27,6 +27,26 @@ modules = [
{org = "ballerina", packageName = "jballerina.java", moduleName = "jballerina.java"}
]

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

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

[[package]]
org = "ballerina"
name = "lang.error"
Expand All @@ -36,13 +56,20 @@ dependencies = [
{org = "ballerina", name = "jballerina.java"}
]

[[package]]
org = "ballerina"
name = "lang.object"
version = "0.0.0"
scope = "testOnly"

[[package]]
org = "ballerina"
name = "test"
version = "0.0.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "lang.array"},
{org = "ballerina", name = "lang.error"}
]
modules = [
Expand Down
3 changes: 2 additions & 1 deletion build-config/resources/Ballerina.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ keywords = ["ibm.ibmmq", "client", "messaging", "network", "pubsub"]
repository = "https://github.com/ballerina-platform/module-ballerinax-ibm.ibmmq"
icon = "icon.png"
license = ["Apache-2.0"]
distribution = "2201.8.0"
distribution = "2201.9.0"

[[platform.java17.dependency]]
groupId = "io.ballerina.stdlib"
Expand All @@ -26,6 +26,7 @@ groupId = "com.ibm.mq"
artifactId = "com.ibm.mq.allclient"
version = "@ibmmq.version@"
path = "./lib/[email protected]@.jar"
scope = "provided"

[[platform.java17.dependency]]
groupId = "com.fasterxml.jackson.core"
Expand Down
6 changes: 6 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## [Unreleased]

### Changed

- [Decouple IBM MQ java client jar from the IBM MQ connector](https://github.com/ballerina-platform/ballerina-library/issues/6287)

## [0.1.3] - 2023-12-04

### Fixes

- [When decoding IBM MQ headers from the received IBM MQ message Ballerina IBM MQ connector accidentally passes through to the message payload](https://github.com/ballerina-platform/ballerina-library/issues/5819)
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
org.gradle.caching=true
group=io.ballerina.lib
version=1.0.0-SNAPSHOT
ballerinaLangVersion=2201.8.0

ballerinaLangVersion=2201.9.0
checkstylePluginVersion=10.12.1
spotbugsPluginVersion=5.0.14
shadowJarPluginVersion=8.1.1
Expand All @@ -23,7 +23,7 @@ stdlibIoVersion=1.6.0

# Level 02
stdlibLogVersion=2.9.0
stdlibCryptoVersion=2.5.0
stdlibCryptoVersion=2.7.2

# Level 03
stdlibUuidVersion=1.7.0
Expand Down

0 comments on commit f199920

Please sign in to comment.