Skip to content

Commit

Permalink
Merge pull request #40544 from ballerina-platform/ballerina-1.2.x
Browse files Browse the repository at this point in the history 
Sync Ballerina 1.2.39-stage branch with Ballerina 1.2.x
  • Loading branch information
@keizer619
keizer619 committed May 31, 2023
2 parents cfa9248 + 0d2ff3e commit 65901cd
Show file tree
Hide file tree
Showing 12 changed files with 38 additions and 38 deletions.
12 changes: 6 additions & 6 deletions distribution/zip/jballerina-tools/LICENSE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions distribution/zip/jballerina-tools/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
12 changes: 6 additions & 6 deletions distribution/zip/jballerina/LICENSE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gradle/javaLibsProject.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
10 changes: 5 additions & 5 deletions gradle/javaProject.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'

Expand Down
2 changes: 1 addition & 1 deletion misc/testerina/modules/testerina-core/src/main/ballerina/Ballerina.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
6 changes: 3 additions & 3 deletions stdlib/grpc/src/main/ballerina/Ballerina.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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]]
Expand Down
6 changes: 3 additions & 3 deletions stdlib/http/src/main/ballerina/Ballerina.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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]]
Expand Down
6 changes: 3 additions & 3 deletions stdlib/mime/src/main/ballerina/Ballerina.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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]]
Expand Down
6 changes: 3 additions & 3 deletions stdlib/websub/src/main/ballerina/Ballerina.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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]]
Expand Down
2 changes: 1 addition & 1 deletion tests/ballerina-test-utils/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'))
Expand Down
2 changes: 1 addition & 1 deletion tests/jballerina-integration-test/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down

0 comments on commit 65901cd

Please sign in to comment.