Skip to content

Commit facbdd6

Browse files
kweinmeisterkweinmeister
authored
chore(deps): update dependency mockito to 5.3.1 (GoogleCloudPlatform#7969)
* chore(deps): update dependency mockito to 5.2.0 * address failures * update gradle references * fixes * linting * update version * update mailjet dependency * revert mailjet changes * update gradle * debug mailjet * downgrade mockito in compute/mailjet * update inline dependencies
1 parent bb41acc commit facbdd6

File tree

130 files changed

+181
-190
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+181
-190
lines changed

‎appengine-java11-bundled-services/datastore/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@
103103
</dependency>
104104
<dependency>
105105
<groupId>org.mockito</groupId>
106-
<artifactId>mockito-all</artifactId>
107-
<version>1.10.19</version>
106+
<artifactId>mockito-core</artifactId>
107+
<version>5.3.1</version>
108108
<scope>test</scope>
109109
</dependency>
110110

‎appengine-java11/cloudsql/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<dependency>
9393
<groupId>org.mockito</groupId>
9494
<artifactId>mockito-core</artifactId>
95-
<version>4.11.0</version>
95+
<version>5.3.1</version>
9696
<scope>test</scope>
9797
</dependency>
9898
<dependency>

‎appengine-java17-bundled-services/datastore/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@
103103
</dependency>
104104
<dependency>
105105
<groupId>org.mockito</groupId>
106-
<artifactId>mockito-all</artifactId>
107-
<version>1.10.19</version>
106+
<artifactId>mockito-core</artifactId>
107+
<version>5.3.1</version>
108108
<scope>test</scope>
109109
</dependency>
110110

‎appengine-java8/analytics/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
<dependency>
101101
<groupId>org.mockito</groupId>
102102
<artifactId>mockito-core</artifactId>
103-
<version>1.10.19</version>
103+
<version>4.11.0</version>
104104
<scope>test</scope>
105105
</dependency>
106106
<dependency>

‎appengine-java8/appidentity/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@
9797
</dependency>
9898
<dependency>
9999
<groupId>org.mockito</groupId>
100-
<artifactId>mockito-all</artifactId>
101-
<version>1.10.19</version>
100+
<artifactId>mockito-core</artifactId>
101+
<version>4.11.0</version>
102102
<scope>test</scope>
103103
</dependency>
104104
<dependency>

‎appengine-java8/appidentity/src/test/java/com/example/appengine/appidentity/IdentityServletTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class IdentityServletTest {
5050

5151
@Before
5252
public void setUp() throws Exception {
53-
MockitoAnnotations.initMocks(this);
53+
MockitoAnnotations.openMocks(this);
5454
helper.setUp();
5555

5656
// Set up a fake HTTP response.

‎appengine-java8/appidentity/src/test/java/com/example/appengine/appidentity/SignForAppServletTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public class SignForAppServletTest {
4949

5050
@Before
5151
public void setUp() throws Exception {
52-
MockitoAnnotations.initMocks(this);
52+
MockitoAnnotations.openMocks(this);
5353
helper.setUp();
5454

5555
// Set up a fake HTTP response.

‎appengine-java8/bigquery/src/test/java/com/example/appengine/bigquerylogging/BigQueryRunnerTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public class BigQueryRunnerTest {
7070

7171
@Before
7272
public void setUp() {
73-
MockitoAnnotations.initMocks(this);
73+
MockitoAnnotations.openMocks(this);
7474
bout = new ByteArrayOutputStream();
7575
PrintStream out = new PrintStream(bout);
7676

‎appengine-java8/bigtable/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ dependencies {
5454

5555
testCompile group: 'com.google.truth', name: 'truth', version:'1.1.3'
5656
testCompile group: 'junit', name: 'junit', version:'4.13.2'
57-
testCompile group: 'org.mockito', name: 'mockito-all', version:'1.10.19'
57+
testCompile group: 'org.mockito', name: 'mockito-core', version:'4.11.0'
5858
}
5959

6060
import org.apache.tools.ant.filters.ReplaceTokens

‎appengine-java8/bigtable/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ limitations under the License.
8181
</dependency>
8282
<dependency>
8383
<groupId>org.mockito</groupId>
84-
<artifactId>mockito-all</artifactId>
85-
<version>1.10.19</version>
84+
<artifactId>mockito-core</artifactId>
85+
<version>4.11.0</version>
8686
<scope>test</scope>
8787
</dependency>
8888
</dependencies>

0 commit comments

Comments
 (0)