Skip to content

Commit c9bcdc7

Browse files
jrivardjrivard
committed
dependency updates
1 parent 489f765 commit c9bcdc7

File tree

8 files changed

+25
-35
lines changed

8 files changed

+25
-35
lines changed

‎data-service/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,12 +157,12 @@
157157
<dependency>
158158
<groupId>com.google.code.gson</groupId>
159159
<artifactId>gson</artifactId>
160-
<version>2.8.5</version>
160+
<version>2.8.6</version>
161161
</dependency>
162162
<dependency>
163163
<groupId>org.jetbrains.xodus</groupId>
164164
<artifactId>xodus-environment</artifactId>
165-
<version>1.3.91</version>
165+
<version>1.3.124</version>
166166
</dependency>
167167
</dependencies>
168168
</project>

‎docker/pom.xml

Lines changed: 1 addition & 1 deletion
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>1.5.1</version>
37+
<version>1.7.0</version>
3838
<executions>
3939
<execution>
4040
<id>make-docker-image</id>

‎onejar/pom.xml

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

1818
<properties>
1919
<project.root.basedir>${project.basedir}/..</project.root.basedir>
20-
<tomcat.version>9.0.24</tomcat.version>
20+
<tomcat.version>9.0.27</tomcat.version>
2121
</properties>
2222

2323
<build>

‎pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
<dependency>
167167
<groupId>com.puppycrawl.tools</groupId>
168168
<artifactId>checkstyle</artifactId>
169-
<version>8.24</version>
169+
<version>8.25</version>
170170
</dependency>
171171
</dependencies>
172172
<executions>
@@ -250,7 +250,7 @@
250250
<dependency>
251251
<groupId>com.github.spotbugs</groupId>
252252
<artifactId>spotbugs</artifactId>
253-
<version>4.0.0-beta3</version>
253+
<version>4.0.0-beta4</version>
254254
</dependency>
255255
</dependencies>
256256
<configuration>
@@ -271,7 +271,7 @@
271271
<plugin> <!-- checks owsp vulnerability database -->
272272
<groupId>org.owasp</groupId>
273273
<artifactId>dependency-check-maven</artifactId>
274-
<version>5.2.1</version>
274+
<version>5.2.2</version>
275275
<executions>
276276
<execution>
277277
<goals>
@@ -294,7 +294,7 @@
294294
<dependency>
295295
<groupId>com.github.spotbugs</groupId>
296296
<artifactId>spotbugs-annotations</artifactId>
297-
<version>4.0.0-beta3</version>
297+
<version>4.0.0-beta4</version>
298298
<scope>provided</scope>
299299
</dependency>
300300

@@ -308,7 +308,7 @@
308308
<dependency>
309309
<groupId>org.mockito</groupId>
310310
<artifactId>mockito-core</artifactId>
311-
<version>3.0.0</version>
311+
<version>3.1.0</version>
312312
<scope>test</scope>
313313
</dependency>
314314
<dependency>
@@ -320,7 +320,7 @@
320320
<dependency>
321321
<groupId>com.github.tomakehurst</groupId>
322322
<artifactId>wiremock</artifactId>
323-
<version>2.24.1</version>
323+
<version>2.25.1</version>
324324
<scope>test</scope>
325325
</dependency>
326326
<dependency>

‎pwm-cr/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<dependency>
2626
<groupId>com.google.code.gson</groupId>
2727
<artifactId>gson</artifactId>
28-
<version>2.8.5</version>
28+
<version>2.8.6</version>
2929
</dependency>
3030
<dependency>
3131
<groupId>org.jdom</groupId>
@@ -45,7 +45,7 @@
4545
<dependency>
4646
<groupId>org.bouncycastle</groupId>
4747
<artifactId>bcpkix-jdk15on</artifactId>
48-
<version>1.63</version>
48+
<version>1.64</version>
4949
</dependency>
5050

5151
<!-- Test dependencies -->

‎rest-test-service/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
<dependency>
7979
<groupId>com.google.code.gson</groupId>
8080
<artifactId>gson</artifactId>
81-
<version>2.8.5</version>
81+
<version>2.8.6</version>
8282
</dependency>
8383
<dependency>
8484
<groupId>org.apache.commons</groupId>

