diff --git a/pom.xml b/pom.xml
index 1868323eb..cadaa5031 100644
--- a/pom.xml
+++ b/pom.xml
@@ -431,15 +431,13 @@
tomcat-embed-jasper
- jakarta.servlet.jsp.jstl
- jakarta.servlet.jsp.jstl-api
- 2.0.0
-
-
- org.glassfish.web
- jakarta.servlet.jsp.jstl
- 2.0.0
-
+ jakarta.servlet.jsp.jstl
+ jakarta.servlet.jsp.jstl-api
+
+
+ org.glassfish.web
+ jakarta.servlet.jsp.jstl
+
org.springframework.security
spring-security-taglibs
@@ -457,17 +455,12 @@
org.apache.httpcomponents
httpclient
- 4.5.9
+ 4.5.14
org.apache.commons
commons-lang3
- 3.9
-
-
- com.google.code.maven-play-plugin.net.tanesha.recaptcha4j
- recaptcha4j
- 0.0.8
+ 3.20.0
org.apache.poi
@@ -484,11 +477,6 @@
poi-ooxml-schemas
3.7
-
- com.opencsv
- opencsv
- 4.6
-
com.fasterxml.jackson.core
jackson-databind
@@ -502,19 +490,18 @@
org.testcontainers
testcontainers
- 2.0.3
+ 2.0.5
test
org.testcontainers
junit-jupiter
- 1.21.4
test
org.easymock
easymock
- 5.5.0
+ 5.7.0
test
@@ -575,7 +562,7 @@
software.amazon.awssdk
translate
- 2.40.15
+ 2.43.2
org.flywaydb
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 getWorkgroupsWithDifferentIdeas(
for (Workgroup possibleMember : possibleMembers) {
if (workgroupToAnnotation.containsKey(possibleMember)) {
Set possibleMemberIdeas = getDetectedIdeas(possibleMember, workgroupToAnnotation);
- Set differentIdeas = SetUtils.disjunction(workgroupIdeas, possibleMemberIdeas);
+ Set differentIdeas = getDisjunction(workgroupIdeas, possibleMemberIdeas);
workgroups.add(new WorkgroupWithDifference(possibleMember, differentIdeas.size(), logic));
}
}
return workgroups;
}
+
+ private Set getDisjunction(Set a, Set b) {
+ Set disjunction = new HashSet();
+ for (String s : a) {
+ if (!b.contains(s)) {
+ disjunction.add(s);
+ }
+ }
+ for (String s : b) {
+ if (!a.contains(s)) {
+ disjunction.add(s);
+ }
+ }
+ return disjunction;
+ }
}