Skip to content

Commit 5386339

Browse files
jrivardjrivard
committed
maven dependency updates
spotbugs update related code fixes
1 parent 4607b50 commit 5386339

File tree

15 files changed

+78
-54
lines changed

15 files changed

+78
-54
lines changed

‎build/spotbugs-exclude.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,21 @@
6464
<Bug pattern="THROWS_METHOD_THROWS_CLAUSE_THROWABLE" />
6565
</Match>
6666

67+
<Match>
68+
<!-- introduced with spotbugs 4.8 and require code refactoring -->
69+
<Bug pattern="CT_CONSTRUCTOR_THROW"/>
70+
</Match>
71+
<Match>
72+
<!-- introduced with spotbugs 4.8 and require code refactoring -->
73+
<Bug pattern="PI_DO_NOT_REUSE_PUBLIC_IDENTIFIERS_FIELD_NAMES"/>
74+
</Match>
75+
<Match>
76+
<!-- introduced with spotbugs 4.8 and require code refactoring -->
77+
<Bug pattern="PI_DO_NOT_REUSE_PUBLIC_IDENTIFIERS_CLASS_NAMES"/>
78+
</Match>
79+
<Match>
80+
<!-- introduced with spotbugs 4.8 and require code refactoring -->
81+
<Bug pattern="PI_DO_NOT_REUSE_PUBLIC_IDENTIFIERS_LOCAL_VARIABLE_NAMES"/>
82+
</Match>
83+
6784
</FindBugsFilter>

‎client/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
</plugin>
5555
<plugin>
5656
<artifactId>maven-clean-plugin</artifactId>
57-
<version>3.3.1</version>
57+
<version>3.3.2</version>
5858
<executions>
5959
<execution>
6060
<id>remove-client-files</id>
@@ -90,7 +90,7 @@
9090
<plugin>
9191
<groupId>com.github.eirslett</groupId>
9292
<artifactId>frontend-maven-plugin</artifactId>
93-
<version>1.13.3</version>
93+
<version>1.14.2</version>
9494
<configuration>
9595
<nodeVersion>${node.version}</nodeVersion>
9696
<npmVersion>${npm.version}</npmVersion>

‎data-service/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<!-- This plugin will set properties values using dependency information -->
3737
<groupId>org.apache.maven.plugins</groupId>
3838
<artifactId>maven-dependency-plugin</artifactId>
39-
<version>3.6.0</version>
39+
<version>3.6.1</version>
4040
<executions>
4141
<execution>
4242
<goals>
@@ -96,7 +96,7 @@
9696
</plugin>
9797
<plugin>
9898
<artifactId>maven-clean-plugin</artifactId>
99-
<version>3.3.1</version>
99+
<version>3.3.2</version>
100100
</plugin>
101101
</plugins>
102102
</build>
@@ -131,7 +131,7 @@
131131
<dependency>
132132
<groupId>commons-net</groupId>
133133
<artifactId>commons-net</artifactId>
134-
<version>3.9.0</version>
134+
<version>3.10.0</version>
135135
</dependency>
136136
<dependency>
137137
<groupId>org.apache.commons</groupId>
@@ -141,7 +141,7 @@
141141
<dependency>
142142
<groupId>org.apache.commons</groupId>
143143
<artifactId>commons-lang3</artifactId>
144-
<version>3.12.0</version>
144+
<version>3.13.0</version>
145145
</dependency>
146146
<dependency>
147147
<groupId>com.sun.mail</groupId>

‎docker/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<plugin>
3535
<groupId>com.google.cloud.tools</groupId>
3636
<artifactId>jib-maven-plugin</artifactId>
37-
<version>3.3.2</version>
37+
<version>3.4.0</version>
3838
<executions>
3939
<execution>
4040
<id>make-docker-image</id>
@@ -45,7 +45,7 @@
4545
<configuration>
4646
<skip>${skipDocker}</skip>
4747
<from>
48-
<image>eclipse-temurin:11-jre@sha256:4802f11f9522ce2bb0dfa7f083b1410ec4c1ef702282c4db20a7c5a1329dee12</image>
48+
<image>eclipse-temurin:11-jre@sha256:5da9443e6642f4171c234fc601cf4a50f3decd5f2a2e377f1b6ac733daf2fcd6</image>
4949
</from>
5050
<to>
5151
<image>${dockerImageTag}</image>

‎onejar/pom.xml

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

1919
<properties>
20-
<tomcat.version>9.0.76</tomcat.version>
20+
<tomcat.version>9.0.82</tomcat.version>
2121
</properties>
2222

2323
<build>
@@ -112,7 +112,7 @@
112112
<dependency>
113113
<groupId>commons-cli</groupId>
114114
<artifactId>commons-cli</artifactId>
115-
<version>1.5.0</version>
115+
<version>1.6.0</version>
116116
</dependency>
117117
</dependencies>
118118
</project>

