From b9a23d3b501222d464b741d91c0b14bca66f2d95 Mon Sep 17 00:00:00 2001
From: Dan <46821332+nsadeveloper789@users.noreply.github.com>
Date: Tue, 23 Apr 2024 11:17:42 -0400
Subject: [PATCH] GP-4487: Increment TraceRMI to version 11.1

---
 .../Debug/Debugger-agent-dbgeng/src/main/py/pyproject.toml  | 4 ++--
 Ghidra/Debug/Debugger-agent-gdb/src/main/py/pyproject.toml  | 4 ++--
 Ghidra/Debug/Debugger-agent-lldb/src/main/py/pyproject.toml | 4 ++--
 .../plugin/core/debug/service/tracermi/TraceRmiHandler.java | 2 +-
 .../src/main/py/src/ghidratrace/client.py                   | 6 +++++-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/main/py/pyproject.toml b/Ghidra/Debug/Debugger-agent-dbgeng/src/main/py/pyproject.toml
index 6a0362775e..77f367e634 100644
--- a/Ghidra/Debug/Debugger-agent-dbgeng/src/main/py/pyproject.toml
+++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/main/py/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ghidradbg"
-version = "10.4"
+version = "11.1"
 authors = [
   { name="Ghidra Development Team" },
 ]
@@ -17,7 +17,7 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 dependencies = [
-    "ghidratrace==10.4",
+    "ghidratrace==11.1",
     "pybag>=2.2.10"
 ]
 
diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/main/py/pyproject.toml b/Ghidra/Debug/Debugger-agent-gdb/src/main/py/pyproject.toml
index 2bee84cb02..cbff2cad29 100644
--- a/Ghidra/Debug/Debugger-agent-gdb/src/main/py/pyproject.toml
+++ b/Ghidra/Debug/Debugger-agent-gdb/src/main/py/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ghidragdb"
-version = "10.4"
+version = "11.1"
 authors = [
   { name="Ghidra Development Team" },
 ]
@@ -17,7 +17,7 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 dependencies = [
-    "ghidratrace==10.4",
+    "ghidratrace==11.1",
 ]
 
 [project.urls]
diff --git a/Ghidra/Debug/Debugger-agent-lldb/src/main/py/pyproject.toml b/Ghidra/Debug/Debugger-agent-lldb/src/main/py/pyproject.toml
index 216e155f45..df65c6dee9 100644
--- a/Ghidra/Debug/Debugger-agent-lldb/src/main/py/pyproject.toml
+++ b/Ghidra/Debug/Debugger-agent-lldb/src/main/py/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ghidralldb"
-version = "10.4"
+version = "11.1"
 authors = [
   { name="Ghidra Development Team" },
 ]
@@ -17,7 +17,7 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 dependencies = [
-    "ghidratrace==10.4",
+    "ghidratrace==11.1",
 ]
 
 [project.urls]
diff --git a/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/service/tracermi/TraceRmiHandler.java b/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/service/tracermi/TraceRmiHandler.java
index e1c1252a49..d1338420f5 100644
--- a/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/service/tracermi/TraceRmiHandler.java
+++ b/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/service/tracermi/TraceRmiHandler.java
@@ -69,7 +69,7 @@ import ghidra.util.exception.CancelledException;
 import ghidra.util.exception.DuplicateFileException;
 
 public class TraceRmiHandler implements TraceRmiConnection {
-	public static final String VERSION = "10.4";
+	public static final String VERSION = "11.1";
 
 	protected static class VersionMismatchError extends TraceRmiError {
 		public VersionMismatchError(String remote) {
diff --git a/Ghidra/Debug/Debugger-rmi-trace/src/main/py/src/ghidratrace/client.py b/Ghidra/Debug/Debugger-rmi-trace/src/main/py/src/ghidratrace/client.py
index 99a39049a9..2d6a42f105 100644
--- a/Ghidra/Debug/Debugger-rmi-trace/src/main/py/src/ghidratrace/client.py
+++ b/Ghidra/Debug/Debugger-rmi-trace/src/main/py/src/ghidratrace/client.py
@@ -30,7 +30,11 @@ from .util import send_delimited, recv_delimited
 # This need not be incremented every Ghidra release. When a breaking protocol
 # change is made, this should be updated to match the first Ghidra release that
 # includes the change.
-VERSION = '10.4'
+# 
+# Other places to change:
+# * every pyproject.toml file (incl. deps)
+# * TraceRmiHandler.VERSION
+VERSION = '11.1'
 
 
 class RemoteResult(Future):