From fe3f5238df152b983436ef5e3e7102fecbd7417a Mon Sep 17 00:00:00 2001
From: dasveen <dasveen@amazon.com>
Date: Sat, 6 Aug 2022 15:17:41 +1000
Subject: [PATCH 1/2] updates to run the build with gradle 7.5

---
 build.gradle                                   |  2 +-
 hbase-sequence-file-reader/build.gradle        | 14 +++++++-------
 resolve-region-multisamekey-issue/build.gradle | 13 +++++++------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/build.gradle b/build.gradle
index 33c524d..924da0c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,5 +11,5 @@ repositories {
 
 dependencies {
 
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    testImplementation group: 'junit', name: 'junit', version: '4.12'
 }
diff --git a/hbase-sequence-file-reader/build.gradle b/hbase-sequence-file-reader/build.gradle
index 446f6d9..cd05724 100644
--- a/hbase-sequence-file-reader/build.gradle
+++ b/hbase-sequence-file-reader/build.gradle
@@ -11,12 +11,12 @@ repositories {
 
 dependencies {
 
-    compile group: 'org.apache.hbase', name: 'hbase-client', version: '1.4.2'
-    compile group: 'org.apache.hadoop', name: 'hadoop-common', version: '2.4.0'
-    compile group: 'org.apache.hadoop', name: 'hadoop-core', version: '1.2.1'
-    compile group: 'org.apache.hbase', name: 'hbase-mapreduce', version: '2.1.0'
+    implementation group: 'org.apache.hbase', name: 'hbase-client', version: '1.4.2'
+    implementation group: 'org.apache.hadoop', name: 'hadoop-common', version: '2.4.0'
+    implementation group: 'org.apache.hadoop', name: 'hadoop-core', version: '1.2.1'
+    implementation group: 'org.apache.hbase', name: 'hbase-mapreduce', version: '2.1.0'
 
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    testImplementation group: 'junit', name: 'junit', version: '4.12'
 }
 
 
@@ -25,8 +25,8 @@ jar {
         attributes 'Main-Class': 'org.cv.hbase.oneoff.sequencefile.ReadHBaseSequenceFile'
     }
     from {
-        (configurations.runtime).collect {
+        (configurations.runtimeClasspath).collect {
             it.isDirectory() ? it : zipTree(it)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/resolve-region-multisamekey-issue/build.gradle b/resolve-region-multisamekey-issue/build.gradle
index 7cd4d51..b4bf327 100644
--- a/resolve-region-multisamekey-issue/build.gradle
+++ b/resolve-region-multisamekey-issue/build.gradle
@@ -11,21 +11,22 @@ repositories {
 
 dependencies {
 
-    compile group: 'org.apache.hbase', name: 'hbase-client', version: '1.4.2'
-    compile group: 'com.beust', name: 'jcommander', version: '1.72'
-    compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
+    implementation group: 'org.apache.hbase', name: 'hbase-client', version: '1.4.2'
+    implementation group: 'com.beust', name: 'jcommander', version: '1.72'
+    implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
 
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    testImplementation group: 'junit', name: 'junit', version: '4.12'
 }
 
 
 jar {
     manifest {
+        duplicatesStrategy = 'include'
         attributes 'Main-Class': 'org.cv.hbase.oneoff.MultRegionStartWithSameKeyIssue'
     }
     from {
-        (configurations.runtime).collect {
+        (configurations.runtimeClasspath).collect {
             it.isDirectory() ? it : zipTree(it)
         }
     }
-}
\ No newline at end of file
+}

From 45cc11a68ba34caaa65325b2b0d71805107bfb67 Mon Sep 17 00:00:00 2001
From: dasveen <dasveen@amazon.com>
Date: Sat, 6 Aug 2022 20:44:55 +1000
Subject: [PATCH 2/2] updating the duplicatesStrategy to exclude

---
 hbase-sequence-file-reader/build.gradle        | 1 +
 resolve-region-multisamekey-issue/build.gradle | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/hbase-sequence-file-reader/build.gradle b/hbase-sequence-file-reader/build.gradle
index cd05724..8a5d005 100644
--- a/hbase-sequence-file-reader/build.gradle
+++ b/hbase-sequence-file-reader/build.gradle
@@ -22,6 +22,7 @@ dependencies {
 
 jar {
     manifest {
+        duplicatesStrategy = 'exclude'
         attributes 'Main-Class': 'org.cv.hbase.oneoff.sequencefile.ReadHBaseSequenceFile'
     }
     from {
diff --git a/resolve-region-multisamekey-issue/build.gradle b/resolve-region-multisamekey-issue/build.gradle
index b4bf327..c717c90 100644
--- a/resolve-region-multisamekey-issue/build.gradle
+++ b/resolve-region-multisamekey-issue/build.gradle
@@ -21,7 +21,7 @@ dependencies {
 
 jar {
     manifest {
-        duplicatesStrategy = 'include'
+        duplicatesStrategy = 'exclude'
         attributes 'Main-Class': 'org.cv.hbase.oneoff.MultRegionStartWithSameKeyIssue'
     }
     from {