HBASE-22927 Upgrade Mockito version for jdk11 (#593)

Signed-off-by: Duo Zhang <zhangduo@apache.org>
This commit is contained in:
ravowlga123 2019-09-18 15:16:19 +02:00 committed by Duo Zhang
parent 759343b7bc
commit 18ac61091d
2 changed files with 12 additions and 2 deletions

View File

@ -92,7 +92,7 @@
<dependency> <dependency>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId> <artifactId>extra-enforcer-rules</artifactId>
<version>1.0-beta-6</version> <version>${extra.enforcer.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
<executions> <executions>

12
pom.xml
View File

@ -1485,7 +1485,7 @@
<hamcrest.version>1.3</hamcrest.version> <hamcrest.version>1.3</hamcrest.version>
<htrace.version>4.2.0-incubating</htrace.version> <htrace.version>4.2.0-incubating</htrace.version>
<log4j.version>1.2.17</log4j.version> <log4j.version>1.2.17</log4j.version>
<mockito-core.version>2.1.0</mockito-core.version> <mockito-core.version>2.28.2</mockito-core.version>
<!--Internally we use a different version of protobuf. See hbase-protocol-shaded--> <!--Internally we use a different version of protobuf. See hbase-protocol-shaded-->
<external.protobuf.version>2.5.0</external.protobuf.version> <external.protobuf.version>2.5.0</external.protobuf.version>
<protobuf.plugin.version>0.5.0</protobuf.plugin.version> <protobuf.plugin.version>0.5.0</protobuf.plugin.version>
@ -2497,6 +2497,13 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId> <artifactId>maven-enforcer-plugin</artifactId>
<version>${enforcer.version}</version> <version>${enforcer.version}</version>
<dependencies>
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId>
<version>${extra.enforcer.version}</version>
</dependency>
</dependencies>
<configuration> <configuration>
<rules> <rules>
<enforceBytecodeVersion> <enforceBytecodeVersion>
@ -2508,6 +2515,9 @@
Non-release builds can temporarily build with a newer JDK version by setting the Non-release builds can temporarily build with a newer JDK version by setting the
'compileSource' property (eg. mvn -DcompileSource=1.8 clean package). 'compileSource' property (eg. mvn -DcompileSource=1.8 clean package).
</message> </message>
<ignoreClasses>
<ignoreClass>module-info</ignoreClass>
</ignoreClasses>
</enforceBytecodeVersion> </enforceBytecodeVersion>
</rules> </rules>
</configuration> </configuration>