Skip to content

Commit 57ac88e

Browse files
cicoylecicoyle
committed
[1.13] up versions to be secure and fix issues due to deprecation (dapr#1187)
* up versions to be secure and fix issues due to deprecation Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * see if this fixes it Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * check if protoc is in ci Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * see if changes from this PR (dapr#1182) fix it Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * 3.25.5 version protobuf-java Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * rm explicit versions and fix deprecation dependency to new one Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * merge in release branch and lower protoc versions to match Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * force upped version Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * use protobuf.version 3.25.5 (secure) Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * use correct protobuf for sdk tests Signed-off-by: Cassandra Coyle <cassie@diagrid.io> --------- Signed-off-by: Cassandra Coyle <cassie@diagrid.io>
1 parent 380cda6 commit 57ac88e

File tree

7 files changed

+33
-12
lines changed

7 files changed

+33
-12
lines changed

‎examples/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,11 @@
129129
<artifactId>javax.annotation-api</artifactId>
130130
<version>1.3.2</version>
131131
</dependency>
132+
<dependency>
133+
<groupId>com.google.protobuf</groupId>
134+
<artifactId>protobuf-java</artifactId>
135+
<version>${protobuf.version}</version>
136+
</dependency>
132137
</dependencies>
133138

134139
<build>

‎pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,11 @@
113113
<version>${grpc.version}</version>
114114
<scope>test</scope>
115115
</dependency>
116+
<dependency>
117+
<groupId>org.jetbrains.kotlin</groupId>
118+
<artifactId>kotlin-stdlib</artifactId>
119+
<version>2.1.0</version>
120+
</dependency>
116121
</dependencies>
117122
</dependencyManagement>
118123

‎sdk-actors/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
<scope>test</scope>
3333
</dependency>
3434
<dependency>
35-
<groupId>com.github.gmazzo</groupId>
36-
<artifactId>okhttp-mock</artifactId>
37-
<version>1.4.1</version>
35+
<groupId>com.github.gmazzo.okhttp.mock</groupId>
36+
<artifactId>mock-client</artifactId>
37+
<version>2.0.0</version>
3838
<scope>test</scope>
3939
</dependency>
4040
<dependency>

‎sdk-actors/src/test/java/io/dapr/actors/runtime/DaprGrpcClientTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,8 +301,8 @@ private void throwException(StreamObserver<?> responseObserver) {
301301
responseObserver.onError(se);
302302
}
303303

304-
private <T extends GeneratedMessageV3> void populateObserver(StreamObserver<T> responseObserver, GeneratedMessageV3 generatedMessageV3) {
305-
responseObserver.onNext((T) generatedMessageV3);
304+
private <T extends com.google.protobuf.Message> void populateObserver(StreamObserver<T> responseObserver, T message) {
305+
responseObserver.onNext(message);
306306
responseObserver.onCompleted();
307307
}
308308
}

‎sdk-autogen/pom.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@
5555
<version>${grpc.version}</version>
5656
<scope>test</scope>
5757
</dependency>
58+
<dependency>
59+
<groupId>com.squareup.okio</groupId>
60+
<artifactId>okio</artifactId>
61+
<version>3.9.1</version>
62+
</dependency>
5863
</dependencies>
5964

6065
<build>
@@ -130,7 +135,7 @@
130135
<configuration>
131136
<protocCommand>protoc</protocCommand>
132137
<protocVersion>${protobuf.version}</protocVersion>
133-
<protocArtifact>com.google.protobuf:protoc:3.21.1</protocArtifact>
138+
<protocArtifact>com.google.protobuf:protoc:3.25.5</protocArtifact>
134139
<addProtoSources>inputs</addProtoSources>
135140
<includeMavenTypes>direct</includeMavenTypes>
136141
<includeStdTypes>true</includeStdTypes>

‎sdk-tests/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
<dapr.sdk.alpha.version>0.14.0-SNAPSHOT</dapr.sdk.alpha.version>
2727
<protobuf.output.directory>${project.build.directory}/generated-sources</protobuf.output.directory>
2828
<protobuf.input.directory>${project.basedir}/proto</protobuf.input.directory>
29-
<grpc.version>1.64.0</grpc.version>
30-
<protobuf.version>3.25.0</protobuf.version>
29+
<grpc.version>1.69.0</grpc.version>
30+
<protobuf.version>3.25.5</protobuf.version>
3131
<opentelemetry.version>1.39.0</opentelemetry.version>
3232
<springboot.version>3.3.1</springboot.version>
3333
<logback-classic.version>1.4.12</logback-classic.version>

‎sdk/pom.xml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,13 @@
5252
<dependency>
5353
<groupId>com.squareup.okhttp3</groupId>
5454
<artifactId>okhttp</artifactId>
55-
<version>4.9.3</version>
55+
<version>4.12.0</version>
56+
<exclusions>
57+
<exclusion>
58+
<groupId>org.jetbrains.kotlin</groupId>
59+
<artifactId>kotlin-stdlib-jdk8</artifactId>
60+
</exclusion>
61+
</exclusions>
5662
</dependency>
5763
<dependency>
5864
<groupId>org.mockito</groupId>
@@ -72,9 +78,9 @@
7278
<scope>test</scope>
7379
</dependency>
7480
<dependency>
75-
<groupId>com.github.gmazzo</groupId>
76-
<artifactId>okhttp-mock</artifactId>
77-
<version>1.4.1</version>
81+
<groupId>com.github.gmazzo.okhttp.mock</groupId>
82+
<artifactId>mock-client</artifactId>
83+
<version>2.0.0</version>
7884
<scope>test</scope>
7985
</dependency>
8086
<dependency>

0 commit comments

Comments
 (0)