dependency updates

data-service/pom.xml

@@ -157,12 +157,12 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.5</version>
+            <version>2.8.6</version>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.xodus</groupId>
             <artifactId>xodus-environment</artifactId>
-            <version>1.3.91</version>
+            <version>1.3.124</version>
         </dependency>
     </dependencies>
 </project>

docker/pom.xml

@@ -34,7 +34,7 @@
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>jib-maven-plugin</artifactId>
-                <version>1.5.1</version>
+                <version>1.7.0</version>
                 <executions>
                     <execution>
                         <id>make-docker-image</id>

onejar/pom.xml

@@ -17,7 +17,7 @@
 
     <properties>
         <project.root.basedir>${project.basedir}/..</project.root.basedir>
-        <tomcat.version>9.0.24</tomcat.version>
+        <tomcat.version>9.0.27</tomcat.version>
     </properties>
 
     <build>

pom.xml

@@ -166,7 +166,7 @@
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
                         <artifactId>checkstyle</artifactId>
-                        <version>8.24</version>
+                        <version>8.25</version>
                     </dependency>
                 </dependencies>
                 <executions>
@@ -250,7 +250,7 @@
                     <dependency>
                         <groupId>com.github.spotbugs</groupId>
                         <artifactId>spotbugs</artifactId>
-                        <version>4.0.0-beta3</version>
+                        <version>4.0.0-beta4</version>
                     </dependency>
                 </dependencies>
                 <configuration>
@@ -271,7 +271,7 @@
             <plugin> <!-- checks owsp vulnerability database -->
                 <groupId>org.owasp</groupId>
                 <artifactId>dependency-check-maven</artifactId>
-                <version>5.2.1</version>
+                <version>5.2.2</version>
                 <executions>
                     <execution>
                         <goals>
@@ -294,7 +294,7 @@
         <dependency>
             <groupId>com.github.spotbugs</groupId>
             <artifactId>spotbugs-annotations</artifactId>
-            <version>4.0.0-beta3</version>
+            <version>4.0.0-beta4</version>
             <scope>provided</scope>
         </dependency>
 
@@ -308,7 +308,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>3.0.0</version>
+            <version>3.1.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -320,7 +320,7 @@
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
             <artifactId>wiremock</artifactId>
-            <version>2.24.1</version>
+            <version>2.25.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>

pwm-cr/pom.xml

@@ -25,7 +25,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.5</version>
+            <version>2.8.6</version>
         </dependency>
         <dependency>
             <groupId>org.jdom</groupId>
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk15on</artifactId>
-            <version>1.63</version>
+            <version>1.64</version>
         </dependency>
 
         <!-- Test dependencies -->

rest-test-service/pom.xml

@@ -78,7 +78,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.5</version>
+            <version>2.8.6</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

server/pom.xml

@@ -247,7 +247,7 @@
         <dependency>
             <groupId>org.jasig.cas.client</groupId>
             <artifactId>cas-client-core</artifactId>
-            <version>3.5.1</version>
+            <version>3.6.1</version>
         </dependency>
         <dependency>
             <groupId>net.glxn</groupId>
@@ -257,12 +257,12 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15on</artifactId>
-            <version>1.63</version>
+            <version>1.64</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk15on</artifactId>
-            <version>1.63</version>
+            <version>1.64</version>
         </dependency>
         <dependency>
             <groupId>jaxen</groupId>
@@ -287,25 +287,17 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.5</version>
+            <version>2.8.6</version>
         </dependency>
         <dependency>
             <groupId>com.blueconic</groupId>
             <artifactId>browscap-java</artifactId>
-            <version>1.2.11</version>
+            <version>1.2.13</version>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.xodus</groupId>
             <artifactId>xodus-environment</artifactId>
-            <!-- do not upgrade to 1.3.x until bug is resolved: https://youtrack.jetbrains.com/issue/XD-786 -->
-            <version>1.2.3</version>
-        </dependency>
-
-        <dependency>
-            <!-- added because of older xodus depedendency -->
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib</artifactId>
-            <version>1.3.50</version>
+            <version>1.3.124</version>
         </dependency>
 
         <dependency>
@@ -316,7 +308,7 @@
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>webjars-locator-core</artifactId>
-            <version>0.40</version>
+            <version>0.41</version>
         </dependency>
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>
@@ -326,7 +318,7 @@
         <dependency>
             <groupId>com.nulab-inc</groupId>
             <artifactId>zxcvbn</artifactId>
-            <version>1.2.7</version>
+            <version>1.3.0</version>
         </dependency>
         <dependency>
             <groupId>com.github.ziplet</groupId>

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

@@ -69,12 +69,6 @@
                 <button type="submit" class="btn"><pwm:display key="Button_Continue"/></button>
             </form>
         </div>
-        <div class="buttonbar">
-            <form method="get">
-                <input type="hidden" name="processAction" value="<%=AdminServlet.AdminAction.downloadUserDebug.toString()%>"/>
-                <button type="submit" class="btn">Download</button>
-            </form>
-        </div>
         <% final PublicUserInfoBean userInfo = userDebugDataBean.getPublicUserInfoBean(); %>
         <% if (userInfo != null) { %>
         <table>
@@ -536,6 +530,10 @@
             <form method="get" class="pwm-form">
                 <button type="submit" class="btn"><pwm:display key="Button_Continue"/></button>
             </form>
+            <form method="get">
+                <input type="hidden" name="processAction" value="<%=AdminServlet.AdminAction.downloadUserDebug.toString()%>"/>
+                <button type="submit" class="btn">Download</button>
+            </form>
         </div>
         <% } %>
     </div>