Skip to content

Commit 532204b

Browse files
ayeshLKayeshLK
committed
Resolve merge conflicts
2 parents 35876a6 + 730b1cd commit 532204b

File tree

13 files changed

+143
-150
lines changed

13 files changed

+143
-150
lines changed

Diff for: ‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ This repository only contains the source code for the package.
132132

133133
### Set up the prerequisites
134134

135-
1. Download and install Java SE Development Kit (JDK) version 17 (from one of the following locations).
135+
1. Download and install Java SE Development Kit (JDK) version 21 (from one of the following locations).
136136

137137
* [Oracle](https://www.oracle.com/java/technologies/downloads/)
138138
* [OpenJDK](https://adoptium.net/)

Diff for: ‎ballerina/Ballerina.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ keywords = ["websub", "hub", "publisher", "service", "listener", "client"]
77
repository = "https://github.com/ballerina-platform/module-ballerina-websubhub"
88
icon = "icon.png"
99
license = ["Apache-2.0"]
10-
distribution = "2201.11.0"
10+
distribution = "2201.10.0-20241019-091600-89e54c08"
1111

12-
[platform.java17]
12+
[platform.java21]
1313
graalvmCompatible = true
1414

15-
[[platform.java17.dependency]]
15+
[[platform.java21.dependency]]
1616
groupId = "io.ballerina.stdlib"
1717
artifactId = "websubhub-native"
1818
version = "1.13.0"

Diff for: ‎ballerina/Dependencies.toml

+17-17
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55

66
[ballerina]
77
dependencies-toml-version = "2"
8-
distribution-version = "2201.11.0-20241008-112400-81975006"
8+
distribution-version = "2201.11.0-20241112-214900-6b80ab87"
99

1010
[[package]]
1111
org = "ballerina"
1212
name = "auth"
13-
version = "2.12.0"
13+
version = "2.12.1"
1414
dependencies = [
1515
{org = "ballerina", name = "crypto"},
1616
{org = "ballerina", name = "jballerina.java"},
@@ -22,7 +22,7 @@ dependencies = [
2222
[[package]]
2323
org = "ballerina"
2424
name = "cache"
25-
version = "3.8.0"
25+
version = "3.8.1"
2626
dependencies = [
2727
{org = "ballerina", name = "constraint"},
2828
{org = "ballerina", name = "jballerina.java"},
@@ -33,15 +33,15 @@ dependencies = [
3333
[[package]]
3434
org = "ballerina"
3535
name = "constraint"
36-
version = "1.5.0"
36+
version = "1.6.0"
3737
dependencies = [
3838
{org = "ballerina", name = "jballerina.java"}
3939
]
4040

4141
[[package]]
4242
org = "ballerina"
4343
name = "crypto"
44-
version = "2.7.2"
44+
version = "2.7.3"
4545
dependencies = [
4646
{org = "ballerina", name = "jballerina.java"},
4747
{org = "ballerina", name = "time"}
@@ -62,7 +62,7 @@ dependencies = [
6262
[[package]]
6363
org = "ballerina"
6464
name = "file"
65-
version = "1.10.0"
65+
version = "1.10.1"
6666
dependencies = [
6767
{org = "ballerina", name = "io"},
6868
{org = "ballerina", name = "jballerina.java"},
@@ -106,7 +106,7 @@ modules = [
106106
[[package]]
107107
org = "ballerina"
108108
name = "io"
109-
version = "1.6.1"
109+
version = "1.6.2"
110110
dependencies = [
111111
{org = "ballerina", name = "jballerina.java"},
112112
{org = "ballerina", name = "lang.value"}
@@ -126,7 +126,7 @@ modules = [
126126
[[package]]
127127
org = "ballerina"
128128
name = "jwt"
129-
version = "2.13.0"
129+
version = "2.13.1"
130130
dependencies = [
131131
{org = "ballerina", name = "cache"},
132132
{org = "ballerina", name = "crypto"},
@@ -233,7 +233,7 @@ dependencies = [
233233
[[package]]
234234
org = "ballerina"
235235
name = "log"
236-
version = "2.10.0"
236+
version = "2.10.1"
237237
dependencies = [
238238
{org = "ballerina", name = "io"},
239239
{org = "ballerina", name = "jballerina.java"},
@@ -247,7 +247,7 @@ modules = [
247247
[[package]]
248248
org = "ballerina"
249249
name = "mime"
250-
version = "2.10.1"
250+
version = "2.10.2"
251251
dependencies = [
252252
{org = "ballerina", name = "io"},
253253
{org = "ballerina", name = "jballerina.java"},
@@ -261,7 +261,7 @@ modules = [
261261
[[package]]
262262
org = "ballerina"
263263
name = "oauth2"
264-
version = "2.12.0"
264+
version = "2.12.1"
265265
dependencies = [
266266
{org = "ballerina", name = "cache"},
267267
{org = "ballerina", name = "crypto"},
@@ -274,15 +274,15 @@ dependencies = [
274274
[[package]]
275275
org = "ballerina"
276276
name = "observe"
277-
version = "1.3.0"
277+
version = "1.4.0"
278278
dependencies = [
279279
{org = "ballerina", name = "jballerina.java"}
280280
]
281281

282282
[[package]]
283283
org = "ballerina"
284284
name = "os"
285-
version = "1.8.0"
285+
version = "1.8.1"
286286
dependencies = [
287287
{org = "ballerina", name = "io"},
288288
{org = "ballerina", name = "jballerina.java"}
@@ -291,7 +291,7 @@ dependencies = [
291291
[[package]]
292292
org = "ballerina"
293293
name = "task"
294-
version = "2.5.0"
294+
version = "2.5.1"
295295
dependencies = [
296296
{org = "ballerina", name = "jballerina.java"},
297297
{org = "ballerina", name = "time"}
@@ -314,15 +314,15 @@ modules = [
314314
[[package]]
315315
org = "ballerina"
316316
name = "time"
317-
version = "2.5.0"
317+
version = "2.6.0"
318318
dependencies = [
319319
{org = "ballerina", name = "jballerina.java"}
320320
]
321321

322322
[[package]]
323323
org = "ballerina"
324324
name = "url"
325-
version = "2.4.0"
325+
version = "2.4.1"
326326
dependencies = [
327327
{org = "ballerina", name = "jballerina.java"}
328328
]
@@ -333,7 +333,7 @@ modules = [
333333
[[package]]
334334
org = "ballerina"
335335
name = "uuid"
336-
version = "1.8.0"
336+
version = "1.8.1"
337337
dependencies = [
338338
{org = "ballerina", name = "crypto"},
339339
{org = "ballerina", name = "jballerina.java"},

Diff for: ‎build-config/resources/Ballerina.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ keywords = ["websub", "hub", "publisher", "service", "listener", "client"]
77
repository = "https://github.com/ballerina-platform/module-ballerina-websubhub"
88
icon = "icon.png"
99
license = ["Apache-2.0"]
10-
distribution = "2201.11.0"
10+
distribution = "2201.10.0-20241019-091600-89e54c08"
1111

12-
[platform.java17]
12+
[platform.java21]
1313
graalvmCompatible = true
1414

15-
[[platform.java17.dependency]]
15+
[[platform.java21.dependency]]
1616
groupId = "io.ballerina.stdlib"
1717
artifactId = "websubhub-native"
1818
version = "@toml.version@"

Diff for: ‎build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
*/
1717

1818
plugins {
19-
id "com.github.spotbugs" version "5.0.14"
20-
id "com.github.johnrengelman.shadow" version "8.1.1"
21-
id "de.undercouch.download" version "5.4.0"
22-
id "net.researchgate.release" version "2.8.0"
19+
id "com.github.spotbugs" version "${spotbugsPluginVersion}"
20+
id "com.github.johnrengelman.shadow" version "${shadowJarPluginVersion}"
21+
id "de.undercouch.download" version "${downloadPluginVersion}"
22+
id "net.researchgate.release" version "${releasePluginVersion}"
2323
}
2424

2525
ext.ballerinaLangVersion = project.ballerinaLangVersion

Diff for: ‎compiler-plugin-tests/build.gradle

+5-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,11 @@ checkstyle {
4848
checkstyleTest.dependsOn(":checkstyle:downloadCheckstyleRuleFiles")
4949

5050
spotbugsTest {
51-
effort "max"
52-
reportLevel "low"
51+
def classLoader = plugins["com.github.spotbugs"].class.classLoader
52+
def SpotBugsConfidence = classLoader.findLoadedClass("com.github.spotbugs.snom.Confidence")
53+
def SpotBugsEffort = classLoader.findLoadedClass("com.github.spotbugs.snom.Effort")
54+
effort = SpotBugsEffort.MAX
55+
reportLevel = SpotBugsConfidence.LOW
5356
reportsDir = file("$project.buildDir/reports/spotbugs")
5457
reports {
5558
html.enabled true

Diff for: ‎compiler-plugin/build.gradle

+5-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,11 @@ checkstyle {
4040
checkstyleMain.dependsOn(":checkstyle:downloadCheckstyleRuleFiles")
4141

4242
spotbugsMain {
43-
effort "max"
44-
reportLevel "low"
43+
def classLoader = plugins["com.github.spotbugs"].class.classLoader
44+
def SpotBugsConfidence = classLoader.findLoadedClass("com.github.spotbugs.snom.Confidence")
45+
def SpotBugsEffort = classLoader.findLoadedClass("com.github.spotbugs.snom.Effort")
46+
effort = SpotBugsEffort.MAX
47+
reportLevel = SpotBugsConfidence.LOW
4548
reportsDir = file("$project.buildDir/reports/spotbugs")
4649
reports {
4750
html.enabled true

Diff for: ‎compiler-plugin/src/main/java/io/ballerina/stdlib/websubhub/task/validator/ServiceDeclarationValidator.java

+4
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ public class ServiceDeclarationValidator {
4141
private static final Map<String, List<String>> allowedReturnTypes;
4242
private static final List<String> methodsWithOptionalReturnTypes;
4343

44+
private ServiceDeclarationValidator() {
45+
//private constructor
46+
}
47+
4448
static {
4549
allowedMethods = List.of(
4650
Constants.ON_REGISTER_TOPIC, Constants.ON_DEREGISTER_TOPIC, Constants.ON_UPDATE_MESSAGE,

Diff for: ‎gradle.properties

+27-21
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,48 @@
11
org.gradle.caching=true
22
group=io.ballerina.stdlib
33
version=1.13.0-SNAPSHOT
4-
ballerinaLangVersion=2201.11.0-20241008-112400-81975006
4+
ballerinaLangVersion=2201.11.0-20241112-214900-6b80ab87
5+
56
puppycrawlCheckstyleVersion=10.12.0
67
testngVersion=7.6.1
78
ballerinaGradlePluginVersion=2.0.1
89
gsonVersion=2.8.8
910

11+
spotbugsPluginVersion=6.0.18
12+
shadowJarPluginVersion=8.1.1
13+
downloadPluginVersion=5.4.0
14+
releasePluginVersion=2.8.0
15+
1016
# Direct Dependencies
11-
stdlibIoVersion=1.6.1
12-
stdlibRandomVersion=1.5.0
13-
stdlibTimeVersion=2.4.0
14-
stdlibUrlVersion=2.4.0
15-
stdlibCryptoVersion=2.7.2
16-
stdlibLogVersion=2.10.0
17-
stdlibMimeVersion=2.10.0
18-
stdlibUuidVersion=1.8.0
19-
stdlibHttpVersion=2.13.0-20241106-120000-d375c3b
17+
stdlibIoVersion=1.6.2-20241112-233100-995cf5f
18+
stdlibRandomVersion=1.5.1-20241113-122300-1bc770e
19+
stdlibTimeVersion=2.6.0-20241113-073800-201b904
20+
stdlibUrlVersion=2.4.1-20241113-073900-335ff51
21+
stdlibCryptoVersion=2.7.3-20241113-081400-d015a39
22+
stdlibLogVersion=2.10.1-20241113-120000-4577868
23+
stdlibMimeVersion=2.10.2-20241113-154200-d953747
24+
stdlibUuidVersion=1.8.1-20241113-154400-443c67b
25+
stdlibHttpVersion=2.13.0-20241114-182900-7e9f66a
2026

2127
# Transitive Dependencies
2228

2329
# Level 01
24-
stdlibConstraintVersion=1.5.0
30+
stdlibConstraintVersion=1.6.0-20241113-090900-d276ad5
2531

2632
# Level 02
27-
stdlibOsVersion=1.8.0
28-
stdlibTaskVersion=2.5.0
33+
stdlibOsVersion=1.8.1-20241113-122000-cca973b
34+
stdlibTaskVersion=2.5.1-20241113-123500-f905281
2935

3036
# Level 03
31-
stdlibCacheVersion=3.8.0
32-
stdlibFileVersion=1.10.0
37+
stdlibCacheVersion=3.8.1-20241113-125700-b75a1bf
38+
stdlibFileVersion=1.10.1-20241113-151700-e1a2e38
3339

3440
# Level 04
35-
stdlibAuthVersion=2.12.0
36-
stdlibDataJsonDataVersion=0.3.0-20241105-101100-661d11f
37-
stdlibJwtVersion=2.13.0
38-
stdlibOAuth2Version=2.12.0
41+
stdlibAuthVersion=2.12.1-20241113-162300-ded40eb
42+
stdlibDataJsonDataVersion=0.3.0-20241114-143900-285d739
43+
stdlibJwtVersion=2.13.1-20241113-162400-b59ccfa
44+
stdlibOAuth2Version=2.12.1-20241113-162400-4c6ddfe
3945

4046
# Ballerinax Observe
41-
observeVersion=1.3.0
42-
observeInternalVersion=1.3.0
47+
observeVersion=1.4.0-20241113-092000-b83ae74
48+
observeInternalVersion=1.3.1-20241113-101700-265054d

Diff for: ‎native/build.gradle

+5-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,11 @@ checkstyle {
4242
checkstyleMain.dependsOn(":checkstyle:downloadCheckstyleRuleFiles")
4343

4444
spotbugsMain {
45-
effort "max"
46-
reportLevel "low"
45+
def classLoader = plugins["com.github.spotbugs"].class.classLoader
46+
def SpotBugsConfidence = classLoader.findLoadedClass("com.github.spotbugs.snom.Confidence")
47+
def SpotBugsEffort = classLoader.findLoadedClass("com.github.spotbugs.snom.Effort")
48+
effort = SpotBugsEffort.MAX
49+
reportLevel = SpotBugsConfidence.LOW
4750
reportsDir = file("$project.buildDir/reports/spotbugs")
4851
reports {
4952
html.enabled true

Diff for: ‎native/src/main/java/io/ballerina/stdlib/websubhub/HubCallback.java

-67
This file was deleted.

0 commit comments

Comments
 (0)