From aeef3766ef118b38fc3a0e888f3ca2964b7ede61 Mon Sep 17 00:00:00 2001
From: ravowlga123 <ravowlga@gmail.com>
Date: Fri, 6 Sep 2019 11:36:02 +0200
Subject: [PATCH 1/7] HBASE-22927 Upgrade Mockito version for jdk11 and add
 module-info in ignore class of pom. Error while rebasing so creating new one.

---
 pom.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2cc265c8a311..ac5645be2124 100755
--- a/pom.xml
+++ b/pom.xml
@@ -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.23.0</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>
@@ -2500,6 +2500,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>

From 36f9922c526afb0071b9c6448bd38f6b00ad3de1 Mon Sep 17 00:00:00 2001
From: ravowlga123 <ravowlga@gmail.com>
Date: Mon, 9 Sep 2019 14:11:21 +0200
Subject: [PATCH 2/7] HBASE-22927 Upgraded mockito version from 2.23.0 to
 2.28.2 and module-info is still in ignoreclass.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ac5645be2124..9165404cb32c 100755
--- a/pom.xml
+++ b/pom.xml
@@ -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.23.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>

From 94e9c1a259770a0c7ea1bdf4d9a6284448cc5ed0 Mon Sep 17 00:00:00 2001
From: ravowlga123 <ravowlga@gmail.com>
Date: Wed, 11 Sep 2019 17:14:19 +0200
Subject: [PATCH 3/7] HBASE-22927 Upgrade mockito to 2.28.2 and remove ignore
 class

---
 pom.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9165404cb32c..df397a2cdfc0 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2500,9 +2500,6 @@
   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>

From 8a340c615485fa4707990e210c747abe4505f0e6 Mon Sep 17 00:00:00 2001
From: ravowlga123 <ravowlga@gmail.com>
Date: Thu, 12 Sep 2019 09:30:10 +0200
Subject: [PATCH 4/7] HBASE-22927 Upgrade mockito from 2.23.0 to 2.28.2 and add
 module-info in ignoreclass

---
 pom.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pom.xml b/pom.xml
index df397a2cdfc0..9165404cb32c 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2500,6 +2500,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>

From 055fdb86496a5ebcb645da9af592af1fb11c28c0 Mon Sep 17 00:00:00 2001
From: ravowlga123 <ravowlga@gmail.com>
Date: Thu, 12 Sep 2019 17:52:33 +0200
Subject: [PATCH 5/7] HBASE-22927 Upgrade mockito version for Java 11
 compatibility. Added extra enforcer rules

---
 pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pom.xml b/pom.xml
index 9165404cb32c..276ed2052733 100755
--- a/pom.xml
+++ b/pom.xml
@@ -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>

From 0f422ea00b5f56311bad730ba32b6425b8fe3754 Mon Sep 17 00:00:00 2001
From: ravowlga123 <ravowlga@gmail.com>
Date: Fri, 13 Sep 2019 16:57:46 +0200
Subject: [PATCH 6/7] HBASE-22927 Trying some change in
 hbase-shaded-check-invariants pom in the extra-enforcer part

---
 hbase-shaded/hbase-shaded-check-invariants/pom.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hbase-shaded/hbase-shaded-check-invariants/pom.xml b/hbase-shaded/hbase-shaded-check-invariants/pom.xml
index 064dfc314cb3..8298f087d451 100644
--- a/hbase-shaded/hbase-shaded-check-invariants/pom.xml
+++ b/hbase-shaded/hbase-shaded-check-invariants/pom.xml
@@ -129,6 +129,9 @@
                 <banDuplicateClasses>
                   <findAllDuplicates>true</findAllDuplicates>
                 </banDuplicateClasses>
+                <ignoreClasses>
+                  <ignoreClass>module-info</ignoreClass>
+                </ignoreClasses>
               </rules>
             </configuration>
           </execution>

From ee733190b8914a584054cd99b1983b21d1a445ac Mon Sep 17 00:00:00 2001
From: ravowlga123 <ravowlga@gmail.com>
Date: Mon, 16 Sep 2019 14:27:53 +0200
Subject: [PATCH 7/7] HBASE-22927 Remove the change made in
 hbase-shaded-check-invariants pom and use the same version as parent

---
 hbase-shaded/hbase-shaded-check-invariants/pom.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/hbase-shaded/hbase-shaded-check-invariants/pom.xml b/hbase-shaded/hbase-shaded-check-invariants/pom.xml
index 8298f087d451..013a5b1ce210 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>
@@ -129,9 +129,6 @@
                 <banDuplicateClasses>
                   <findAllDuplicates>true</findAllDuplicates>
                 </banDuplicateClasses>
-                <ignoreClasses>
-                  <ignoreClass>module-info</ignoreClass>
-                </ignoreClasses>
               </rules>
             </configuration>
           </execution>