Skip to content

Commit 7f7468f

Browse files
ayeshLKayeshLK
authored
Merge pull request #249 from ayeshLK/2201.8.x-dev
[2201.8.x] Refactor package build
2 parents bd1fa87 + ba29454 commit 7f7468f

File tree

5 files changed

+614
-25
lines changed

5 files changed

+614
-25
lines changed

‎ballerina/Ballerina.toml‎

Lines changed: 228 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,240 @@ module = "asb-native"
2222
version = "3.8.3-SNAPSHOT"
2323
path = "../native/build/libs/asb-native-3.8.3-SNAPSHOT.jar"
2424

25+
# Azure dependencies
26+
[[platform.java17.dependency]]
27+
groupId = "com.azure"
28+
artifactId = "azure-messaging-servicebus"
29+
version = "7.14.3"
30+
path = "./lib/azure-messaging-servicebus-7.14.3.jar"
31+
32+
[[platform.java17.dependency]]
33+
groupId = "com.azure"
34+
artifactId = "azure-core"
35+
version = "1.42.0"
36+
path = "./lib/azure-core-1.42.0.jar"
37+
38+
[[platform.java17.dependency]]
39+
groupId = "com.azure"
40+
artifactId = "azure-core-amqp"
41+
version = "2.8.8"
42+
path = "./lib/azure-core-amqp-2.8.8.jar"
43+
44+
[[platform.java17.dependency]]
45+
groupId = "com.azure"
46+
artifactId = "azure-core-http-netty"
47+
version = "1.13.6"
48+
path = "./lib/azure-core-http-netty-1.13.6.jar"
49+
50+
[[platform.java17.dependency]]
51+
groupId = "com.azure"
52+
artifactId = "azure-json"
53+
version = "1.0.1"
54+
path = "./lib/azure-json-1.0.1.jar"
55+
56+
[[platform.java17.dependency]]
57+
groupId = "com.microsoft.azure"
58+
artifactId = "qpid-proton-j-extensions"
59+
version = "1.2.4"
60+
path = "./lib/qpid-proton-j-extensions-1.2.4.jar"
61+
62+
# Jackson dependencies
2563
[[platform.java17.dependency]]
2664
groupId = "com.fasterxml.jackson.core"
2765
artifactId = "jackson-annotations"
28-
version = "2.13.5"
29-
path = "./lib/jackson-annotations-2.13.5.jar"
66+
version = "2.14.1"
67+
path = "./lib/jackson-annotations-2.14.1.jar"
68+
69+
[[platform.java17.dependency]]
70+
groupId = "com.fasterxml.jackson.core"
71+
artifactId = "jackson-core"
72+
version = "2.14.1"
73+
path = "./lib/jackson-core-2.14.1.jar"
3074

