From 3724f97d079d5913e0d077b2b0c20e9f0785f6a6 Mon Sep 17 00:00:00 2001 From: hindujaB Date: Mon, 18 Nov 2024 16:10:10 +0530 Subject: [PATCH] Update protobuf-java, commons-io versions --- distribution/zip/jballerina-tools/LICENSE | 4 ++-- distribution/zip/jballerina/LICENSE | 4 ++-- gradle/javaLibsProject.gradle | 2 +- gradle/javaProject.gradle | 4 ++-- language-server/modules/langserver-core/build.gradle | 2 +- .../src/main/java/org/ballerinalang/protobuf/cmd/GrpcCmd.java | 2 +- stdlib/grpc/src/main/ballerina/Ballerina.toml | 4 ++-- stdlib/messaging/nats/src/main/ballerina/Ballerina.toml | 4 ++-- .../test/service/grpc/tool/ProtoDescriptorUtils.java | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/distribution/zip/jballerina-tools/LICENSE b/distribution/zip/jballerina-tools/LICENSE index 5c3f9b6bf846..56bd01bdf860 100644 --- a/distribution/zip/jballerina-tools/LICENSE +++ b/distribution/zip/jballerina-tools/LICENSE @@ -101,7 +101,7 @@ ballerina-ldap-1.1.0.jar ballerina-logging-1.1.0.jar jar apache2 lang.future.jar jar apache2 object-1.1.0.jar jar apache2 -protobuf-java-3.21.7.jar bundle apache2 +protobuf-java-3.25.5.jar bundle apache2 module_search.jar jar apache2 broker-core-0.970.5.jar bundle apache2 ballerina-grpc-1.1.0.jar jar apache2 @@ -242,7 +242,7 @@ debug-adapter-core-1.1.0.jar debug-adapter-cli-1.1.0.jar jar apache2 h2-1.4.199.jar bundle apache2 org.eclipse.lsp4j-0.8.1.jar bundle epl1 -commons-io-2.11.0.jar bundle apache2 +commons-io-2.14.0.jar bundle apache2 language-server-stdio-launcher-1.1.0.jar jar apache2 language-server-cli-1.1.0.jar jar apache2 org.eclipse.lsp4j.jsonrpc-0.8.1.jar bundle epl1 diff --git a/distribution/zip/jballerina/LICENSE b/distribution/zip/jballerina/LICENSE index dbac9b143d90..826ea26257ac 100644 --- a/distribution/zip/jballerina/LICENSE +++ b/distribution/zip/jballerina/LICENSE @@ -101,7 +101,7 @@ ballerina-ldap-1.1.0.jar ballerina-logging-1.1.0.jar jar apache2 lang.future.jar jar apache2 object-1.1.0.jar jar apache2 -protobuf-java-3.21.7.jar bundle apache2 +protobuf-java-3.25.5.jar bundle apache2 module_search.jar jar apache2 broker-core-0.970.5.jar bundle apache2 ballerina-grpc-1.1.0.jar jar apache2 @@ -242,7 +242,7 @@ debug-adapter-core-1.1.0.jar debug-adapter-cli-1.1.0.jar jar apache2 h2-1.4.199.jar bundle apache2 org.eclipse.lsp4j-0.8.1.jar bundle epl1 -commons-io-2.11.0.jar bundle apache2 +commons-io-2.14.0.jar bundle apache2 language-server-stdio-launcher-1.1.0.jar jar apache2 language-server-cli-1.1.0.jar jar apache2 org.eclipse.lsp4j.jsonrpc-0.8.1.jar bundle epl1 diff --git a/gradle/javaLibsProject.gradle b/gradle/javaLibsProject.gradle index 36b92426e2a8..b035592b6aaf 100644 --- a/gradle/javaLibsProject.gradle +++ b/gradle/javaLibsProject.gradle @@ -78,7 +78,7 @@ dependencies { dist 'commons-pool.wso2:commons-pool:1.5.6.wso2v1' dist 'org.wso2.carbon.messaging:org.wso2.carbon.messaging:2.3.7' dist 'org.wso2.carbon.metrics:org.wso2.carbon.metrics.core:2.3.7' - dist 'com.google.protobuf:protobuf-java:3.21.7' + dist 'com.google.protobuf:protobuf-java:3.25.5' dist 'com.sun.mail:javax.mail:1.6.2' dist 'org.yaml:snakeyaml:2.0' dist 'org.wso2.staxon:staxon-core:1.2.0.wso2v2' diff --git a/gradle/javaProject.gradle b/gradle/javaProject.gradle index ca7a6db1b043..04173a2fffee 100644 --- a/gradle/javaProject.gradle +++ b/gradle/javaProject.gradle @@ -31,7 +31,7 @@ dependencies { constraints { implementation 'commons-beanutils:commons-beanutils:1.9.4' implementation 'commons-codec:commons-codec:1.15' - implementation 'commons-io:commons-io:2.11.0' + implementation 'commons-io:commons-io:2.14.0' 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' @@ -43,7 +43,7 @@ dependencies { implementation 'mysql:mysql-connector-java:8.0.19' implementation 'com.github.chewiebug:gcviewer:1.35' implementation "com.github.jknack:handlebars:4.3.1" - implementation 'com.google.protobuf:protobuf-java:3.21.7' + implementation 'com.google.protobuf:protobuf-java:3.25.5' implementation 'com.google.code.findbugs:jsr305:3.0.2' implementation 'com.google.code.gson:gson:2.8.9' implementation 'com.google.guava:guava:32.1.1-jre' diff --git a/language-server/modules/langserver-core/build.gradle b/language-server/modules/langserver-core/build.gradle index 21ec5aada46f..a82007558516 100644 --- a/language-server/modules/langserver-core/build.gradle +++ b/language-server/modules/langserver-core/build.gradle @@ -146,7 +146,7 @@ dependencies { dependency 'com.h2database:h2:1.4.199' 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' + dependency 'commons-io:commons-io:2.14.0' dependency 'io.swagger:swagger-core:2.0.0-rc0' dependency 'io.swagger:swagger-models:2.0.0-rc0' dependency 'io.swagger:swagger-parser:2.0.0-rc1' diff --git a/misc/protobuf-ballerina/src/main/java/org/ballerinalang/protobuf/cmd/GrpcCmd.java b/misc/protobuf-ballerina/src/main/java/org/ballerinalang/protobuf/cmd/GrpcCmd.java index 66ae3ed6bd69..d5e72764e104 100644 --- a/misc/protobuf-ballerina/src/main/java/org/ballerinalang/protobuf/cmd/GrpcCmd.java +++ b/misc/protobuf-ballerina/src/main/java/org/ballerinalang/protobuf/cmd/GrpcCmd.java @@ -95,7 +95,7 @@ public class GrpcCmd implements BLauncherCmd { private String protocExePath; @CommandLine.Option(names = {"--protocVersion"}, hidden = true) - private String protocVersion = "3.21.7"; + private String protocVersion = "3.25.5"; @Override public void execute() { diff --git a/stdlib/grpc/src/main/ballerina/Ballerina.toml b/stdlib/grpc/src/main/ballerina/Ballerina.toml index fcd575a09400..ab52b7be84a0 100644 --- a/stdlib/grpc/src/main/ballerina/Ballerina.toml +++ b/stdlib/grpc/src/main/ballerina/Ballerina.toml @@ -210,8 +210,8 @@ target = "java8" [[platform.libraries]] artifactId = "protobuf-java" - version = "3.21.7" - path = "./lib/protobuf-java-3.21.7.jar" + version = "3.25.5" + path = "./lib/protobuf-java-3.25.5.jar" groupId = "com.google.protobuf" modules = ["grpc"] diff --git a/stdlib/messaging/nats/src/main/ballerina/Ballerina.toml b/stdlib/messaging/nats/src/main/ballerina/Ballerina.toml index 09a2eb69fec8..cc90d4ea6d23 100644 --- a/stdlib/messaging/nats/src/main/ballerina/Ballerina.toml +++ b/stdlib/messaging/nats/src/main/ballerina/Ballerina.toml @@ -21,8 +21,8 @@ target = "java8" [[platform.libraries]] artifactId = "protobuf-java" - version = "3.21.7" - path = "./lib/protobuf-java-3.21.7.jar" + version = "3.25.5" + path = "./lib/protobuf-java-3.25.5.jar" groupId = "com.google.protobuf" modules = ["nats"] diff --git a/tests/jballerina-integration-test/src/test/java/org/ballerinalang/test/service/grpc/tool/ProtoDescriptorUtils.java b/tests/jballerina-integration-test/src/test/java/org/ballerinalang/test/service/grpc/tool/ProtoDescriptorUtils.java index f75bb132ba89..89eb36983c81 100644 --- a/tests/jballerina-integration-test/src/test/java/org/ballerinalang/test/service/grpc/tool/ProtoDescriptorUtils.java +++ b/tests/jballerina-integration-test/src/test/java/org/ballerinalang/test/service/grpc/tool/ProtoDescriptorUtils.java @@ -53,7 +53,7 @@ static File getProtocCompiler() throws IOException, CodeGeneratorException { File protocExeFile = new File(System.getProperty("java.io.tmpdir"), "protoc-" + OSDetector .getDetectedClassifier() + ".exe"); String protocExePath = protocExeFile.getAbsolutePath(); // if file already exists will do nothing - String protocVersion = "3.21.7"; + String protocVersion = "3.25.5"; if (!protocExeFile.exists()) { String protocDownloadurl = PROTOC_PLUGIN_EXE_URL_SUFFIX + protocVersion + "/protoc-" + protocVersion + "-" + OSDetector.getDetectedClassifier() + PROTOC_PLUGIN_EXE_PREFIX;