Skip to content

chore(POM): Update dependencies #348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hirokiterashima merged 9 commits into from
Sep 10, 2026
Merged

chore(POM): Update dependencies #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c9561cb
chore(pom.xml): update testcontainers to 2.0.5
hirokiterashima Sep 9, 2026
64e67fc
upgrade easymock to 5.7.0
hirokiterashima Sep 9, 2026
1e3cf7f
Remove explicit versions for JSTL dependencies in pom.xml. Let Spring…
hirokiterashima Sep 9, 2026
c0ca214
Merge branch 'develop' into chore/dep-updates-sep-2026
hirokiterashima Sep 9, 2026
67c4923
Upgrade aws-sdk translate dependency to version 2.43.2
hirokiterashima Sep 9, 2026
2dfe17b
Remove unused opencsv dependency from pom.xml
hirokiterashima Sep 9, 2026
ef0f458
Upgrade httpclient from 4.5.9 to 4.5.14
hirokiterashima Sep 9, 2026
71ea119
Upgrade commons-lang3 to version 3.20.0
hirokiterashima Sep 9, 2026
ae3e66f
Remove unused recaptcha4j dependency from pom.xml
hirokiterashima Sep 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 12 additions & 25 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -457,17 +455,12 @@
<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>
<artifactId>commons-lang3</artifactId>
<version>3.9</version>
</dependency>
<dependency>
<groupId>com.google.code.maven-play-plugin.net.tanesha.recaptcha4j</groupId>
<artifactId>recaptcha4j</artifactId>
<version>0.0.8</version>
<version>3.20.0</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
Expand All @@ -484,11 +477,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>
Expand All @@ -502,19 +490,18 @@
<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>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>5.5.0</version>
<version>5.7.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -575,7 +562,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>
Expand Down
18 changes: 16 additions & 2 deletions .../java/org/wise/portal/service/peergrouping/logic/impl/DifferentIdeasLogicServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
}
Loading