75+
[[platform.java17.dependency]]
76+
groupId = "com.fasterxml.jackson.core"
77+
artifactId = "jackson-databind"
78+
version = "2.14.1"
79+
path = "./lib/jackson-databind-2.14.1.jar"
80+
81+
[[platform.java17.dependency]]
82+
groupId = "com.fasterxml.jackson.datatype"
83+
artifactId = "jackson-datatype-jsr310"
84+
version = "2.14.1"
85+
path = "./lib/jackson-datatype-jsr310-2.14.1.jar"
86+
87+
[[platform.java17.dependency]]
88+
groupId = "com.fasterxml.jackson.dataformat"
89+
artifactId = "jackson-dataformat-xml"
90+
version = "2.14.1"
91+
path = "./lib/jackson-dataformat-xml-2.14.1.jar"
92+
93+
# Netty dependencies
3194
[[platform.java17.dependency]]
3295
groupId = "io.netty"
3396
artifactId = "netty-buffer"
3497
version = "4.1.118.Final"
3598
path = "./lib/netty-buffer-4.1.118.Final.jar"
99+
100+
101+
[[platform.java17.dependency]]
102+
groupId = "io.netty"
103+
artifactId = "netty-codec"
104+
version = "4.1.118.Final"
105+
path = "./lib/netty-codec-4.1.118.Final.jar"
106+
107+
[[platform.java17.dependency]]
108+
groupId = "io.netty"
109+
artifactId = "netty-codec-dns"
110+
version = "4.1.118.Final"
111+
path = "./lib/netty-codec-dns-4.1.118.Final.jar"
112+
113+
[[platform.java17.dependency]]
114+
groupId = "io.netty"
115+
artifactId = "netty-codec-http"
116+
version = "4.1.118.Final"
117+
path = "./lib/netty-codec-http-4.1.118.Final.jar"
118+
119+
120+
[[platform.java17.dependency]]
121+
groupId = "io.netty"
122+
artifactId = "netty-codec-http2"
123+
version = "4.1.118.Final"
124+
path = "./lib/netty-codec-http2-4.1.118.Final.jar"
125+
126+
127+
[[platform.java17.dependency]]
128+
groupId = "io.netty"
129+
artifactId = "netty-codec-socks"
130+
version = "4.1.118.Final"
131+
path = "./lib/netty-codec-socks-4.1.118.Final.jar"
132+
133+
[[platform.java17.dependency]]
134+
groupId = "io.netty"
135+
artifactId = "netty-common"
136+
version = "4.1.118.Final"
137+
path = "./lib/netty-common-4.1.118.Final.jar"
138+
139+
[[platform.java17.dependency]]
140+
groupId = "io.netty"
141+
artifactId = "netty-handler"
142+
version = "4.1.118.Final"
143+
path = "./lib/netty-handler-4.1.118.Final.jar"
144+
145+
[[platform.java17.dependency]]
146+
groupId = "io.netty"
147+
artifactId = "netty-handler-proxy"
148+
version = "4.1.118.Final"
149+
path = "./lib/netty-handler-proxy-4.1.118.Final.jar"
150+
151+
[[platform.java17.dependency]]
152+
groupId = "io.netty"
153+
artifactId = "netty-resolver"
154+
version = "4.1.118.Final"
155+
path = "./lib/netty-resolver-4.1.118.Final.jar"
156+
157+
[[platform.java17.dependency]]
158+
groupId = "io.netty"
159+
artifactId = "netty-resolver-dns"
160+
version = "4.1.118.Final"
161+
path = "./lib/netty-resolver-dns-4.1.118.Final.jar"
162+
163+
[[platform.java17.dependency]]
164+
groupId = "io.netty"
165+
artifactId = "netty-resolver-dns-classes-macos"
166+
version = "4.1.118.Final"
167+
path = "./lib/netty-resolver-dns-classes-macos-4.1.118.Final.jar"
168+
169+
[[platform.java17.dependency]]
170+
path = "./lib/netty-resolver-dns-native-macos-4.1.118.Final-osx-x86_64.jar"
171+
172+
[[platform.java17.dependency]]
173+
groupId = "io.netty"
174+
artifactId = "netty-transport"
175+
version = "4.1.118.Final"
176+
path = "./lib/netty-transport-4.1.118.Final.jar"
177+
178+
[[platform.java17.dependency]]
179+
groupId = "io.netty"
180+
artifactId = "netty-transport-classes-epoll"
181+
version = "4.1.118.Final"
182+
path = "./lib/netty-transport-classes-epoll-4.1.118.Final.jar"
183+
184+
[[platform.java17.dependency]]
185+
path = "./lib/netty-transport-native-epoll-4.1.118.Final-linux-x86_64.jar"
186+
187+
[[platform.java17.dependency]]
188+
groupId = "io.netty"
189+
artifactId = "netty-transport-classes-kqueue"
190+
version = "4.1.118.Final"
191+
path = "./lib/netty-transport-classes-kqueue-4.1.118.Final.jar"
192+
193+
[[platform.java17.dependency]]
194+
path = "./lib/netty-transport-native-kqueue-4.1.118.Final-osx-x86_64.jar"
195+
196+
[[platform.java17.dependency]]
197+
groupId = "io.netty"
198+
artifactId = "netty-transport-native-unix-common"
199+
version = "4.1.118.Final"
200+
path = "./lib/netty-transport-native-unix-common-4.1.118.Final.jar"
201+
202+
# Netty tcnative dependencies
203+
[[platform.java17.dependency]]
204+
groupId = "io.netty"
205+
artifactId = "netty-tcnative-classes"
206+
version = "2.0.66.Final"
207+
path = "./lib/netty-tcnative-classes-2.0.66.Final.jar"
208+
209+
[[platform.java17.dependency]]
210+
groupId = "io.netty"
211+
artifactId = "netty-tcnative-boringssl-static"
212+
version = "2.0.66.Final"
213+
path = "./lib/netty-tcnative-boringssl-static-2.0.66.Final.jar"
214+
215+
[[platform.java17.dependency]]
216+
path = "./lib/netty-tcnative-boringssl-static-2.0.66.Final-windows-x86_64.jar"
217+
218+
[[platform.java17.dependency]]
219+
path = "./lib/netty-tcnative-boringssl-static-2.0.66.Final-linux-aarch_64.jar"
220+
221+
[[platform.java17.dependency]]
222+
path = "./lib/netty-tcnative-boringssl-static-2.0.66.Final-linux-x86_64.jar"
223+
224+
[[platform.java17.dependency]]
225+
path = "./lib/netty-tcnative-boringssl-static-2.0.66.Final-osx-aarch_64.jar"
226+
227+
[[platform.java17.dependency]]
228+
path = "./lib/netty-tcnative-boringssl-static-2.0.66.Final-osx-x86_64.jar"
229+
230+
# Project reactor dependencies
231+
[[platform.java17.dependency]]
232+
groupId = "io.projectreactor"
233+
artifactId = "reactor-core"
234+
version = "3.5.2"
235+
path = "./lib/reactor-core-3.5.2.jar"
236+
237+
[[platform.java17.dependency]]
238+
groupId = "io.projectreactor.netty"
239+
artifactId = "reactor-netty-core"
240+
version = "1.1.13"
241+
path = "./lib/reactor-netty-core-1.1.13.jar"
242+
243+
[[platform.java17.dependency]]
244+
groupId = "io.projectreactor.netty"
245+
artifactId = "reactor-netty-http"
246+
version = "1.1.13"
247+
path = "./lib/reactor-netty-http-1.1.13.jar"
248+
249+
# Apache proton-j dependencies
250+
[[platform.java17.dependency]]
251+
groupId = "org.apache.qpid"
252+
artifactId = "proton-j"
253+
version = "0.34.0"
254+
path = "./lib/proton-j-0.34.0.jar"
255+
256+
# Reactive streams dependencies
257+
[[platform.java17.dependency]]
258+
groupId = "org.reactivestreams"
259+
artifactId = "reactive-streams"
260+
version = "1.0.4"
261+
path = "./lib/reactive-streams-1.0.4.jar"

