[1.13] up versions to be secure and fix issues due to deprecation (#1187) (#1188)

This commit is contained in:
Cassie Coyle 2025-01-07 19:46:08 -06:00 committed by GitHub
parent 380cda68f8
commit 9cd6db2f5d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 33 additions and 12 deletions

View File

@ -129,6 +129,11 @@
<artifactId>javax.annotation-api</artifactId> <artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version> <version>1.3.2</version>
</dependency> </dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>${protobuf.version}</version>
</dependency>
</dependencies> </dependencies>
<build> <build>

View File

@ -113,6 +113,11 @@
<version>${grpc.version}</version> <version>${grpc.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>2.1.0</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>

View File

@ -32,9 +32,9 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.gmazzo</groupId> <groupId>com.github.gmazzo.okhttp.mock</groupId>
<artifactId>okhttp-mock</artifactId> <artifactId>mock-client</artifactId>
<version>1.4.1</version> <version>2.0.0</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

View File

@ -301,8 +301,8 @@ public class DaprGrpcClientTest {
responseObserver.onError(se); responseObserver.onError(se);
} }
private <T extends GeneratedMessageV3> void populateObserver(StreamObserver<T> responseObserver, GeneratedMessageV3 generatedMessageV3) { private <T extends com.google.protobuf.Message> void populateObserver(StreamObserver<T> responseObserver, T message) {
responseObserver.onNext((T) generatedMessageV3); responseObserver.onNext(message);
responseObserver.onCompleted(); responseObserver.onCompleted();
} }
} }

View File

@ -55,6 +55,11 @@
<version>${grpc.version}</version> <version>${grpc.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
<version>3.9.1</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
@ -130,7 +135,7 @@
<configuration> <configuration>
<protocCommand>protoc</protocCommand> <protocCommand>protoc</protocCommand>
<protocVersion>${protobuf.version}</protocVersion> <protocVersion>${protobuf.version}</protocVersion>
<protocArtifact>com.google.protobuf:protoc:3.21.1</protocArtifact> <protocArtifact>com.google.protobuf:protoc:3.25.5</protocArtifact>
<addProtoSources>inputs</addProtoSources> <addProtoSources>inputs</addProtoSources>
<includeMavenTypes>direct</includeMavenTypes> <includeMavenTypes>direct</includeMavenTypes>
<includeStdTypes>true</includeStdTypes> <includeStdTypes>true</includeStdTypes>

View File

@ -26,8 +26,8 @@
<dapr.sdk.alpha.version>0.14.0-SNAPSHOT</dapr.sdk.alpha.version> <dapr.sdk.alpha.version>0.14.0-SNAPSHOT</dapr.sdk.alpha.version>
<protobuf.output.directory>${project.build.directory}/generated-sources</protobuf.output.directory> <protobuf.output.directory>${project.build.directory}/generated-sources</protobuf.output.directory>
<protobuf.input.directory>${project.basedir}/proto</protobuf.input.directory> <protobuf.input.directory>${project.basedir}/proto</protobuf.input.directory>
<grpc.version>1.64.0</grpc.version> <grpc.version>1.69.0</grpc.version>
<protobuf.version>3.25.0</protobuf.version> <protobuf.version>3.25.5</protobuf.version>
<opentelemetry.version>1.39.0</opentelemetry.version> <opentelemetry.version>1.39.0</opentelemetry.version>
<springboot.version>3.3.1</springboot.version> <springboot.version>3.3.1</springboot.version>
<logback-classic.version>1.4.12</logback-classic.version> <logback-classic.version>1.4.12</logback-classic.version>

View File

@ -52,7 +52,13 @@
<dependency> <dependency>
<groupId>com.squareup.okhttp3</groupId> <groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId> <artifactId>okhttp</artifactId>
<version>4.9.3</version> <version>4.12.0</version>
<exclusions>
<exclusion>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
@ -72,9 +78,9 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.gmazzo</groupId> <groupId>com.github.gmazzo.okhttp.mock</groupId>
<artifactId>okhttp-mock</artifactId> <artifactId>mock-client</artifactId>
<version>1.4.1</version> <version>2.0.0</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>