From 1bc22bd6c7054c5ed255397f98a9d6063b78e3f9 Mon Sep 17 00:00:00 2001
From: Earle Nietzel <earle@longsight.com>
Date: Wed, 18 Dec 2024 11:43:33 -0500
Subject: [PATCH 1/2] SAK-50777 Upgrade libs reflectutils and genericdao

https://sakaiproject.atlassian.net/browse/SAK-50777
---
 content-review/impl/turnitin/pom.xml | 2 +-
 entitybroker/core-providers/pom.xml  | 2 +-
 entitybroker/impl/pom.xml            | 2 +-
 entitybroker/pom.xml                 | 2 +-
 entitybroker/rest/pom.xml            | 2 +-
 entitybroker/utils/pom.xml           | 3 +--
 kernel/kernel-impl/pom.xml           | 4 ++--
 master/pom.xml                       | 5 +++--
 signup/pom.xml                       | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/content-review/impl/turnitin/pom.xml b/content-review/impl/turnitin/pom.xml
index 4b56686ac144..d8ff066e6577 100644
--- a/content-review/impl/turnitin/pom.xml
+++ b/content-review/impl/turnitin/pom.xml
@@ -45,7 +45,7 @@
 			<artifactId>sakai-common-api</artifactId>
 		</dependency>
 		<dependency>
-		  <groupId>org.azeckoski</groupId>
+		  <groupId>org.sakaiproject</groupId>
 		  <artifactId>reflectutils</artifactId>
 		  <version>${reflectutils.version}</version>
 		</dependency>
diff --git a/entitybroker/core-providers/pom.xml b/entitybroker/core-providers/pom.xml
index 01de8ff2e422..60e4d5468c84 100644
--- a/entitybroker/core-providers/pom.xml
+++ b/entitybroker/core-providers/pom.xml
@@ -31,7 +31,7 @@
             <artifactId>sakai-privacy-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.azeckoski</groupId>
+            <groupId>org.sakaiproject</groupId>
             <artifactId>reflectutils</artifactId>
         </dependency>
         <dependency>
diff --git a/entitybroker/impl/pom.xml b/entitybroker/impl/pom.xml
index 85e507fdcc45..94ef77ef7248 100644
--- a/entitybroker/impl/pom.xml
+++ b/entitybroker/impl/pom.xml
@@ -58,7 +58,7 @@
             <artifactId>generic-dao</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.azeckoski</groupId>
+            <groupId>org.sakaiproject</groupId>
             <artifactId>reflectutils</artifactId>
         </dependency>
         <!-- testing -->
diff --git a/entitybroker/pom.xml b/entitybroker/pom.xml
index 22feb330747f..23fdaf7bbf56 100644
--- a/entitybroker/pom.xml
+++ b/entitybroker/pom.xml
@@ -94,7 +94,7 @@
       </dependency>
       <!-- IMPL dependencies -->
       <dependency>
-        <groupId>org.azeckoski</groupId>
+        <groupId>org.sakaiproject</groupId>
         <artifactId>reflectutils</artifactId>
         <version>${reflectutils.version}</version>
       </dependency>
diff --git a/entitybroker/rest/pom.xml b/entitybroker/rest/pom.xml
index a0a7558aa72a..47bdcbfee645 100644
--- a/entitybroker/rest/pom.xml
+++ b/entitybroker/rest/pom.xml
@@ -55,7 +55,7 @@
         </dependency>
         <!-- Data processing -->
         <dependency>
-            <groupId>org.azeckoski</groupId>
+            <groupId>org.sakaiproject</groupId>
             <artifactId>reflectutils</artifactId>
         </dependency>
         <!-- testing -->
diff --git a/entitybroker/utils/pom.xml b/entitybroker/utils/pom.xml
index aee1ed028918..faf4127abb0d 100644
--- a/entitybroker/utils/pom.xml
+++ b/entitybroker/utils/pom.xml
@@ -51,9 +51,8 @@
         </dependency>
         <!-- required for bean cloning and reflection -->
         <dependency>
-            <groupId>org.azeckoski</groupId>
+            <groupId>org.sakaiproject</groupId>
             <artifactId>reflectutils</artifactId>
-            <type>jar</type>
         </dependency>
         <!-- required for sending http requests -->
         <dependency>
diff --git a/kernel/kernel-impl/pom.xml b/kernel/kernel-impl/pom.xml
index b67160ee3d42..95376c510f00 100644
--- a/kernel/kernel-impl/pom.xml
+++ b/kernel/kernel-impl/pom.xml
@@ -216,9 +216,9 @@
             <version>3.0.2</version>
         </dependency>
         <dependency>
-            <groupId>org.azeckoski</groupId>
+            <groupId>org.sakaiproject</groupId>
             <artifactId>reflectutils</artifactId>
-            <version>0.9.19</version>
+            <version>${reflectutils.version}</version>
         </dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>
diff --git a/master/pom.xml b/master/pom.xml
index 75cdba1b19cd..98e9dc10c6a4 100644
--- a/master/pom.xml
+++ b/master/pom.xml
@@ -86,8 +86,8 @@
     <sakai.weld.shaded.version>3.1.9.Final</sakai.weld.shaded.version>
     <jayway.jsonpath.version>2.9.0</jayway.jsonpath.version>
     <sakai.jakarta.jstl-api.version>1.2.5</sakai.jakarta.jstl-api.version>
-    <sakai.genericdao.version>0.12.0</sakai.genericdao.version>
-    <reflectutils.version>0.9.20</reflectutils.version>
+    <sakai.genericdao.version>0.12.1</sakai.genericdao.version>
+    <reflectutils.version>0.9.21</reflectutils.version>
     <json.simple.version>1.1.1</json.simple.version>
     <handlebars4.version>4.4.0</handlebars4.version>
     <hamcrest.all.version>1.3</hamcrest.all.version>
@@ -2878,6 +2878,7 @@
                     <exclude>commons-logging:commons-logging</exclude>
                     <exclude>log4j:log4j</exclude>
                     <exclude>javax.mail:mail</exclude>
+                    <exclude>org.azeckoski:reflectutils</exclude>
                   </excludes>
                 </bannedDependencies>
               </rules>
diff --git a/signup/pom.xml b/signup/pom.xml
index f05d7c0c299a..495e6960a73d 100644
--- a/signup/pom.xml
+++ b/signup/pom.xml
@@ -95,7 +95,7 @@
 
 			<!-- third party dependencies -->
 			<dependency>
-				<groupId>org.azeckoski</groupId>
+				<groupId>org.sakaiproject</groupId>
 				<artifactId>reflectutils</artifactId>
 				<version>${reflectutils.version}</version>
 			</dependency>

From 3d01acfc4ecc56143fa6523aba78925c70b18924 Mon Sep 17 00:00:00 2001
From: Earle Nietzel <earle@longsight.com>
Date: Wed, 18 Dec 2024 11:55:47 -0500
Subject: [PATCH 2/2] remove refelctutils from signup

---
 signup/pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/signup/pom.xml b/signup/pom.xml
index 495e6960a73d..8ef3ddf1ce27 100644
--- a/signup/pom.xml
+++ b/signup/pom.xml
@@ -94,11 +94,6 @@
 			</dependency>
 
 			<!-- third party dependencies -->
-			<dependency>
-				<groupId>org.sakaiproject</groupId>
-				<artifactId>reflectutils</artifactId>
-				<version>${reflectutils.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.easymock</groupId>
 				<artifactId>easymock</artifactId>