This is an automated email from the ASF dual-hosted git repository. zhangduo pushed a commit to branch branch-2 in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push: new 37d49aa HBASE-22927 Upgrade Mockito version for jdk11 (#593) 37d49aa is described below commit 37d49aaaf64b4ca3f36486982dd967d9f032b0c0 Author: ravowlga123 <ravow...@gmail.com> AuthorDate: Wed Sep 18 15:16:19 2019 +0200 HBASE-22927 Upgrade Mockito version for jdk11 (#593) Signed-off-by: Duo Zhang <zhang...@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 3ca9546..044f7c5 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 3dfaf85..00014d1 100755 --- a/pom.xml +++ b/pom.xml @@ -1323,7 +1323,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> @@ -2324,6 +2324,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> @@ -2335,6 +2342,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>