Skip to content

Commit 8869b8e

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

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
@@ -1402,7 +1402,7 @@
14021402
<hamcrest.version>1.3</hamcrest.version>
14031403
<htrace.version>4.2.0-incubating</htrace.version>
14041404
<log4j.version>1.2.17</log4j.version>
1405-
<mockito-core.version>2.1.0</mockito-core.version>
1405+
<mockito-core.version>2.28.2</mockito-core.version>
14061406
<!--Internally we use a different version of protobuf. See hbase-protocol-shaded-->
14071407
<external.protobuf.version>2.5.0</external.protobuf.version>
14081408
<protobuf.plugin.version>0.5.0</protobuf.plugin.version>
@@ -2370,6 +2370,13 @@
23702370
<groupId>org.apache.maven.plugins</groupId>
23712371
<artifactId>maven-enforcer-plugin</artifactId>
23722372
<version>${enforcer.version}</version>
2373+
<dependencies>
2374+
<dependency>
2375+
<groupId>org.codehaus.mojo</groupId>
2376+
<artifactId>extra-enforcer-rules</artifactId>
2377+
<version>${extra.enforcer.version}</version>
2378+
</dependency>
2379+
</dependencies>
23732380
<configuration>
23742381
<rules>
23752382
<enforceBytecodeVersion>
@@ -2381,6 +2388,9 @@
23812388
Non-release builds can temporarily build with a newer JDK version by setting the
23822389
'compileSource' property (eg. mvn -DcompileSource=1.8 clean package).
23832390
</message>
2391+
<ignoreClasses>
2392+
<ignoreClass>module-info</ignoreClass>
2393+
</ignoreClasses>
23842394
</enforceBytecodeVersion>
23852395
</rules>
23862396
</configuration>

0 commit comments

Comments
 (0)