From 33a06dc5c53bd6ffbf63524b1afa001f09f6bad4 Mon Sep 17 00:00:00 2001
From: jonathancouchman <jonathan.couchman@currencycloud.com>
Date: Tue, 10 Dec 2024 17:12:52 +0000
Subject: [PATCH 1/2] Replaces cglib and asm dependency with spring-core

---
 pom.xml                                          | 16 +++++++++++++---
 .../client/CurrencyCloudClient.java              |  6 +++---
 .../client/dirty/DirtyWatcherDeserializer.java   |  2 +-
 .../client/dirty/ModificationTracker.java        |  4 ++--
 .../client/dirty/ModifiedValueProvider.java      |  4 ++--
 5 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index de06fa7f..8d1b4aa2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -177,16 +177,26 @@
             <artifactId>jsr305</artifactId>
             <version>3.0.2</version>
         </dependency>
-        <dependency>
+<!--        <dependency>
             <groupId>cglib</groupId>
             <artifactId>cglib</artifactId>
             <version>3.3.0</version>
-        </dependency>
+        </dependency> -->
         <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>5.3.26</version>
+        </dependency>
+<!--        <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm</artifactId>
-            <version>9.2</version>
+            <version>9.7.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-util</artifactId>
+            <version>9.7.1</version>
+        </dependency> -->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
diff --git a/src/main/java/com/currencycloud/client/CurrencyCloudClient.java b/src/main/java/com/currencycloud/client/CurrencyCloudClient.java
index 20cf5f92..42e55c60 100644
--- a/src/main/java/com/currencycloud/client/CurrencyCloudClient.java
+++ b/src/main/java/com/currencycloud/client/CurrencyCloudClient.java
@@ -8,9 +8,9 @@
 import com.currencycloud.client.model.Currency;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import net.sf.cglib.proxy.Callback;
-import net.sf.cglib.proxy.Enhancer;
-import net.sf.cglib.proxy.Factory;
+import org.springframework.cglib.proxy.Callback;
+import org.springframework.cglib.proxy.Enhancer;
+import org.springframework.cglib.proxy.Factory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import si.mazi.rescu.ClientConfig;
diff --git a/src/main/java/com/currencycloud/client/dirty/DirtyWatcherDeserializer.java b/src/main/java/com/currencycloud/client/dirty/DirtyWatcherDeserializer.java
index dd4790b4..6c160630 100644
--- a/src/main/java/com/currencycloud/client/dirty/DirtyWatcherDeserializer.java
+++ b/src/main/java/com/currencycloud/client/dirty/DirtyWatcherDeserializer.java
@@ -2,7 +2,7 @@
 
 import com.currencycloud.client.model.Entity;
 import com.fasterxml.jackson.databind.util.StdConverter;
-import net.sf.cglib.proxy.Enhancer;
+import org.springframework.cglib.proxy.Enhancer;
 
 public abstract class DirtyWatcherDeserializer<E extends Entity> extends StdConverter<E, E> {
 
diff --git a/src/main/java/com/currencycloud/client/dirty/ModificationTracker.java b/src/main/java/com/currencycloud/client/dirty/ModificationTracker.java
index f6332f42..b09ed508 100644
--- a/src/main/java/com/currencycloud/client/dirty/ModificationTracker.java
+++ b/src/main/java/com/currencycloud/client/dirty/ModificationTracker.java
@@ -1,7 +1,7 @@
 package com.currencycloud.client.dirty;
 
-import net.sf.cglib.proxy.MethodInterceptor;
-import net.sf.cglib.proxy.MethodProxy;
+import org.springframework.cglib.proxy.MethodInterceptor;
+import org.springframework.cglib.proxy.MethodProxy;
 
 import java.lang.reflect.Method;
 import java.util.HashMap;
diff --git a/src/main/java/com/currencycloud/client/dirty/ModifiedValueProvider.java b/src/main/java/com/currencycloud/client/dirty/ModifiedValueProvider.java
index 60f88ccb..2a1ac7ee 100644
--- a/src/main/java/com/currencycloud/client/dirty/ModifiedValueProvider.java
+++ b/src/main/java/com/currencycloud/client/dirty/ModifiedValueProvider.java
@@ -1,7 +1,7 @@
 package com.currencycloud.client.dirty;
 
-import net.sf.cglib.proxy.MethodInterceptor;
-import net.sf.cglib.proxy.MethodProxy;
+import org.springframework.cglib.proxy.MethodInterceptor;
+import org.springframework.cglib.proxy.MethodProxy;
 
 import java.lang.reflect.Method;
 import java.util.HashMap;

From 9578b5c02d86ca3a34b1d673ada144f70862af2b Mon Sep 17 00:00:00 2001
From: jonathancouchman <jonathan.couchman@currencycloud.com>
Date: Tue, 10 Dec 2024 17:14:52 +0000
Subject: [PATCH 2/2] Tidy pom

---
 pom.xml | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8d1b4aa2..c934a4d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -177,26 +177,12 @@
             <artifactId>jsr305</artifactId>
             <version>3.0.2</version>
         </dependency>
-<!--        <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib</artifactId>
-            <version>3.3.0</version>
-        </dependency> -->
+
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
             <version>5.3.26</version>
         </dependency>
-<!--        <dependency>
-            <groupId>org.ow2.asm</groupId>
-            <artifactId>asm</artifactId>
-            <version>9.7.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.ow2.asm</groupId>
-            <artifactId>asm-util</artifactId>
-            <version>9.7.1</version>
-        </dependency> -->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>