Skip to content

Commit

Permalink
Merge pull request #43601 from HindujaB/ballerina-1.2.x
Browse files Browse the repository at this point in the history 
Update protobuf-java, commons-io versions
  • Loading branch information
@HindujaB
HindujaB authored Nov 18, 2024
2 parents 0979de2 + 3724f97 commit 953cacc
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions distribution/zip/jballerina-tools/LICENSE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions distribution/zip/jballerina/LICENSE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
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 @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions gradle/javaProject.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion language-server/modules/langserver-core/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion misc/protobuf-ballerina/src/main/java/org/ballerinalang/protobuf/cmd/GrpcCmd.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions stdlib/grpc/src/main/ballerina/Ballerina.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

Expand Down
4 changes: 2 additions & 2 deletions stdlib/messaging/nats/src/main/ballerina/Ballerina.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

Expand Down
2 changes: 1 addition & 1 deletion ...ion-test/src/test/java/org/ballerinalang/test/service/grpc/tool/ProtoDescriptorUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 953cacc

Please sign in to comment.