‎pom.xml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
<plugin>
147147
<groupId>org.apache.maven.plugins</groupId>
148148
<artifactId>maven-javadoc-plugin</artifactId>
149-
<version>3.5.0</version>
149+
<version>3.6.2</version>
150150
<executions>
151151
<execution>
152152
<goals>
@@ -219,7 +219,7 @@
219219
<plugin>
220220
<groupId>org.apache.maven.plugins</groupId>
221221
<artifactId>maven-enforcer-plugin</artifactId>
222-
<version>3.3.0</version>
222+
<version>3.4.1</version>
223223
<executions>
224224
<execution>
225225
<id>enforce-maven</id>
@@ -255,12 +255,12 @@
255255
<plugin>
256256
<groupId>org.apache.maven.plugins</groupId>
257257
<artifactId>maven-checkstyle-plugin</artifactId>
258-
<version>3.3.0</version>
258+
<version>3.3.1</version>
259259
<dependencies>
260260
<dependency>
261261
<groupId>com.puppycrawl.tools</groupId>
262262
<artifactId>checkstyle</artifactId>
263-
<version>10.12.1</version>
263+
<version>10.12.5</version>
264264
</dependency>
265265
</dependencies>
266266
<executions>
@@ -336,17 +336,17 @@
336336
<plugin>
337337
<groupId>com.github.spotbugs</groupId>
338338
<artifactId>spotbugs-maven-plugin</artifactId>
339-
<version>4.7.3.5</version>
339+
<version>4.8.1.0</version>
340340
<dependencies>
341341
<dependency>
342342
<groupId>com.github.spotbugs</groupId>
343343
<artifactId>spotbugs</artifactId>
344-
<version>4.7.3</version>
344+
<version>4.8.1</version>
345345
</dependency>
346346
</dependencies>
347347
<configuration>
348348
<skip>${spotbugs.skip}</skip>
349-
<fork>true</fork>
349+
<fork>false</fork>
350350
<excludeFilterFile>${project.root.basedir}/build/spotbugs-exclude.xml</excludeFilterFile>
351351
<includeTests>false</includeTests>
352352
<effort>max</effort>
@@ -389,7 +389,7 @@
389389
<plugin>
390390
<groupId>org.owasp</groupId>
391391
<artifactId>dependency-check-maven</artifactId>
392-
<version>8.3.1</version>
392+
<version>8.4.2</version>
393393
<executions>
394394
<execution>
395395
<goals>
@@ -434,7 +434,7 @@
434434
<plugin>
435435
<groupId>org.apache.maven.plugins</groupId>
436436
<artifactId>maven-dependency-plugin</artifactId>
437-
<version>3.6.0</version>
437+
<version>3.6.1</version>
438438
</plugin>
439439
</plugins>
440440
</build>
@@ -444,13 +444,13 @@
444444
<dependency>
445445
<groupId>org.projectlombok</groupId>
446446
<artifactId>lombok</artifactId>
447-
<version>1.18.28</version>
447+
<version>1.18.30</version>
448448
<scope>provided</scope>
449449
</dependency>
450450
<dependency>
451451
<groupId>com.github.spotbugs</groupId>
452452
<artifactId>spotbugs-annotations</artifactId>
453-
<version>4.7.3</version>
453+
<version>4.8.1</version>
454454
<scope>provided</scope>
455455
</dependency>
456456

@@ -464,7 +464,7 @@
464464
<dependency>
465465
<groupId>org.mockito</groupId>
466466
<artifactId>mockito-core</artifactId>
467-
<version>5.4.0</version>
467+
<version>5.7.0</version>
468468
<scope>test</scope>
469469
</dependency>
470470
<dependency>
@@ -474,9 +474,9 @@
474474
<scope>test</scope>
475475
</dependency>
476476
<dependency>
477-
<groupId>com.github.tomakehurst</groupId>
478-
<artifactId>wiremock-jre8</artifactId>
479-
<version>2.35.0</version>
477+
<groupId>org.wiremock</groupId>
478+
<artifactId>wiremock</artifactId>
479+
<version>3.3.1</version>
480480
<scope>test</scope>
481481
</dependency>
482482
<dependency>
@@ -488,13 +488,13 @@
488488
<dependency>
489489
<groupId>org.openjdk.jmh</groupId>
490490
<artifactId>jmh-core</artifactId>
491-
<version>1.36</version>
491+
<version>1.37</version>
492492
<scope>test</scope>
493493
</dependency>
494494
<dependency>
495495
<groupId>org.openjdk.jmh</groupId>
496496
<artifactId>jmh-generator-annprocess</artifactId>
497-
<version>1.36</version>
497+
<version>1.37</version>
498498
<scope>test</scope>
499499
</dependency>
500500

