Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync 1.2.x after 1.2.50 release #42390

Merged
merged 8 commits into from
Mar 25, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update vulnerable versions
HindujaB committed Mar 21, 2024
commit be3bc5c02256b778ed7693361983c8e45d90dd0d
2 changes: 1 addition & 1 deletion bvm/ballerina-rt/build.gradle
Original file line number Diff line number Diff line change
@@ -91,7 +91,7 @@ dependencies {
dist 'io.opentracing:opentracing-util:0.33.0'
dist 'org.awaitility:awaitility:3.1.6'
dist 'org.hdrhistogram:HdrHistogram:2.1.10'
dist 'com.h2database:h2:1.4.199'
dist 'com.h2database:h2:2.2.220'
dist 'org.hdrhistogram:HdrHistogram:2.1.10'

// observability extensions
2 changes: 1 addition & 1 deletion cli/ballerina-cli-module/build.gradle
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@ dependencies {
implementation project(':toml-parser')
implementation 'com.moandjiezana.toml:toml4j'
implementation 'info.picocli:picocli'
implementation 'org.apache.commons:commons-compress:1.21'
implementation 'org.apache.commons:commons-compress:1.26.0'
implementation 'me.tongfei:progressbar:0.7.4'
implementation 'org.jline:jline:3.11.0'
implementation 'javax.ws.rs:javax.ws.rs-api'
2 changes: 1 addition & 1 deletion cli/ballerina-packerina/build.gradle
Original file line number Diff line number Diff line change
@@ -47,7 +47,7 @@ dependencies {
implementation project(':maven-resolver')
implementation 'com.moandjiezana.toml:toml4j'
implementation 'info.picocli:picocli'
implementation 'org.apache.commons:commons-compress:1.21'
implementation 'org.apache.commons:commons-compress:1.26.0'

testCompile 'org.testng:testng'
testCompile 'com.moandjiezana.toml:toml4j'
2 changes: 1 addition & 1 deletion distribution/zip/jballerina-tools/LICENSE
Original file line number Diff line number Diff line change
@@ -241,7 +241,7 @@ org.wso2.securevault-1.0.0-wso2v2.jar
kubernetes.jar jar apache2
debug-adapter-core-1.1.0.jar jar apache2
debug-adapter-cli-1.1.0.jar jar apache2
h2-1.4.199.jar bundle apache2
h2-2.2.220.jar bundle apache2
org.eclipse.lsp4j-0.8.1.jar bundle epl1
commons-io-2.11.0.jar bundle apache2
language-server-stdio-launcher-1.1.0.jar jar apache2
2 changes: 1 addition & 1 deletion distribution/zip/jballerina-tools/build.gradle
Original file line number Diff line number Diff line change
@@ -77,7 +77,7 @@ dependencies {
// 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'
dist 'org.apache.commons:commons-compress:1.21'
dist 'org.apache.commons:commons-compress:1.26.0'
dist 'me.tongfei:progressbar:0.7.4'
dist 'org.jline:jline:3.11.0'

2 changes: 1 addition & 1 deletion distribution/zip/jballerina/LICENSE
Original file line number Diff line number Diff line change
@@ -241,7 +241,7 @@ org.wso2.securevault-1.0.0-wso2v2.jar
kubernetes.jar jar apache2
debug-adapter-core-1.1.0.jar jar apache2
debug-adapter-cli-1.1.0.jar jar apache2
h2-1.4.199.jar bundle apache2
h2-2.2.220.jar bundle apache2
org.eclipse.lsp4j-0.8.1.jar bundle epl1
commons-io-2.11.0.jar bundle apache2
language-server-stdio-launcher-1.1.0.jar jar apache2
2 changes: 1 addition & 1 deletion gradle/javaLibsProject.gradle
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ dependencies {
dist 'org.wso2.securevault:org.wso2.securevault:1.0.0-wso2v2'
dist 'org.wso2.transport.file:org.wso2.transport.local-file-system:6.0.55'
dist 'org.wso2.transport.http:org.wso2.transport.http.netty:6.3.48'
dist 'org.bouncycastle:bcprov-jdk15on:1.69'
dist 'org.bouncycastle:bcprov-jdk15on:1.73'
dist 'org.bouncycastle:bcpkix-jdk15on:1.61'

dist 'info.picocli:picocli:4.0.1'
6 changes: 3 additions & 3 deletions gradle/javaProject.gradle
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ dependencies {
implementation 'com.atlassian.commonmark:commonmark-ext-gfm-tables:0.11.0'
implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.2'
implementation 'com.h2database:h2:1.4.199'
implementation 'com.h2database:h2:2.2.220'
implementation 'org.hsqldb:hsqldb:2.2.7'
implementation 'com.wix:wix-embedded-mysql:4.6.1'
implementation 'mysql:mysql-connector-java:8.0.19'
@@ -62,7 +62,7 @@ dependencies {
implementation 'org.apache.kafka:kafka-clients:2.8.2'
implementation 'org.apache.kafka:kafka_2.13:2.8.2'
implementation 'org.apache.avro:avro:1.9.2'
implementation 'org.apache.james:apache-mime4j-core:0.8.9'
implementation 'org.apache.james:apache-mime4j-core:0.8.10'
implementation 'org.apache.mina:mina-core:2.0.16'
implementation 'org.apache.maven:maven-plugin-api:3.6.0'
implementation 'org.apache.maven.plugin-tools:maven-plugin-annotations:3.6.0'
@@ -75,7 +75,7 @@ dependencies {
implementation 'org.codehaus.woodstox:stax2-api:4.2.1'
implementation 'org.awaitility:awaitility:3.1.6'
implementation 'org.apache.thrift:libthrift:0.14.1'
implementation 'org.bouncycastle:bcprov-jdk15on:1.69'
implementation 'org.bouncycastle:bcprov-jdk15on:1.73'
implementation 'org.bouncycastle:bcpkix-jdk15on:1.61'
implementation 'org.bytedeco.javacpp-presets:llvm-platform:6.0.1-1.4.2'
implementation 'org.codehaus.plexus:plexus-utils:3.0.8'
2 changes: 1 addition & 1 deletion language-server/modules/langserver-core/build.gradle
Original file line number Diff line number Diff line change
@@ -143,7 +143,7 @@ dependencies {
// baloImplementation project(path: ':ballerina-websub', configuration: 'baloImplementation')
baloImplementation project(path: ':testerina:testerina-core', configuration: 'baloImplementation')

dependency 'com.h2database:h2:1.4.199'
dependency 'com.h2database:h2:2.2.220'
dependency 'org.eclipse.lsp4j:org.eclipse.lsp4j:0.8.1'
dependency 'org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc:0.8.1'
dependency 'commons-io:commons-io:2.11.0'
2 changes: 1 addition & 1 deletion misc/debug-adapter/modules/debug-adapter-core/build.gradle
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ repositories {
dependencies {
implementation 'org.eclipse.lsp4j:org.eclipse.lsp4j.debug:0.8.1'
implementation project(':ballerina-lang')
implementation 'org.apache.commons:commons-compress:1.21'
implementation 'org.apache.commons:commons-compress:1.26.0'
implementation files(org.gradle.internal.jvm.Jvm.current().toolsJar)
}

4 changes: 2 additions & 2 deletions stdlib/grpc/src/main/ballerina/Ballerina.toml
Original file line number Diff line number Diff line change
@@ -112,8 +112,8 @@ target = "java8"

[[platform.libraries]]
artifactId = "bcprov-jdk15on"
version = "1.69"
path = "./lib/bcprov-jdk15on-1.69.jar"
version = "1.73"
path = "./lib/bcprov-jdk15on-1.73.jar"
groupId = "org.bouncycastle"
modules = ["grpc"]

4 changes: 2 additions & 2 deletions stdlib/http/src/main/ballerina/Ballerina.toml
Original file line number Diff line number Diff line change
@@ -105,8 +105,8 @@ target = "java8"

[[platform.libraries]]
artifactId = "bcprov-jdk15on"
version = "1.69"
path = "./lib/bcprov-jdk15on-1.69.jar"
version = "1.73"
path = "./lib/bcprov-jdk15on-1.73.jar"
groupId = "org.bouncycastle"
modules = ["http"]

4 changes: 2 additions & 2 deletions stdlib/mime/src/main/ballerina/Ballerina.toml
Original file line number Diff line number Diff line change
@@ -112,8 +112,8 @@ target = "java8"

[[platform.libraries]]
artifactId = "bcprov-jdk15on"
version = "1.69"
path = "./lib/bcprov-jdk15on-1.69.jar"
version = "1.73"
path = "./lib/bcprov-jdk15on-1.73.jar"
groupId = "org.bouncycastle"
modules = ["mime"]

4 changes: 2 additions & 2 deletions stdlib/websub/src/main/ballerina/Ballerina.toml
Original file line number Diff line number Diff line change
@@ -105,8 +105,8 @@ target = "java8"

[[platform.libraries]]
artifactId = "bcprov-jdk15on"
version = "1.69"
path = "./lib/bcprov-jdk15on-1.69.jar"
version = "1.73"
path = "./lib/bcprov-jdk15on-1.73.jar"
groupId = "org.bouncycastle"
modules = ["web-sub"]