Skip to content

Commit 0bfb180

Browse files
committed
dependency updates
1 parent b471413 commit 0bfb180

File tree

22 files changed

+77
-45
lines changed

22 files changed

+77
-45
lines changed

build/spotbugs-exclude.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,17 @@
3131
<!-- https://github.com/spotbugs/spotbugs/issues/756 -->
3232
<Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE"/>
3333
</Match>
34+
35+
<Match>
36+
<!-- overly aggressive check added in 4.4.1 -->
37+
<Bug pattern="MS_EXPOSE_REP"/>
38+
</Match>
39+
<Match>
40+
<!-- overly aggressive check added in 4.4.1 -->
41+
<Bug pattern="EI_EXPOSE_REP"/>
42+
</Match>
43+
<Match>
44+
<!-- overly aggressive check added in 4.4.1 -->
45+
<Bug pattern="EI_EXPOSE_REP2"/>
46+
</Match>
3447
</FindBugsFilter>

data-service/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,12 +150,12 @@
150150
<dependency>
151151
<groupId>org.jdom</groupId>
152152
<artifactId>jdom2</artifactId>
153-
<version>2.0.6</version>
153+
<version>2.0.6.1</version>
154154
</dependency>
155155
<dependency>
156156
<groupId>com.google.code.gson</groupId>
157157
<artifactId>gson</artifactId>
158-
<version>2.8.7</version>
158+
<version>2.8.9</version>
159159
</dependency>
160160
<dependency>
161161
<groupId>org.jetbrains.xodus</groupId>

onejar/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<name>PWM Password Self Service: Executable Server JAR</name>
1717

1818
<properties>
19-
<tomcat.version>9.0.50</tomcat.version>
19+
<tomcat.version>9.0.58</tomcat.version>
2020
</properties>
2121

2222
<build>
@@ -107,7 +107,7 @@
107107
<dependency>
108108
<groupId>commons-cli</groupId>
109109
<artifactId>commons-cli</artifactId>
110-
<version>1.4</version>
110+
<version>1.5.0</version>
111111
</dependency>
112112
</dependencies>
113113
</project>

pom.xml

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@
222222
<rules>
223223
<banDuplicatePomDependencyVersions/>
224224
<requireJavaVersion>
225-
<version>[11,)</version>
225+
<version>[11,14]</version>
226226
</requireJavaVersion>
227227
<requireMavenVersion>
228228
<version>${pwm.minimum.maven.version}</version>
@@ -242,6 +242,7 @@
242242
<showWarnings>true</showWarnings>
243243
</configuration>
244244
</plugin>
245+
245246
<plugin>
246247
<groupId>org.apache.maven.plugins</groupId>
247248
<artifactId>maven-checkstyle-plugin</artifactId>
@@ -250,7 +251,7 @@
250251
<dependency>
251252
<groupId>com.puppycrawl.tools</groupId>
252253
<artifactId>checkstyle</artifactId>
253-
<version>8.45</version>
254+
<version>9.3</version>
254255
</dependency>
255256
</dependencies>
256257
<executions>
@@ -329,12 +330,12 @@
329330
<plugin>
330331
<groupId>com.github.spotbugs</groupId>
331332
<artifactId>spotbugs-maven-plugin</artifactId>
332-
<version>4.2.3</version>
333+
<version>4.5.3.0</version>
333334
<dependencies>
334335
<dependency>
335336
<groupId>com.github.spotbugs</groupId>
336337
<artifactId>spotbugs</artifactId>
337-
<version>4.2.3</version>
338+
<version>4.5.3</version>
338339
</dependency>
339340
</dependencies>
340341
<configuration>
@@ -430,13 +431,13 @@
430431
<dependency>
431432
<groupId>org.projectlombok</groupId>
432433
<artifactId>lombok</artifactId>
433-
<version>1.18.20</version>
434+
<version>1.18.22</version>
434435
<scope>provided</scope>
435436
</dependency>
436437
<dependency>
437438
<groupId>com.github.spotbugs</groupId>
438439
<artifactId>spotbugs-annotations</artifactId>
439-
<version>4.3.0</version>
440+
<version>4.5.3</version>
440441
<scope>provided</scope>
441442
</dependency>
442443