‎rest-test-service/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<dependency>
8686
<groupId>commons-io</groupId>
8787
<artifactId>commons-io</artifactId>
88-
<version>2.13.0</version>
88+
<version>2.15.0</version>
8989
</dependency>
9090
<!-- / library dependencies -->
9191
</dependencies>

‎server/pom.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<plugin>
4343
<groupId>org.apache.maven.plugins</groupId>
4444
<artifactId>maven-surefire-plugin</artifactId>
45-
<version>3.1.2</version>
45+
<version>3.2.2</version>
4646
<executions>
4747
<execution>
4848
<id>default-test</id>
@@ -203,17 +203,17 @@
203203
<dependency>
204204
<groupId>org.apache.directory.api</groupId>
205205
<artifactId>api-all</artifactId>
206-
<version>2.1.3</version>
206+
<version>2.1.5</version>
207207
</dependency>
208208
<dependency>
209209
<groupId>commons-net</groupId>
210210
<artifactId>commons-net</artifactId>
211-
<version>3.9.0</version>
211+
<version>3.10.0</version>
212212
</dependency>
213213
<dependency>
214214
<groupId>org.apache.commons</groupId>
215215
<artifactId>commons-text</artifactId>
216-
<version>1.10.0</version>
216+
<version>1.11.0</version>
217217
</dependency>
218218
<dependency>
219219
<groupId>org.apache.commons</groupId>
@@ -228,7 +228,7 @@
228228
<dependency>
229229
<groupId>org.apache.commons</groupId>
230230
<artifactId>commons-lang3</artifactId>
231-
<version>3.12.0</version>
231+
<version>3.13.0</version>
232232
</dependency>
233233
<dependency>
234234
<groupId>commons-validator</groupId>
@@ -303,7 +303,7 @@
303303
<dependency>
304304
<groupId>com.blueconic</groupId>
305305
<artifactId>browscap-java</artifactId>
306-
<version>1.4.0</version>
306+
<version>1.4.1</version>
307307
</dependency>
308308
<dependency>
309309
<groupId>org.jetbrains.xodus</groupId>
@@ -314,22 +314,22 @@
314314
<dependency>
315315
<groupId>org.slf4j</groupId>
316316
<artifactId>slf4j-nop</artifactId>
317-
<version>2.0.7</version>
317+
<version>2.0.9</version>
318318
</dependency>
319319
<dependency>
320320
<groupId>org.webjars</groupId>
321321
<artifactId>webjars-locator-core</artifactId>
322-
<version>0.53</version>
322+
<version>0.55</version>
323323
</dependency>
324324
<dependency>
325325
<groupId>com.github.ben-manes.caffeine</groupId>
326326
<artifactId>caffeine</artifactId>
327-
<version>3.1.6</version>
327+
<version>3.1.8</version>
328328
</dependency>
329329
<dependency>
330330
<groupId>com.nulab-inc</groupId>
331331
<artifactId>zxcvbn</artifactId>
332-
<version>1.7.0</version>
332+
<version>1.8.2</version>
333333
</dependency>
334334
<dependency>
335335
<groupId>com.github.ziplet</groupId>
@@ -347,7 +347,7 @@
347347
<!-- added newer dependency of xodus-environment -->
348348
<groupId>org.apache.commons</groupId>
349349
<artifactId>commons-compress</artifactId>
350-
<version>1.23.0</version>
350+
<version>1.25.0</version>
351351
</dependency>
352352
</dependencies>
353353

‎server/src/main/java/password/pwm/config/value/data/CustomLinkConfiguration.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
package password.pwm.config.value.data;
2222

23+
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
2324
import lombok.EqualsAndHashCode;
2425
import lombok.Value;
2526
import password.pwm.util.i18n.LocaleHelper;
@@ -47,6 +48,8 @@ public enum Type
4748
private final Type type = Type.customLink;
4849
private final Map<String, String> labels = Collections.singletonMap( "", "" );
4950
private final Map<String, String> description = Collections.singletonMap( "", "" );
51+
52+
@SuppressFBWarnings( "SS_SHOULD_BE_STATIC" )
5053
private final String customLinkUrl = "";
5154
private final boolean customLinkNewWindow;
5255
private final Map<String, String> selectOptions = Collections.emptyMap();

‎server/src/main/java/password/pwm/http/servlet/oauth/OAuthState.java

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

2323
import com.google.gson.annotations.SerializedName;
24+
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
2425
import lombok.Builder;
2526
import lombok.Value;
2627
import password.pwm.util.java.AtomicLoopIntIncrementer;
@@ -60,6 +61,7 @@ class OAuthState implements Serializable
6061
private String forgottenProfileId;
6162

6263
@SerializedName( "v" )
64+
@SuppressFBWarnings( "SS_SHOULD_BE_STATIC" )
6365
private int version = 1;
6466

6567
static OAuthState newSSOAuthenticationState( final String sessionID, final String nextUrl )

0 commit comments

Comments
 (0)