Skip to content

Commit 75a5f34

Browse files
rabi-kumarApache9
authored andcommitted
HBASE-22927 Upgrade Mockito version for jdk11 (#593)
Signed-off-by: Duo Zhang <[email protected]>
1 parent c434386 commit 75a5f34

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

hbase-shaded/hbase-shaded-check-invariants/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.codehaus.mojo</groupId>
9494
<artifactId>extra-enforcer-rules</artifactId>
95-
<version>1.0-beta-6</version>
95+
<version>${extra.enforcer.version}</version>
9696
</dependency>
9797
</dependencies>
9898
<executions>

pom.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1403,7 +1403,7 @@
14031403
<hamcrest.version>1.3</hamcrest.version>
14041404
<htrace.version>4.2.0-incubating</htrace.version>
14051405
<log4j.version>1.2.17</log4j.version>
1406-
<mockito-core.version>2.1.0</mockito-core.version>
1406+
<mockito-core.version>2.28.2</mockito-core.version>
14071407
<!--Internally we use a different version of protobuf. See hbase-protocol-shaded-->
14081408
<external.protobuf.version>2.5.0</external.protobuf.version>
14091409
<protobuf.plugin.version>0.5.0</protobuf.plugin.version>
@@ -2376,6 +2376,13 @@
23762376
<groupId>org.apache.maven.plugins</groupId>
23772377
<artifactId>maven-enforcer-plugin</artifactId>
23782378
<version>${enforcer.version}</version>
2379+
<dependencies>
2380+
<dependency>
2381+
<groupId>org.codehaus.mojo</groupId>
2382+
<artifactId>extra-enforcer-rules</artifactId>
2383+
<version>${extra.enforcer.version}</version>
2384+
</dependency>
2385+
</dependencies>
23792386
<configuration>
23802387
<rules>
23812388
<enforceBytecodeVersion>
@@ -2387,6 +2394,9 @@
23872394
Non-release builds can temporarily build with a newer JDK version by setting the
23882395
'compileSource' property (eg. mvn -DcompileSource=1.8 clean package).
23892396
</message>
2397+
<ignoreClasses>
2398+
<ignoreClass>module-info</ignoreClass>
2399+
</ignoreClasses>
23902400
</enforceBytecodeVersion>
23912401
</rules>
23922402
</configuration>

0 commit comments

Comments
 (0)