‎server/pom.xml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@
247247
<dependency>
248248
<groupId>org.jasig.cas.client</groupId>
249249
<artifactId>cas-client-core</artifactId>
250-
<version>3.5.1</version>
250+
<version>3.6.1</version>
251251
</dependency>
252252
<dependency>
253253
<groupId>net.glxn</groupId>
@@ -257,12 +257,12 @@
257257
<dependency>
258258
<groupId>org.bouncycastle</groupId>
259259
<artifactId>bcprov-jdk15on</artifactId>
260-
<version>1.63</version>
260+
<version>1.64</version>
261261
</dependency>
262262
<dependency>
263263
<groupId>org.bouncycastle</groupId>
264264
<artifactId>bcpkix-jdk15on</artifactId>
265-
<version>1.63</version>
265+
<version>1.64</version>
266266
</dependency>
267267
<dependency>
268268
<groupId>jaxen</groupId>
@@ -287,25 +287,17 @@
287287
<dependency>
288288
<groupId>com.google.code.gson</groupId>
289289
<artifactId>gson</artifactId>
290-
<version>2.8.5</version>
290+
<version>2.8.6</version>
291291
</dependency>
292292
<dependency>
293293
<groupId>com.blueconic</groupId>
294294
<artifactId>browscap-java</artifactId>
295-
<version>1.2.11</version>
295+
<version>1.2.13</version>
296296
</dependency>
297297
<dependency>
298298
<groupId>org.jetbrains.xodus</groupId>
299299
<artifactId>xodus-environment</artifactId>
300-
<!-- do not upgrade to 1.3.x until bug is resolved: https://youtrack.jetbrains.com/issue/XD-786 -->
301-
<version>1.2.3</version>
302-
</dependency>
303-
304-
<dependency>
305-
<!-- added because of older xodus depedendency -->
306-
<groupId>org.jetbrains.kotlin</groupId>
307-
<artifactId>kotlin-stdlib</artifactId>
308-
<version>1.3.50</version>
300+
<version>1.3.124</version>
309301
</dependency>
310302

311303
<dependency>
@@ -316,7 +308,7 @@
316308
<dependency>
317309
<groupId>org.webjars</groupId>
318310
<artifactId>webjars-locator-core</artifactId>
319-
<version>0.40</version>
311+
<version>0.41</version>
320312
</dependency>
321313
<dependency>
322314
<groupId>com.github.ben-manes.caffeine</groupId>
@@ -326,7 +318,7 @@
326318
<dependency>
327319
<groupId>com.nulab-inc</groupId>
328320
<artifactId>zxcvbn</artifactId>
329-
<version>1.2.7</version>
321+
<version>1.3.0</version>
330322
</dependency>
331323
<dependency>
332324
<groupId>com.github.ziplet</groupId>

‎webapp/src/main/webapp/WEB-INF/jsp/admin-user-debug.jsp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,6 @@
6969
<button type="submit" class="btn"><pwm:display key="Button_Continue"/></button>
7070
</form>
7171
</div>
72-
<div class="buttonbar">
73-
<form method="get">
74-
<input type="hidden" name="processAction" value="<%=AdminServlet.AdminAction.downloadUserDebug.toString()%>"/>
75-
<button type="submit" class="btn">Download</button>
76-
</form>
77-
</div>
7872
<% final PublicUserInfoBean userInfo = userDebugDataBean.getPublicUserInfoBean(); %>
7973
<% if (userInfo != null) { %>
8074
<table>
@@ -536,6 +530,10 @@
536530
<form method="get" class="pwm-form">
537531
<button type="submit" class="btn"><pwm:display key="Button_Continue"/></button>
538532
</form>
533+
<form method="get">
534+
<input type="hidden" name="processAction" value="<%=AdminServlet.AdminAction.downloadUserDebug.toString()%>"/>
535+
<button type="submit" class="btn">Download</button>
536+
</form>
539537
</div>
540538
<% } %>
541539
</div>

0 commit comments

Comments
 (0)