‎ballerina/build.gradle‎

Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,20 +57,149 @@ configurations {
5757
}
5858

5959
dependencies {
60+
/* Azure dependencies */
61+
externalJars(group: 'com.azure', name: 'azure-messaging-servicebus', version: "${asbVersion}") {
62+
transitive = false
63+
}
64+
externalJars(group: 'com.azure', name: 'azure-core', version: "${azureCoreVersion}") {
65+
transitive = false
66+
}
67+
externalJars(group: 'com.azure', name: 'azure-core-amqp', version: "${azureCoreAmqpVersion}") {
68+
transitive = false
69+
}
70+
externalJars(group: 'com.azure', name: 'azure-core-http-netty', version: "${azureCoreHttpNettyVersion}") {
71+
transitive = false
72+
}
73+
externalJars(group: 'com.microsoft.azure', name: 'qpid-proton-j-extensions', version: "${azureQpidProtonJExVersion}") {
74+
transitive = false
75+
}
76+
externalJars(group: 'com.azure', name: 'azure-json', version: "${azureJsonVersion}") {
77+
transitive = false
78+
}
79+
80+
/* Jackson dependencies */
6081
externalJars(group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: "${jacksonVersion}") {
6182
transitive = false
6283
}
84+
externalJars(group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: "${jacksonVersion}") {
85+
transitive = false
86+
}
87+
externalJars(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jacksonDatabindVersion}") {
88+
transitive = false
89+
}
90+
externalJars(group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: "${jacksonVersion}") {
91+
transitive = false
92+
}
93+
externalJars(group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-xml', version: "${jacksonVersion}") {
94+
transitive = false
95+
}
96+
97+
/* Netty dependencies */
6398
externalJars(group: 'io.netty', name: 'netty-buffer', version: "${nettyVersion}") {
6499
transitive = false
65100
}
101+
externalJars(group: 'io.netty', name: 'netty-codec', version: "${nettyVersion}") {
102+
transitive = false
103+
}
104+
externalJars(group: 'io.netty', name: 'netty-codec-dns', version: "${nettyVersion}") {
105+
transitive = false
106+
}
107+
externalJars(group: 'io.netty', name: 'netty-codec-http', version: "${nettyVersion}") {
108+
transitive = false
109+
}
110+
externalJars(group: 'io.netty', name: 'netty-codec-http2', version: "${nettyVersion}") {
111+
transitive = false
112+
}
113+
externalJars(group: 'io.netty', name: 'netty-codec-socks', version: "${nettyVersion}") {
114+
transitive = false
115+
}
116+
externalJars(group: 'io.netty', name: 'netty-common', version: "${nettyVersion}") {
117+
transitive = false
118+
}
119+
externalJars(group: 'io.netty', name: 'netty-handler', version: "${nettyVersion}") {
120+
transitive = false
121+
}
122+
externalJars(group: 'io.netty', name: 'netty-handler-proxy', version: "${nettyVersion}") {
123+
transitive = false
124+
}
125+
externalJars(group: 'io.netty', name: 'netty-resolver', version: "${nettyVersion}") {
126+
transitive = false
127+
}
128+
externalJars(group: 'io.netty', name: 'netty-resolver-dns', version: "${nettyVersion}") {
129+
transitive = false
130+
}
131+
externalJars(group: 'io.netty', name: 'netty-resolver-dns-classes-macos', version: "${nettyVersion}") {
132+
transitive = false
133+
}
134+
externalJars "io.netty:netty-resolver-dns-native-macos:${nettyVersion}:osx-x86_64"
135+
externalJars(group: 'io.netty', name: 'netty-transport', version: "${nettyVersion}") {
136+
transitive = false
137+
}
138+
externalJars(group: 'io.netty', name: 'netty-transport-classes-epoll', version: "${nettyVersion}") {
139+
transitive = false
140+
}
141+
externalJars "io.netty:netty-transport-native-epoll:${nettyVersion}:linux-x86_64"
142+
externalJars(group: 'io.netty', name: 'netty-transport-classes-kqueue', version: "${nettyVersion}") {
143+
transitive = false
144+
}
145+
externalJars "io.netty:netty-transport-native-kqueue:${nettyVersion}:osx-x86_64"
146+
externalJars(group: 'io.netty', name: 'netty-transport-native-unix-common', version: "${nettyVersion}") {
147+
transitive = false
148+
}
149+
150+
/* Netty tcnative dependencies */
151+
externalJars(group: 'io.netty', name: 'netty-tcnative-classes', version: "${nettyTcnativeVersion}") {
152+
transitive = false
153+
}
154+
externalJars(group: 'io.netty', name: 'netty-tcnative-boringssl-static', version: "${nettyTcnativeVersion}") {
155+
transitive = false
156+
}
157+
externalJars 'io.netty:netty-tcnative-boringssl-static::windows-x86_64'
158+
externalJars 'io.netty:netty-tcnative-boringssl-static::linux-aarch_64'
159+
externalJars 'io.netty:netty-tcnative-boringssl-static::linux-x86_64'
160+
externalJars 'io.netty:netty-tcnative-boringssl-static::osx-aarch_64'
161+
externalJars 'io.netty:netty-tcnative-boringssl-static::osx-x86_64'
162+
163+
/* Project reactor dependencies */
164+
externalJars(group: 'io.projectreactor', name: 'reactor-core', version: "${reactorCoreVersion}") {
165+
transitive = false
166+
}
167+
externalJars(group: 'io.projectreactor.netty', name: 'reactor-netty-core', version: "${reactorNettyVersion}") {
168+
transitive = false
169+
}
170+
externalJars(group: 'io.projectreactor.netty', name: 'reactor-netty-http', version: "${reactorNettyVersion}") {
171+
transitive = false
172+
}
173+
174+
/* Apache proton-j dependencies */
175+
externalJars(group: 'org.apache.qpid', name: 'proton-j', version: "${protonJVersion}") {
176+
transitive = false
177+
}
178+
179+
/* Rective streams dependencies */
180+
externalJars(group: 'org.reactivestreams', name: 'reactive-streams', version: "${reactiveStreamsVersion}") {
181+
transitive = false
182+
}
66183
}
67184

