From c28ef3122e7b2c5ef61178d04e96d526caf9bde0 Mon Sep 17 00:00:00 2001
From: ghidra1 <ghidra1@users.noreply.github.com>
Date: Tue, 5 May 2026 09:45:10 -0400
Subject: [PATCH 1/2] GP-6719 Updated Ghidra Server serial.filter

---
 Ghidra/Features/GhidraServer/data/serial.filter | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Ghidra/Features/GhidraServer/data/serial.filter b/Ghidra/Features/GhidraServer/data/serial.filter
index 99022f5455..711e2a6c6b 100644
--- a/Ghidra/Features/GhidraServer/data/serial.filter
+++ b/Ghidra/Features/GhidraServer/data/serial.filter
@@ -39,6 +39,7 @@ sun.security.x509.X509CertImpl;
 
 java.rmi.server.UID;
 java.rmi.server.ObjID;
+[Ljava.rmi.server.ObjID;
 
 java.rmi.dgc.DGC;
 java.rmi.dgc.Lease;

From daa0bc243a700e49f23971eac30dbd1c03afb3d7 Mon Sep 17 00:00:00 2001
From: ghidra1 <ghidra1@users.noreply.github.com>
Date: Tue, 5 May 2026 10:15:20 -0400
Subject: [PATCH 2/2] GP-6719 Corrected gradle test code for Gradle 9
 compatibility

---
 build.gradle | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index a47afdd415..8292e72acb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -319,6 +319,20 @@ def getCurrentDateTimeLong() {
 	return formattedDate
 }
 
+/*********************************************************************************
+ * Returns the project object from the given projectDependency
+ *********************************************************************************/
+def getDependencyProject(p, projectDependency) {
+    if (projectDependency.hasProperty("path")) {
+        // Supported by Gradle 8.11 and later
+        return p.project(projectDependency.path)
+    }
+    else {
+        // Supported in Gradle 8.5, removed in Gradle 9
+        return projectDependency.dependencyProject
+    }
+}
+
 /*********************************************************************************
  * Returns true if 'project' has a direct or transitive API project dependency
  * on the project with path 'targetPath'. The 'targetPath' should be specified
@@ -335,11 +349,11 @@ boolean hasApiProjectDependency(Project project, String targetPath) {
             .allDependencies
             .withType(org.gradle.api.artifacts.ProjectDependency)
 
-        if (apiDeps.any { it.dependencyProject.path == targetPath }) {
+        if (apiDeps.any { getDependencyProject(p, it).path == targetPath }) {
             return true
         }
 
-        return apiDeps.any { dep -> walk(dep.dependencyProject) }
+        return apiDeps.any { walk(getDependencyProject(p, it)) }
     }
 
     walk(project)