Skip to content

Commit 826b363

Browse files
olavloiteolavloite
authored
deps: upgrade Mockito to support Java17 (googleapis#635)
* deps: upgrade Mockito to support Java17 Update Mockito to a version that supports the Java module system. This should enable Java17 support. Also cleans up one of the test files that failed for Java17. Fixes the build error in googleapis#621 * test: do not restart mock server before each test
1 parent 9c6e960 commit 826b363

6 files changed

Lines changed: 229 additions & 817 deletions

File tree

‎java-spanner-jdbc/pom.xml‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<findbugs.version>3.0.2</findbugs.version>
5454
<threeten.version>1.4.4</threeten.version>
5555
<truth.version>1.1.3</truth.version>
56-
<mockito.version>2.28.2</mockito.version>
56+
<mockito.version>3.12.4</mockito.version>
5757
<hamcrest.version>2.2</hamcrest.version>
5858
</properties>
5959

@@ -383,24 +383,6 @@
383383
</plugins>
384384
</build>
385385
</profile>
386-
<profile>
387-
<id>jdk17</id>
388-
<activation>
389-
<jdk>[17,)</jdk>
390-
</activation>
391-
<build>
392-
<plugins>
393-
<plugin>
394-
<groupId>org.apache.maven.plugins</groupId>
395-
<artifactId>maven-surefire-plugin</artifactId>
396-
<configuration>
397-
<!-- TODO: eventually this shouldn't be necessary after things are fixed. -->
398-
<argLine>--add-opens java.base/java.io=ALL-UNNAMED</argLine>
399-
</configuration>
400-
</plugin>
401-
</plugins>
402-
</build>
403-
</profile>
404386
</profiles>
405387

406388
<reporting>

0 commit comments

Comments
 (0)