@@ -450,13 +451,13 @@
450451
<dependency>
451452
<groupId>org.mockito</groupId>
452453
<artifactId>mockito-core</artifactId>
453-
<version>3.11.2</version>
454+
<version>4.3.1</version>
454455
<scope>test</scope>
455456
</dependency>
456457
<dependency>
457458
<groupId>org.assertj</groupId>
458459
<artifactId>assertj-core</artifactId>
459-
<version>3.20.2</version>
460+
<version>3.22.0</version>
460461
<scope>test</scope>
461462
</dependency>
462463
<dependency>
@@ -465,22 +466,31 @@
465466
<version>2.27.2</version>
466467
<scope>test</scope>
467468
</dependency>
469+
470+
<!-- older version of jackson databind required by wiremock 2.27.2 -->
471+
<dependency>
472+
<groupId>com.fasterxml.jackson.core</groupId>
473+
<artifactId>jackson-databind</artifactId>
474+
<version>2.11.3</version>
475+
<scope>test</scope>
476+
</dependency>
477+
468478
<dependency>
469479
<groupId>org.reflections</groupId>
470480
<artifactId>reflections</artifactId>
471-
<version>0.9.12</version>
481+
<version>0.10.2</version>
472482
<scope>test</scope>
473483
</dependency>
474484
<dependency>
475485
<groupId>org.openjdk.jmh</groupId>
476486
<artifactId>jmh-core</artifactId>
477-
<version>1.32</version>
487+
<version>1.34</version>
478488
<scope>test</scope>
479489
</dependency>
480490
<dependency>
481491
<groupId>org.openjdk.jmh</groupId>
482492
<artifactId>jmh-generator-annprocess</artifactId>
483-
<version>1.32</version>
493+
<version>1.34</version>
484494
<scope>test</scope>
485495
</dependency>
486496

rest-test-service/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<dependency>
8080
<groupId>com.google.code.gson</groupId>
8181
<artifactId>gson</artifactId>
82-
<version>2.8.7</version>
82+
<version>2.8.9</version>
8383
</dependency>
8484
<dependency>
8585
<groupId>org.apache.commons</groupId>

