Skip to content

HBASE-22927 Upgrade Mockito version for jdk11 #593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 18, 2019
Merged

HBASE-22927 Upgrade Mockito version for jdk11 #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
aeef376
HBASE-22927 Upgrade Mockito version for jdk11 and add module-info in …
rabi-kumar Sep 6, 2019
36f9922
HBASE-22927 Upgraded mockito version from 2.23.0 to 2.28.2 and module…
rabi-kumar Sep 9, 2019
94e9c1a
HBASE-22927 Upgrade mockito to 2.28.2 and remove ignore class
rabi-kumar Sep 11, 2019
8a340c6
HBASE-22927 Upgrade mockito from 2.23.0 to 2.28.2 and add module-info…
rabi-kumar Sep 12, 2019
055fdb8
HBASE-22927 Upgrade mockito version for Java 11 compatibility. Added …
rabi-kumar Sep 12, 2019
0f422ea
HBASE-22927 Trying some change in hbase-shaded-check-invariants pom i…
rabi-kumar Sep 13, 2019
ee73319
HBASE-22927 Remove the change made in hbase-shaded-check-invariants p…
rabi-kumar Sep 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hbase-shaded/hbase-shaded-check-invariants/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
12 changes: 11 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1484,7 +1484,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>
Expand Down Expand Up @@ -2489,6 +2489,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>
Expand All @@ -2500,6 +2507,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>
Expand Down