Skip to content

Commit

Permalink
Switch snakeyaml dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
keizer619 committed May 26, 2023
1 parent 203850b commit 1e7ca7d
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion distribution/zip/jballerina-tools/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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 Down
2 changes: 1 addition & 1 deletion distribution/zip/jballerina/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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 Down
2 changes: 1 addition & 1 deletion gradle/javaLibsProject.gradle
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
2 changes: 1 addition & 1 deletion gradle/javaProject.gradle
Original file line number Diff line number Diff line change
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
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
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
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
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
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
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
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 1e7ca7d

Please sign in to comment.