From 0bd965b30798d38cd3956dda6ef9d582044b4521 Mon Sep 17 00:00:00 2001
From: kuiperanon <kuiperbeltanon@gmail.com>
Date: Mon, 25 Mar 2024 20:24:14 -0500
Subject: [PATCH 1/3] Upgrade lombat patch version to avoid
 java.lang.NoSuchFieldError

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

diff --git a/pom.xml b/pom.xml
index f192f7ed2..f0021a06c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
         <maven.compiler.target>19</maven.compiler.target>
 
         <!-- Annotation Dependency Versions -->
-        <lombok.version>1.18.24</lombok.version>
+        <lombok.version>1.18.30</lombok.version>
 
         <bcprov-jdk15on.version>1.70</bcprov-jdk15on.version>
         <bcprov-jdk18on.version>1.72</bcprov-jdk18on.version>

From a5d246d1f119a0b29e79d0249ac03d6b273fb560 Mon Sep 17 00:00:00 2001
From: kuiperanon <kuiperbeltanon@gmail.com>
Date: Mon, 25 Mar 2024 21:05:10 -0500
Subject: [PATCH 2/3] Substitute openbeans for java.beans to support Android

---
 nostr-java-event/pom.xml                                | 5 +++++
 nostr-java-event/src/main/java/module-info.java         | 1 +
 nostr-java-event/src/main/java/nostr/event/BaseTag.java | 4 ++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/nostr-java-event/pom.xml b/nostr-java-event/pom.xml
index 44eecddbd..ca833fe5d 100644
--- a/nostr-java-event/pom.xml
+++ b/nostr-java-event/pom.xml
@@ -20,6 +20,11 @@
         </dependency>
 
         <!-- Project Dependencies -->
+        <dependency>
+            <groupId>me.champeau.openbeans</groupId>
+            <artifactId>openbeans</artifactId>
+            <version>1.0.2</version>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>nostr-java-base</artifactId>
diff --git a/nostr-java-event/src/main/java/module-info.java b/nostr-java-event/src/main/java/module-info.java
index c8ed2e4bc..13093aea2 100644
--- a/nostr-java-event/src/main/java/module-info.java
+++ b/nostr-java-event/src/main/java/module-info.java
@@ -9,6 +9,7 @@
     requires nostr.util;
     requires java.logging;
     requires java.desktop;
+    requires openbeans;
     
     exports nostr.event;
     exports nostr.event.impl;
diff --git a/nostr-java-event/src/main/java/nostr/event/BaseTag.java b/nostr-java-event/src/main/java/nostr/event/BaseTag.java
index e2023dcc0..79c4587fe 100644
--- a/nostr-java-event/src/main/java/nostr/event/BaseTag.java
+++ b/nostr-java-event/src/main/java/nostr/event/BaseTag.java
@@ -3,8 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import java.beans.IntrospectionException;
-import java.beans.PropertyDescriptor;
+import com.googlecode.openbeans.IntrospectionException;
+import com.googlecode.openbeans.PropertyDescriptor;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;

From 683078169c599cd5ce626603037359ca87ff71d8 Mon Sep 17 00:00:00 2001
From: kuiperanon <kuiperbeltanon@gmail.com>
Date: Tue, 26 Mar 2024 19:04:53 -0500
Subject: [PATCH 3/3] Use property defined in root pom.xml for openbeans value

---
 nostr-java-event/pom.xml | 11 ++++++-----
 pom.xml                  |  2 ++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/nostr-java-event/pom.xml b/nostr-java-event/pom.xml
index ca833fe5d..7a71a0909 100644
--- a/nostr-java-event/pom.xml
+++ b/nostr-java-event/pom.xml
@@ -13,6 +13,12 @@
     <packaging>jar</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>me.champeau.openbeans</groupId>
+            <artifactId>openbeans</artifactId>
+            <version>${openbeans.version}</version>
+        </dependency>
+
         <!-- Annotation Dependencies -->
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -20,11 +26,6 @@
         </dependency>
 
         <!-- Project Dependencies -->
-        <dependency>
-            <groupId>me.champeau.openbeans</groupId>
-            <artifactId>openbeans</artifactId>
-            <version>1.0.2</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>nostr-java-base</artifactId>
diff --git a/pom.xml b/pom.xml
index f0021a06c..43c890db7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,8 @@
         <maven.compiler.source>19</maven.compiler.source>
         <maven.compiler.target>19</maven.compiler.target>
 
+        <openbeans.version>1.0.2</openbeans.version>
+
         <!-- Annotation Dependency Versions -->
         <lombok.version>1.18.30</lombok.version>