server/pom.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@
207207
<dependency>
208208
<groupId>com.github.ldapchai</groupId>
209209
<artifactId>ldapchai</artifactId>
210-
<version>0.8.1</version>
210+
<version>0.8.2</version>
211211
</dependency>
212212
<dependency>
213213
<groupId>org.apache.directory.api</groupId>
@@ -267,7 +267,7 @@
267267
<dependency>
268268
<groupId>org.jasig.cas.client</groupId>
269269
<artifactId>cas-client-core</artifactId>
270-
<version>3.6.2</version>
270+
<version>3.6.4</version>
271271
</dependency>
272272
<dependency>
273273
<groupId>net.glxn</groupId>
@@ -277,12 +277,12 @@
277277
<dependency>
278278
<groupId>org.bouncycastle</groupId>
279279
<artifactId>bcprov-jdk15on</artifactId>
280-
<version>1.69</version>
280+
<version>1.70</version>
281281
</dependency>
282282
<dependency>
283283
<groupId>org.bouncycastle</groupId>
284284
<artifactId>bcpkix-jdk15on</artifactId>
285-
<version>1.69</version>
285+
<version>1.70</version>
286286
</dependency>
287287
<dependency>
288288
<groupId>jaxen</groupId>
@@ -292,7 +292,7 @@
292292
<dependency>
293293
<groupId>org.jdom</groupId>
294294
<artifactId>jdom2</artifactId>
295-
<version>2.0.6</version>
295+
<version>2.0.6.1</version>
296296
</dependency>
297297
<dependency>
298298
<groupId>org.xeustechnologies</groupId>
@@ -307,12 +307,12 @@
307307
<dependency>
308308
<groupId>com.google.code.gson</groupId>
309309
<artifactId>gson</artifactId>
310-
<version>2.8.7</version>
310+
<version>2.8.9</version>
311311
</dependency>
312312
<dependency>
313313
<groupId>com.blueconic</groupId>
314314
<artifactId>browscap-java</artifactId>
315-
<version>1.3.6</version>
315+
<version>1.3.11</version>
316316
</dependency>
317317
<dependency>
318318
<groupId>org.jetbrains.xodus</groupId>
@@ -323,17 +323,17 @@
323323
<dependency>
324324
<groupId>org.slf4j</groupId>
325325
<artifactId>slf4j-nop</artifactId>
326-
<version>1.7.22</version>
326+
<version>2.0.0-alpha6</version>
327327
</dependency>
328328
<dependency>
329329
<groupId>org.webjars</groupId>
330330
<artifactId>webjars-locator-core</artifactId>
331-
<version>0.47</version>
331+
<version>0.48</version>
332332
</dependency>
333333
<dependency>
334334
<groupId>com.github.ben-manes.caffeine</groupId>
335335
<artifactId>caffeine</artifactId>
336-
<version>3.0.3</version>
336+
<version>3.0.5</version>
337337
</dependency>
338338
<dependency>
339339
<groupId>com.nulab-inc</groupId>

server/src/main/java/password/pwm/config/Configuration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
package password.pwm.config;
2222

23-
import com.novell.ldapchai.util.StringHelper;
23+
import com.novell.ldapchai.util.internal.StringHelper;
2424
import password.pwm.AppProperty;
2525
import password.pwm.PwmConstants;
2626
import password.pwm.bean.EmailItemBean;

server/src/main/java/password/pwm/config/profile/PwmPasswordPolicy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
import com.novell.ldapchai.ChaiPasswordPolicy;
2424
import com.novell.ldapchai.ChaiPasswordRule;
25-
import com.novell.ldapchai.util.StringHelper;
25+
import com.novell.ldapchai.util.internal.StringHelper;
2626
import lombok.Builder;
2727
import lombok.Value;
2828
import password.pwm.config.option.ADPolicyComplexity;

server/src/main/java/password/pwm/http/HttpEventManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
package password.pwm.http;
2222

23-
import com.novell.ldapchai.util.StringHelper;
23+
import com.novell.ldapchai.util.internal.StringHelper;
2424
import password.pwm.PwmApplication;
2525
import password.pwm.PwmConstants;
2626
import password.pwm.bean.LocalSessionStateBean;

server/src/main/java/password/pwm/http/servlet/ShortcutServlet.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
package password.pwm.http.servlet;
2222

2323
import com.novell.ldapchai.exception.ChaiUnavailableException;
24-
import com.novell.ldapchai.util.StringHelper;
24+
import com.novell.ldapchai.util.internal.StringHelper;
2525
import password.pwm.PwmApplication;
2626
import password.pwm.PwmConstants;
2727
import password.pwm.bean.UserIdentity;
@@ -36,8 +36,8 @@
3636
import password.pwm.http.PwmRequestAttribute;
3737
import password.pwm.http.PwmSession;
3838
import password.pwm.http.bean.ShortcutsBean;
39-
import password.pwm.ldap.permission.UserPermissionUtility;
4039
import password.pwm.ldap.permission.UserPermissionType;
40+
import password.pwm.ldap.permission.UserPermissionUtility;
4141
import password.pwm.svc.stats.Statistic;
4242
import password.pwm.util.java.JavaHelper;
4343
import password.pwm.util.logging.PwmLogger;

0 commit comments

Comments
 (0)