68185
task updateTomlFiles {
69186
doLast {
70187
def newBallerinaToml = ballerinaTomlFilePlaceHolder.text.replace("@project.version@", project.version)
71188
newBallerinaToml = newBallerinaToml.replace("@toml.version@", tomlVersion)
189+
newBallerinaToml = newBallerinaToml.replace("@asb.version@", project.asbVersion)
190+
newBallerinaToml = newBallerinaToml.replace("@azure.core.version@", project.azureCoreVersion)
191+
newBallerinaToml = newBallerinaToml.replace("@azure.core.amqp.version@", project.azureCoreAmqpVersion)
192+
newBallerinaToml = newBallerinaToml.replace("@azure.core.http.netty.version@", project.azureCoreHttpNettyVersion)
193+
newBallerinaToml = newBallerinaToml.replace("@azure.qpid.protonj.version@", project.azureQpidProtonJExVersion)
194+
newBallerinaToml = newBallerinaToml.replace("@azure.json.version@", project.azureJsonVersion)
72195
newBallerinaToml = newBallerinaToml.replace("@jackson.version@", project.jacksonVersion)
196+
newBallerinaToml = newBallerinaToml.replace("@jackson.databind.version@", project.jacksonDatabindVersion)
73197
newBallerinaToml = newBallerinaToml.replace("@netty.version@", project.nettyVersion)
198+
newBallerinaToml = newBallerinaToml.replace("@netty.tcnative.version@", project.nettyTcnativeVersion)
199+
newBallerinaToml = newBallerinaToml.replace("@reactor.core.version@", project.reactorCoreVersion)
200+
newBallerinaToml = newBallerinaToml.replace("@reactor.netty.version@", project.reactorNettyVersion)
201+
newBallerinaToml = newBallerinaToml.replace("@reactive.streams.version@", project.reactiveStreamsVersion)
202+
newBallerinaToml = newBallerinaToml.replace("@protonj.version@", project.protonJVersion)
74203
ballerinaTomlFile.text = newBallerinaToml
75204
}
76205
}

0 commit comments

Comments
 (0)