You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2019/09/18 14:06:11 UTC
[hbase] branch branch-2.1 updated: HBASE-22927 Upgrade Mockito
version for jdk11 (#593)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 75a5f34 HBASE-22927 Upgrade Mockito version for jdk11 (#593)
75a5f34 is described below
commit 75a5f34d053dbd8b3b4fb3d2566b4675beda476e
Author: ravowlga123 <ra...@gmail.com>
AuthorDate: Wed Sep 18 15:16:19 2019 +0200
HBASE-22927 Upgrade Mockito version for jdk11 (#593)
Signed-off-by: Duo Zhang <zh...@apache.org>
---
hbase-shaded/hbase-shaded-check-invariants/pom.xml | 2 +-
pom.xml | 12 +++++++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/hbase-shaded/hbase-shaded-check-invariants/pom.xml b/hbase-shaded/hbase-shaded-check-invariants/pom.xml
index a70c008..316a94a 100644
--- a/hbase-shaded/hbase-shaded-check-invariants/pom.xml
+++ b/hbase-shaded/hbase-shaded-check-invariants/pom.xml
@@ -92,7 +92,7 @@
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId>
- <version>1.0-beta-6</version>
+ <version>${extra.enforcer.version}</version>
</dependency>
</dependencies>
<executions>
diff --git a/pom.xml b/pom.xml
index a949993..eff57b5 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1403,7 +1403,7 @@
<hamcrest.version>1.3</hamcrest.version>
<htrace.version>4.2.0-incubating</htrace.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-->
<external.protobuf.version>2.5.0</external.protobuf.version>
<protobuf.plugin.version>0.5.0</protobuf.plugin.version>
@@ -2376,6 +2376,13 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>${enforcer.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>extra-enforcer-rules</artifactId>
+ <version>${extra.enforcer.version}</version>
+ </dependency>
+ </dependencies>
<configuration>
<rules>
<enforceBytecodeVersion>
@@ -2387,6 +2394,9 @@
Non-release builds can temporarily build with a newer JDK version by setting the
'compileSource' property (eg. mvn -DcompileSource=1.8 clean package).
</message>
+ <ignoreClasses>
+ <ignoreClass>module-info</ignoreClass>
+ </ignoreClasses>
</enforceBytecodeVersion>
</rules>
</configuration>