aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build.gradle2
-rw-r--r--server/sonar-webserver-ws/src/testFixtures/java/org/sonar/server/ws/TestRequest.java4
-rw-r--r--server/sonar-webserver-ws/src/testFixtures/java/org/sonar/server/ws/TestResponse.java4
3 files changed, 5 insertions, 5 deletions
diff --git a/build.gradle b/build.gradle
index b174da09ae8..01c20a0cb9b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -207,7 +207,7 @@ subprojects {
}
ext {
- protobufVersion = '3.25.5'
+ protobufVersion = '4.28.2'
springVersion = '5.3.39'
elasticSearchClientVersion = '7.17.24'
}
diff --git a/server/sonar-webserver-ws/src/testFixtures/java/org/sonar/server/ws/TestRequest.java b/server/sonar-webserver-ws/src/testFixtures/java/org/sonar/server/ws/TestRequest.java
index bb75f1cca9e..d5b3e5cbcff 100644
--- a/server/sonar-webserver-ws/src/testFixtures/java/org/sonar/server/ws/TestRequest.java
+++ b/server/sonar-webserver-ws/src/testFixtures/java/org/sonar/server/ws/TestRequest.java
@@ -23,7 +23,7 @@ import com.google.common.base.Throwables;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ListMultimap;
-import com.google.protobuf.GeneratedMessageV3;
+import com.google.protobuf.GeneratedMessage;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.StringReader;
@@ -186,7 +186,7 @@ public class TestRequest extends ValidatingRequest {
}
}
- public <T extends GeneratedMessageV3> T executeProtobuf(Class<T> protobufClass) {
+ public <T extends GeneratedMessage> T executeProtobuf(Class<T> protobufClass) {
return setMediaType(PROTOBUF).execute().getInputObject(protobufClass);
}
diff --git a/server/sonar-webserver-ws/src/testFixtures/java/org/sonar/server/ws/TestResponse.java b/server/sonar-webserver-ws/src/testFixtures/java/org/sonar/server/ws/TestResponse.java
index da78a8978a4..8fee04c5f0e 100644
--- a/server/sonar-webserver-ws/src/testFixtures/java/org/sonar/server/ws/TestResponse.java
+++ b/server/sonar-webserver-ws/src/testFixtures/java/org/sonar/server/ws/TestResponse.java
@@ -19,7 +19,7 @@
*/
package org.sonar.server.ws;
-import com.google.protobuf.GeneratedMessageV3;
+import com.google.protobuf.GeneratedMessage;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.lang.reflect.Method;
@@ -43,7 +43,7 @@ public class TestResponse {
return new ByteArrayInputStream(testableResponse.getFlushedOutput());
}
- public <T extends GeneratedMessageV3> T getInputObject(Class<T> protobufClass) {
+ public <T extends GeneratedMessage> T getInputObject(Class<T> protobufClass) {
try (InputStream input = getInputStream()) {
Method parseFromMethod = protobufClass.getMethod("parseFrom", InputStream.class);
@SuppressWarnings("unchecked")