chore: merge main into generate-libraries-main

Author: cloud-java-bot

google-cloud-pubsub/pom.xml

@@ -114,11 +114,6 @@
     </dependency>
 
     <!-- Test dependencies -->
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -133,6 +128,13 @@
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
       <scope>test</scope>
+    </dependency>
+	<!-- we keep mockito after easymock in this pom so easymock's byte-buddy transitive
+	dependency is picked up with higher priority -->
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.cloud</groupId>

pom.xml

@@ -98,7 +98,7 @@
       <dependency>
         <groupId>org.easymock</groupId>
         <artifactId>easymock</artifactId>
-        <version>5.2.0</version>
+        <version>5.6.0</version>
         <scope>test</scope>
       </dependency>
       <dependency>