From c9561cb69579cdaf5deaaab0deaf7abed6766c5e Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Tue, 8 Sep 2026 18:02:43 -0700
Subject: [PATCH 1/8] chore(pom.xml): update testcontainers to 2.0.5

Remove junit-jupter version specification and let maven handle it automatically.
---
 pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1868323eb..980209489 100644
--- a/pom.xml
+++ b/pom.xml
@@ -502,13 +502,12 @@
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>testcontainers</artifactId>
-      <version>2.0.3</version>
+      <version>2.0.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>junit-jupiter</artifactId>
-      <version>1.21.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>

From 64e67fc1cf33232ab41505500ae1cd2d7fd7b093 Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Tue, 8 Sep 2026 18:08:26 -0700
Subject: [PATCH 2/8] upgrade easymock to 5.7.0

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

diff --git a/pom.xml b/pom.xml
index 980209489..b1071b16e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -513,7 +513,7 @@
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
-      <version>5.5.0</version>
+      <version>5.7.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

From 1e3cf7f0ef24892f4cc4f7a16adb7da8289f56d4 Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Tue, 8 Sep 2026 18:16:34 -0700
Subject: [PATCH 3/8] Remove explicit versions for JSTL dependencies in
 pom.xml. Let Spring Boot set the version.

---
 pom.xml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index b1071b16e..da8d39c0e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -431,15 +431,13 @@
       <artifactId>tomcat-embed-jasper</artifactId>
     </dependency>
     <dependency>
-    <groupId>jakarta.servlet.jsp.jstl</groupId>
-    <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
-    <version>2.0.0</version>
-</dependency>
-<dependency>
-    <groupId>org.glassfish.web</groupId>
-    <artifactId>jakarta.servlet.jsp.jstl</artifactId>
-    <version>2.0.0</version>
-</dependency>
+      <groupId>jakarta.servlet.jsp.jstl</groupId>
+      <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.web</groupId>
+      <artifactId>jakarta.servlet.jsp.jstl</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-taglibs</artifactId>

From 67c4923a4c5474d191f94715302a98e85c08fd15 Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Wed, 9 Sep 2026 10:35:52 -0700
Subject: [PATCH 4/8] Upgrade aws-sdk translate dependency to version 2.43.2

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

diff --git a/pom.xml b/pom.xml
index da8d39c0e..2d90de443 100644
--- a/pom.xml
+++ b/pom.xml
@@ -572,7 +572,7 @@
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>translate</artifactId>
-      <version>2.40.15</version>
+      <version>2.43.2</version>
     </dependency>
     <dependency>
       <groupId>org.flywaydb</groupId>

From 2dfe17b7ca521c707c84de564871b9fb617ff702 Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Wed, 9 Sep 2026 10:40:30 -0700
Subject: [PATCH 5/8] Remove unused opencsv dependency from pom.xml

---
 pom.xml                                        |  5 -----
 .../impl/DifferentIdeasLogicServiceImpl.java   | 18 ++++++++++++++++--
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2d90de443..0988113f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -482,11 +482,6 @@
       <artifactId>poi-ooxml-schemas</artifactId>
       <version>3.7</version>
     </dependency>
-    <dependency>
-      <groupId>com.opencsv</groupId>
-      <artifactId>opencsv</artifactId>
-      <version>4.6</version>
-    </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
diff --git a/src/main/java/org/wise/portal/service/peergrouping/logic/impl/DifferentIdeasLogicServiceImpl.java b/src/main/java/org/wise/portal/service/peergrouping/logic/impl/DifferentIdeasLogicServiceImpl.java
index 5caa19972..eb58fd136 100644
--- a/src/main/java/org/wise/portal/service/peergrouping/logic/impl/DifferentIdeasLogicServiceImpl.java
+++ b/src/main/java/org/wise/portal/service/peergrouping/logic/impl/DifferentIdeasLogicServiceImpl.java
@@ -5,7 +5,6 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.apache.commons.collections4.SetUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -62,10 +61,25 @@ private TreeSet<WorkgroupLogicComparable> getWorkgroupsWithDifferentIdeas(
     for (Workgroup possibleMember : possibleMembers) {
       if (workgroupToAnnotation.containsKey(possibleMember)) {
         Set<String> possibleMemberIdeas = getDetectedIdeas(possibleMember, workgroupToAnnotation);
-        Set<String> differentIdeas = SetUtils.disjunction(workgroupIdeas, possibleMemberIdeas);
+        Set<String> differentIdeas = getDisjunction(workgroupIdeas, possibleMemberIdeas);
         workgroups.add(new WorkgroupWithDifference(possibleMember, differentIdeas.size(), logic));
       }
     }
     return workgroups;
   }
+
+  private Set<String> getDisjunction(Set<String> a, Set<String> b) {
+    Set<String> disjunction = new HashSet<String>();
+    for (String s : a) {
+      if (!b.contains(s)) {
+        disjunction.add(s);
+      }
+    }
+    for (String s : b) {
+      if (!a.contains(s)) {
+        disjunction.add(s);
+      }
+    }
+    return disjunction;
+  }
 }

From ef0f45807f5b6342313f0fee6bec4bc976cbb6f5 Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Wed, 9 Sep 2026 16:02:07 -0700
Subject: [PATCH 6/8] Upgrade httpclient from 4.5.9 to 4.5.14

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

diff --git a/pom.xml b/pom.xml
index 0988113f3..459ce6f59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -455,7 +455,7 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
-      <version>4.5.9</version>
+      <version>4.5.14</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>

From 71ea1192975f1d96e55e2ba3b7933ad974969c97 Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Wed, 9 Sep 2026 16:12:38 -0700
Subject: [PATCH 7/8] Upgrade commons-lang3 to version 3.20.0

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

diff --git a/pom.xml b/pom.xml
index 459ce6f59..9aadaecb5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -460,7 +460,7 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
-      <version>3.9</version>
+      <version>3.20.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.maven-play-plugin.net.tanesha.recaptcha4j</groupId>

From ae3e66f18b8d540f2f7b9fade6d07c8c37b1f21f Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Wed, 9 Sep 2026 16:16:35 -0700
Subject: [PATCH 8/8] Remove unused recaptcha4j dependency from pom.xml

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

diff --git a/pom.xml b/pom.xml
index 9aadaecb5..cadaa5031 100644
--- a/pom.xml
+++ b/pom.xml
@@ -462,11 +462,6 @@
       <artifactId>commons-lang3</artifactId>
       <version>3.20.0</version>
     </dependency>
-    <dependency>
-      <groupId>com.google.code.maven-play-plugin.net.tanesha.recaptcha4j</groupId>
-      <artifactId>recaptcha4j</artifactId>
-      <version>0.0.8</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.poi</groupId>
       <artifactId>poi</artifactId>