Merge remote-tracking branch 'origin/3.1.x' into 4.0.x

Author: OlgaMaciaszek

pom.xml

@@ -31,7 +31,7 @@
 		<!-- Plugin versions -->
 		<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
 		<!-- Sonar -->
-		<surefire.plugin.version>2.19.1</surefire.plugin.version>
+		<surefire.plugin.version>2.22.2</surefire.plugin.version>
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
 		<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
 		<sonar.jacoco.reportPath>${project.basedir}/../target/jacoco.exec

spring-cloud-openfeign-core/pom.xml

@@ -187,7 +187,7 @@
 		<dependency>
 			<groupId>com.google.protobuf</groupId>
 			<artifactId>protobuf-java</artifactId>
-			<version>3.19.6</version>
+			<version>3.25.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>