SONAR-23133 Upgrade com.google.protobuf protoc and protobuf-java from 3.25.5 to 4...

diff --git a/build.gradle b/build.gradle
index b174da09ae8f03980616adcb0e95d3d5e59bd0ca..01c20a0cb9b5c0458a2555f0a67a830a7a6c34d8 100644 (file)
--- 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 bb75f1cca9eb82a731bcdcee947e30e63c526d32..d5b3e5cbcff4dc5bb2336dd842293a86acfa0126 100644 (file)
--- 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 da78a8978a4b370247ee902a0f4dc20b51814c30..8fee04c5f0ec1ee2df5da42e01699e66bed2b71c 100644 (file)
--- 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")