From c6f5b320e925a5c35b246c38d4dbc149ad279945 Mon Sep 17 00:00:00 2001 From: Tharik Kanaka Date: Fri, 26 May 2023 14:00:57 +0530 Subject: [PATCH 1/6] Update jackson dependency versions --- distribution/zip/jballerina-tools/LICENSE | 10 +++++----- distribution/zip/jballerina-tools/build.gradle | 10 +++++----- distribution/zip/jballerina/LICENSE | 10 +++++----- gradle/javaProject.gradle | 8 ++++---- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/distribution/zip/jballerina-tools/LICENSE b/distribution/zip/jballerina-tools/LICENSE index ad2d5fffb1c9..72f917a34714 100644 --- a/distribution/zip/jballerina-tools/LICENSE +++ b/distribution/zip/jballerina-tools/LICENSE @@ -77,10 +77,10 @@ ballerina-xmlutils-1.1.0.jar amqp-client-5.7.3.jar bundle apache2 + mpl11 ballerina-client-generator-1.1.0.jar jar apache2 jnats-2.6.0.jar bundle apache2 -jackson-core-2.14.0.jar bundle apache2 +jackson-core-2.14.2.jar bundle apache2 socket.jar jar apache2 stax2-api-3.1.1.jar bundle bsd -jackson-databind-2.14.0.jar bundle apache2 +jackson-databind-2.14.2.jar bundle apache2 oauth2.jar jar apache2 module_push.jar jar apache2 openapi-to-ballerina-generator-1.1.0.jar jar apache2 @@ -156,7 +156,7 @@ map-1.1.0.jar websub.jar jar apache2 ballerina-streams-1.1.0.jar jar apache2 ballerina-packerina-1.1.0.jar jar apache2 -jackson-dataformat-yaml-2.14.0.jar bundle apache2 +jackson-dataformat-yaml-2.14.2.jar bundle apache2 config.jar jar apache2 task.jar jar apache2 picocli-4.0.1.jar bundle apache2 @@ -191,11 +191,11 @@ broker-common-0.970.0.jar integer-1.1.0.jar jar apache2 openapi-validator-1.1.0.jar jar apache2 lang.array.jar jar apache2 -jackson-datatype-jsr310-2.14.0.jar bundle apache2 +jackson-datatype-jsr310-2.14.2.jar bundle apache2 array-1.1.0.jar jar apache2 crypto.jar jar apache2 ballerina-crypto-1.1.0.jar jar apache2 -jackson-annotations-2.14.0.jar bundle apache2 +jackson-annotations-2.14.2.jar bundle apache2 ballerina-backend-jvm-1.1.0.jar jar apache2 org.wso2.carbon.core-5.1.0.jar bundle apache2 transactions.jar jar apache2 diff --git a/distribution/zip/jballerina-tools/build.gradle b/distribution/zip/jballerina-tools/build.gradle index f634420808bc..82df0a516d3c 100644 --- a/distribution/zip/jballerina-tools/build.gradle +++ b/distribution/zip/jballerina-tools/build.gradle @@ -69,11 +69,11 @@ configurations { dependencies { dist 'org.bytedeco:javacpp:1.4.2' - dist 'com.fasterxml.jackson.core:jackson-databind:2.14.0' - dist 'com.fasterxml.jackson.core:jackson-core:2.14.0' - dist 'com.fasterxml.jackson.core:jackson-annotations:2.14.0' - dist 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.14.0' - dist 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.0' + dist 'com.fasterxml.jackson.core:jackson-databind:2.14.2' + dist 'com.fasterxml.jackson.core:jackson-core:2.14.2' + dist 'com.fasterxml.jackson.core:jackson-annotations:2.14.2' + dist 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.14.2' + dist 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.2' // dist 'org.ow2.asm:asm:6.2.1' dist 'com.fasterxml.woodstox:woodstox-core:6.5.0' dist 'org.codehaus.woodstox:stax2-api:4.2.1' diff --git a/distribution/zip/jballerina/LICENSE b/distribution/zip/jballerina/LICENSE index a8152d864d89..9cef2586a723 100644 --- a/distribution/zip/jballerina/LICENSE +++ b/distribution/zip/jballerina/LICENSE @@ -77,10 +77,10 @@ ballerina-xmlutils-1.1.0.jar amqp-client-5.7.3.jar bundle apache2 + mpl11 ballerina-client-generator-1.1.0.jar jar apache2 jnats-2.6.0.jar bundle apache2 -jackson-core-2.14.0.jar bundle apache2 +jackson-core-2.14.2.jar bundle apache2 socket.jar jar apache2 stax2-api-3.1.1.jar bundle bsd -jackson-databind-2.14.0.jar bundle apache2 +jackson-databind-2.14.2.jar bundle apache2 oauth2.jar jar apache2 module_push.jar jar apache2 openapi-to-ballerina-generator-1.1.0.jar jar apache2 @@ -156,7 +156,7 @@ map-1.1.0.jar websub.jar jar apache2 ballerina-streams-1.1.0.jar jar apache2 ballerina-packerina-1.1.0.jar jar apache2 -jackson-dataformat-yaml-2.14.0.jar bundle apache2 +jackson-dataformat-yaml-2.14.2.jar bundle apache2 config.jar jar apache2 task.jar jar apache2 picocli-4.0.1.jar bundle apache2 @@ -191,11 +191,11 @@ broker-common-0.970.0.jar integer-1.1.0.jar jar apache2 openapi-validator-1.1.0.jar jar apache2 lang.array.jar jar apache2 -jackson-datatype-jsr310-2.14.0.jar bundle apache2 +jackson-datatype-jsr310-2.14.2.jar bundle apache2 array-1.1.0.jar jar apache2 crypto.jar jar apache2 ballerina-crypto-1.1.0.jar jar apache2 -jackson-annotations-2.14.0.jar bundle apache2 +jackson-annotations-2.14.2.jar bundle apache2 ballerina-backend-jvm-1.1.0.jar jar apache2 org.wso2.carbon.core-5.1.0.jar bundle apache2 transactions.jar jar apache2 diff --git a/gradle/javaProject.gradle b/gradle/javaProject.gradle index 12082fc01260..0ba0a9038864 100644 --- a/gradle/javaProject.gradle +++ b/gradle/javaProject.gradle @@ -35,8 +35,8 @@ dependencies { implementation 'commons-logging:commons-logging:1.1.1' implementation 'com.atlassian.commonmark:commonmark:0.11.0' implementation 'com.atlassian.commonmark:commonmark-ext-gfm-tables:0.11.0' - implementation 'com.fasterxml.jackson.core:jackson-databind:2.14.0' - implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.14.0' + implementation 'com.fasterxml.jackson.core:jackson-databind:2.14.2' + implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.14.2' implementation 'com.h2database:h2:1.4.199' implementation 'org.hsqldb:hsqldb:2.2.7' implementation 'com.wix:wix-embedded-mysql:4.6.1' @@ -128,8 +128,8 @@ dependencies { implementation 'io.opentracing:opentracing-util:0.33.0' implementation 'io.opentracing:opentracing-mock:0.33.0' implementation 'io.swagger.core.v3:swagger-models:2.1.11' - implementation 'io.swagger.parser.v3:swagger-parser-v2-converter:2.1.10' - implementation 'io.swagger.parser.v3:swagger-parser:2.1.10' + implementation 'io.swagger.parser.v3:swagger-parser-v2-converter:2.1.14' + implementation 'io.swagger.parser.v3:swagger-parser:2.1.14' implementation 'me.tongfei:progressbar:0.7.4' implementation 'org.jline:jline:3.11.0' From ba4a2412267e46db0cc986f51b35ad04a37b58c1 Mon Sep 17 00:00:00 2001 From: Tharik Kanaka Date: Fri, 26 May 2023 14:28:12 +0530 Subject: [PATCH 2/6] Downgrade swagger-parser version --- gradle/javaProject.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/javaProject.gradle b/gradle/javaProject.gradle index 0ba0a9038864..1441ad690db4 100644 --- a/gradle/javaProject.gradle +++ b/gradle/javaProject.gradle @@ -128,8 +128,8 @@ dependencies { implementation 'io.opentracing:opentracing-util:0.33.0' implementation 'io.opentracing:opentracing-mock:0.33.0' implementation 'io.swagger.core.v3:swagger-models:2.1.11' - implementation 'io.swagger.parser.v3:swagger-parser-v2-converter:2.1.14' - implementation 'io.swagger.parser.v3:swagger-parser:2.1.14' + implementation 'io.swagger.parser.v3:swagger-parser-v2-converter:2.1.12' + implementation 'io.swagger.parser.v3:swagger-parser:2.1.12' implementation 'me.tongfei:progressbar:0.7.4' implementation 'org.jline:jline:3.11.0' From 203850b07534f8d91db6870bb6e0d2a5504aae4f Mon Sep 17 00:00:00 2001 From: Tharik Kanaka Date: Fri, 26 May 2023 14:51:23 +0530 Subject: [PATCH 3/6] Update swagger-parser version --- gradle/javaProject.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/javaProject.gradle b/gradle/javaProject.gradle index 1441ad690db4..06e70c90cc3b 100644 --- a/gradle/javaProject.gradle +++ b/gradle/javaProject.gradle @@ -128,8 +128,8 @@ dependencies { implementation 'io.opentracing:opentracing-util:0.33.0' implementation 'io.opentracing:opentracing-mock:0.33.0' implementation 'io.swagger.core.v3:swagger-models:2.1.11' - implementation 'io.swagger.parser.v3:swagger-parser-v2-converter:2.1.12' - implementation 'io.swagger.parser.v3:swagger-parser:2.1.12' + implementation 'io.swagger.parser.v3:swagger-parser-v2-converter:2.1.13' + implementation 'io.swagger.parser.v3:swagger-parser:2.1.13' implementation 'me.tongfei:progressbar:0.7.4' implementation 'org.jline:jline:3.11.0' From 1e7ca7d799892f18036fef75644a14890407f35f Mon Sep 17 00:00:00 2001 From: Tharik Kanaka Date: Fri, 26 May 2023 16:40:09 +0530 Subject: [PATCH 4/6] Switch snakeyaml dependency --- distribution/zip/jballerina-tools/LICENSE | 2 +- distribution/zip/jballerina/LICENSE | 2 +- gradle/javaLibsProject.gradle | 2 +- gradle/javaProject.gradle | 2 +- .../testerina-core/src/main/ballerina/Ballerina.toml | 2 +- stdlib/grpc/src/main/ballerina/Ballerina.toml | 6 +++--- stdlib/http/src/main/ballerina/Ballerina.toml | 6 +++--- stdlib/mime/src/main/ballerina/Ballerina.toml | 6 +++--- stdlib/websub/src/main/ballerina/Ballerina.toml | 6 +++--- tests/ballerina-test-utils/build.gradle | 2 +- tests/jballerina-integration-test/build.gradle | 2 +- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/distribution/zip/jballerina-tools/LICENSE b/distribution/zip/jballerina-tools/LICENSE index 72f917a34714..1b45def26ebc 100644 --- a/distribution/zip/jballerina-tools/LICENSE +++ b/distribution/zip/jballerina-tools/LICENSE @@ -175,7 +175,7 @@ axiom-api-1.2.22.jar ballerina-lang-1.1.0.jar jar apache2 javax.transaction-api-1.2.jar bundle cddl1 ballerina-docker-1.1.0.jar jar apache2 -snakeyaml-2.0.0.wso2v1.jar bundle apache2 +snakeyaml-2.0.jar bundle apache2 ballerina-stringutils-1.1.0.jar jar apache2 docerina-1.1.0.jar jar apache2 ballerina-observability-1.1.0.jar jar apache2 diff --git a/distribution/zip/jballerina/LICENSE b/distribution/zip/jballerina/LICENSE index 9cef2586a723..4c2929440e83 100644 --- a/distribution/zip/jballerina/LICENSE +++ b/distribution/zip/jballerina/LICENSE @@ -175,7 +175,7 @@ axiom-api-1.2.22.jar ballerina-lang-1.1.0.jar jar apache2 javax.transaction-api-1.2.jar bundle cddl1 ballerina-docker-1.1.0.jar jar apache2 -snakeyaml-2.0.0.wso2v1.jar bundle apache2 +snakeyaml-2.0.jar bundle apache2 ballerina-stringutils-1.1.0.jar jar apache2 docerina-1.1.0.jar jar apache2 ballerina-observability-1.1.0.jar jar apache2 diff --git a/gradle/javaLibsProject.gradle b/gradle/javaLibsProject.gradle index f364dc3750bc..e5bf4a0f2cf8 100644 --- a/gradle/javaLibsProject.gradle +++ b/gradle/javaLibsProject.gradle @@ -80,7 +80,7 @@ dependencies { dist 'org.wso2.carbon.metrics:org.wso2.carbon.metrics.core:2.3.7' dist 'com.google.protobuf:protobuf-java:3.21.7' dist 'com.sun.mail:javax.mail:1.6.2' - dist 'org.wso2.orbit.org.yaml:snakeyaml:2.0.0.wso2v1' + dist 'org.yaml:snakeyaml:2.0' dist 'org.wso2.staxon:staxon-core:1.2.0.wso2v2' dist 'com.rabbitmq:amqp-client:5.7.3' dist 'com.jcraft:jzlib:1.1.3' diff --git a/gradle/javaProject.gradle b/gradle/javaProject.gradle index 06e70c90cc3b..db26fa291efa 100644 --- a/gradle/javaProject.gradle +++ b/gradle/javaProject.gradle @@ -96,7 +96,7 @@ dependencies { implementation 'org.testng:testng:6.14.3' implementation 'org.wso2.carbon.messaging:org.wso2.carbon.messaging:2.3.7' implementation 'org.wso2.orbit.org.antlr:antlr4-runtime:4.5.1.wso2v1' - implementation 'org.wso2.orbit.org.yaml:snakeyaml:2.0.0.wso2v1' + implementation 'org.yaml:snakeyaml:2.0' implementation 'org.wso2.transport.http:org.wso2.transport.http.netty:6.3.43' implementation 'org.wso2.transport.file:org.wso2.transport.local-file-system:6.0.55' implementation 'org.wso2.staxon:staxon-core:1.2.0.wso2v2' diff --git a/misc/testerina/modules/testerina-core/src/main/ballerina/Ballerina.toml b/misc/testerina/modules/testerina-core/src/main/ballerina/Ballerina.toml index ea3544f398bc..c7b853d0dc11 100644 --- a/misc/testerina/modules/testerina-core/src/main/ballerina/Ballerina.toml +++ b/misc/testerina/modules/testerina-core/src/main/ballerina/Ballerina.toml @@ -8,5 +8,5 @@ target = "java8" [[platform.libraries]] artifactId = "mock" version = "0.0.0" - path = "./lib/testerina-core-1.2.38.jar" + path = "./lib/testerina-core-1.2.39.jar" groupId = "ballerina" diff --git a/stdlib/grpc/src/main/ballerina/Ballerina.toml b/stdlib/grpc/src/main/ballerina/Ballerina.toml index ff9f04fe01ca..5545c190a806 100644 --- a/stdlib/grpc/src/main/ballerina/Ballerina.toml +++ b/stdlib/grpc/src/main/ballerina/Ballerina.toml @@ -105,9 +105,9 @@ target = "java8" [[platform.libraries]] artifactId = "snakeyaml" - version = "2.0.0.wso2v1" - path = "./lib/snakeyaml-2.0.0.wso2v1.jar" - groupId = "org.wso2.orbit.org.yaml" + version = "2.0" + path = "./lib/snakeyaml-2.0.jar" + groupId = "org.yaml" modules = ["grpc"] [[platform.libraries]] diff --git a/stdlib/http/src/main/ballerina/Ballerina.toml b/stdlib/http/src/main/ballerina/Ballerina.toml index d902ea185a90..9d659ce8bc72 100644 --- a/stdlib/http/src/main/ballerina/Ballerina.toml +++ b/stdlib/http/src/main/ballerina/Ballerina.toml @@ -98,9 +98,9 @@ target = "java8" [[platform.libraries]] artifactId = "snakeyaml" - version = "2.0.0.wso2v1" - path = "./lib/snakeyaml-2.0.0.wso2v1.jar" - groupId = "org.wso2.orbit.org.yaml" + version = "2.0" + path = "./lib/snakeyaml-2.0.jar" + groupId = "org.yaml" modules = ["http"] [[platform.libraries]] diff --git a/stdlib/mime/src/main/ballerina/Ballerina.toml b/stdlib/mime/src/main/ballerina/Ballerina.toml index 8023cd3a9f92..12e39abe0b43 100644 --- a/stdlib/mime/src/main/ballerina/Ballerina.toml +++ b/stdlib/mime/src/main/ballerina/Ballerina.toml @@ -105,9 +105,9 @@ target = "java8" [[platform.libraries]] artifactId = "snakeyaml" - version = "2.0.0.wso2v1" - path = "./lib/snakeyaml-2.0.0.wso2v1.jar" - groupId = "org.wso2.orbit.org.yaml" + version = "2.0" + path = "./lib/snakeyaml-2.0.jar" + groupId = "org.yaml" modules = ["mime"] [[platform.libraries]] diff --git a/stdlib/websub/src/main/ballerina/Ballerina.toml b/stdlib/websub/src/main/ballerina/Ballerina.toml index c00a9b1984be..8ce2f0641da1 100644 --- a/stdlib/websub/src/main/ballerina/Ballerina.toml +++ b/stdlib/websub/src/main/ballerina/Ballerina.toml @@ -98,9 +98,9 @@ target = "java8" [[platform.libraries]] artifactId = "snakeyaml" - version = "2.0.0.wso2v1" - path = "./lib/snakeyaml-2.0.0.wso2v1.jar" - groupId = "org.wso2.orbit.org.yaml" + version = "2.0" + path = "./lib/snakeyaml-2.0.jar" + groupId = "org.yaml" modules = ["web-sub"] [[platform.libraries]] diff --git a/tests/ballerina-test-utils/build.gradle b/tests/ballerina-test-utils/build.gradle index 0a4e0c4b427a..19f70f423e80 100644 --- a/tests/ballerina-test-utils/build.gradle +++ b/tests/ballerina-test-utils/build.gradle @@ -73,7 +73,7 @@ shadowJar { exclude(dependency('io.netty:netty-resolver')) exclude(dependency('commons-pool.wso2:commons-pool')) exclude(dependency('commons-pool:commons-pool')) - exclude(dependency('org.wso2.orbit.org.yaml:snakeyaml')) + exclude(dependency('org.yaml:snakeyaml')) exclude(dependency('org.bouncycastle:bcprov-jdk15on')) exclude(dependency('org.bouncycastle:bcpkix-jdk15on')) exclude(dependency('io.netty:netty-tcnative-boringssl-static')) diff --git a/tests/jballerina-integration-test/build.gradle b/tests/jballerina-integration-test/build.gradle index a97102a3883e..dec306fbdfde 100644 --- a/tests/jballerina-integration-test/build.gradle +++ b/tests/jballerina-integration-test/build.gradle @@ -144,7 +144,7 @@ dependencies { testCompile 'io.netty:netty-codec-http' testCompile 'io.netty:netty-codec-http2' testCompile 'io.netty:netty-handler' - testCompile 'org.wso2.orbit.org.yaml:snakeyaml' + testCompile 'org.yaml:snakeyaml' testCompile 'org.awaitility:awaitility' testCompile 'org.hsqldb:hsqldb' testCompile 'com.h2database:h2' From 40074bcf42af22016007152c1b879da90923979e Mon Sep 17 00:00:00 2001 From: Tharik Kanaka Date: Fri, 26 May 2023 23:08:50 +0530 Subject: [PATCH 5/6] Update Swagger parser version --- gradle/javaProject.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/javaProject.gradle b/gradle/javaProject.gradle index db26fa291efa..732484c25b8d 100644 --- a/gradle/javaProject.gradle +++ b/gradle/javaProject.gradle @@ -128,8 +128,8 @@ dependencies { implementation 'io.opentracing:opentracing-util:0.33.0' implementation 'io.opentracing:opentracing-mock:0.33.0' implementation 'io.swagger.core.v3:swagger-models:2.1.11' - implementation 'io.swagger.parser.v3:swagger-parser-v2-converter:2.1.13' - implementation 'io.swagger.parser.v3:swagger-parser:2.1.13' + implementation 'io.swagger.parser.v3:swagger-parser-v2-converter:2.1.14' + implementation 'io.swagger.parser.v3:swagger-parser:2.1.14' implementation 'me.tongfei:progressbar:0.7.4' implementation 'org.jline:jline:3.11.0' From 484b3ed53625e669946d15089ac4d91229ee392c Mon Sep 17 00:00:00 2001 From: Tharik Kanaka Date: Sat, 27 May 2023 08:33:03 +0530 Subject: [PATCH 6/6] Fix indentations --- distribution/zip/jballerina-tools/LICENSE | 2 +- distribution/zip/jballerina/LICENSE | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/distribution/zip/jballerina-tools/LICENSE b/distribution/zip/jballerina-tools/LICENSE index 1b45def26ebc..f19ca93fd95a 100644 --- a/distribution/zip/jballerina-tools/LICENSE +++ b/distribution/zip/jballerina-tools/LICENSE @@ -175,7 +175,7 @@ axiom-api-1.2.22.jar ballerina-lang-1.1.0.jar jar apache2 javax.transaction-api-1.2.jar bundle cddl1 ballerina-docker-1.1.0.jar jar apache2 -snakeyaml-2.0.jar bundle apache2 +snakeyaml-2.0.jar bundle apache2 ballerina-stringutils-1.1.0.jar jar apache2 docerina-1.1.0.jar jar apache2 ballerina-observability-1.1.0.jar jar apache2 diff --git a/distribution/zip/jballerina/LICENSE b/distribution/zip/jballerina/LICENSE index 4c2929440e83..5987482567d7 100644 --- a/distribution/zip/jballerina/LICENSE +++ b/distribution/zip/jballerina/LICENSE @@ -175,7 +175,7 @@ axiom-api-1.2.22.jar ballerina-lang-1.1.0.jar jar apache2 javax.transaction-api-1.2.jar bundle cddl1 ballerina-docker-1.1.0.jar jar apache2 -snakeyaml-2.0.jar bundle apache2 +snakeyaml-2.0.jar bundle apache2 ballerina-stringutils-1.1.0.jar jar apache2 docerina-1.1.0.jar jar apache2 ballerina-observability-1.1.0.jar jar apache2