From 4d84150ae4b5be57986b54a44cf683d6715383b8 Mon Sep 17 00:00:00 2001
From: bwatters-r7 <bwatters@rapid7.com>
Date: Wed, 22 May 2024 15:51:14 -0500
Subject: [PATCH 1/3] Update json library to 20231013

---
 java/androidpayload/library/pom.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/java/androidpayload/library/pom.xml b/java/androidpayload/library/pom.xml
index 72dcecc8d..6f8f6f078 100644
--- a/java/androidpayload/library/pom.xml
+++ b/java/androidpayload/library/pom.xml
@@ -21,6 +21,18 @@
 			<artifactId>android</artifactId>
 			<version>4.1.1.4</version>
 			<scope>provided</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.json</groupId>
+					<artifactId>json</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.json</groupId>
+			<artifactId>json</artifactId>
+			<version>20231013</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.metasploit</groupId>

From cf7b51430060d3a99c44cfffa1ae4c000140841a Mon Sep 17 00:00:00 2001
From: bwatters-r7 <bwatters@rapid7.com>
Date: Wed, 22 May 2024 17:40:46 -0500
Subject: [PATCH 2/3] Fix library here, too

---
 java/androidpayload/app/pom.xml                     | 12 ++++++++++++
 .../version-compatibility-check/android-api/pom.xml | 13 +++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/java/androidpayload/app/pom.xml b/java/androidpayload/app/pom.xml
index dc096bf7a..b9fc3d0aa 100644
--- a/java/androidpayload/app/pom.xml
+++ b/java/androidpayload/app/pom.xml
@@ -21,6 +21,18 @@
 			<artifactId>android</artifactId>
 			<version>2.3.3</version>
 			<scope>provided</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.json</groupId>
+					<artifactId>json</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.json</groupId>
+			<artifactId>json</artifactId>
+			<version>20231013</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.metasploit</groupId>
diff --git a/java/version-compatibility-check/android-api/pom.xml b/java/version-compatibility-check/android-api/pom.xml
index 610be7e69..493aaef72 100644
--- a/java/version-compatibility-check/android-api/pom.xml
+++ b/java/version-compatibility-check/android-api/pom.xml
@@ -16,6 +16,19 @@
 			<groupId>com.google.android</groupId>
 			<artifactId>android</artifactId>
 			<version>4.1.1.4</version>
+			<scope>provided</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.json</groupId>
+					<artifactId>json</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.json</groupId>
+			<artifactId>json</artifactId>
+			<version>20231013</version>
+			<scope>provided</scope>
 		</dependency>
 	</dependencies>
 	<build>

From f00b2731cb85e072a6841ff32b3b29ab3ad071d8 Mon Sep 17 00:00:00 2001
From: bwatters-r7 <bwatters@rapid7.com>
Date: Thu, 23 May 2024 15:36:20 -0500
Subject: [PATCH 3/3] Turns out we don't need those libraries at all.

---
 java/androidpayload/app/pom.xml                      | 6 ------
 java/androidpayload/library/pom.xml                  | 6 ------
 java/version-compatibility-check/android-api/pom.xml | 6 ------
 3 files changed, 18 deletions(-)

diff --git a/java/androidpayload/app/pom.xml b/java/androidpayload/app/pom.xml
index b9fc3d0aa..231abee43 100644
--- a/java/androidpayload/app/pom.xml
+++ b/java/androidpayload/app/pom.xml
@@ -28,12 +28,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>org.json</groupId>
-			<artifactId>json</artifactId>
-			<version>20231013</version>
-			<scope>provided</scope>
-		</dependency>
 		<dependency>
 			<groupId>com.metasploit</groupId>
 			<artifactId>Metasploit-Java-Shared</artifactId>
diff --git a/java/androidpayload/library/pom.xml b/java/androidpayload/library/pom.xml
index 6f8f6f078..572adcf32 100644
--- a/java/androidpayload/library/pom.xml
+++ b/java/androidpayload/library/pom.xml
@@ -28,12 +28,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>org.json</groupId>
-			<artifactId>json</artifactId>
-			<version>20231013</version>
-			<scope>provided</scope>
-		</dependency>
 		<dependency>
 			<groupId>com.metasploit</groupId>
 			<artifactId>Metasploit-JavaPayload</artifactId>
diff --git a/java/version-compatibility-check/android-api/pom.xml b/java/version-compatibility-check/android-api/pom.xml
index 493aaef72..4b11ba2e0 100644
--- a/java/version-compatibility-check/android-api/pom.xml
+++ b/java/version-compatibility-check/android-api/pom.xml
@@ -24,12 +24,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>org.json</groupId>
-			<artifactId>json</artifactId>
-			<version>20231013</version>
-			<scope>provided</scope>
-		</dependency>
 	</dependencies>
 	<build>
 		<plugins>