Parcourir la source

dependency updates

Jason Rivard il y a 4 ans
Parent
commit
009207f274

+ 1 - 1
client/pom.xml

@@ -80,7 +80,7 @@
             <plugin>
             <plugin>
                 <groupId>com.github.eirslett</groupId>
                 <groupId>com.github.eirslett</groupId>
                 <artifactId>frontend-maven-plugin</artifactId>
                 <artifactId>frontend-maven-plugin</artifactId>
-                <version>1.11.0</version>
+                <version>1.11.3</version>
                 <configuration>
                 <configuration>
                     <nodeVersion>${node.version}</nodeVersion>
                     <nodeVersion>${node.version}</nodeVersion>
                     <npmVersion>${npm.version}</npmVersion>
                     <npmVersion>${npm.version}</npmVersion>

+ 3 - 3
data-service/pom.xml

@@ -120,7 +120,7 @@
         <dependency>
         <dependency>
             <groupId>commons-net</groupId>
             <groupId>commons-net</groupId>
             <artifactId>commons-net</artifactId>
             <artifactId>commons-net</artifactId>
-            <version>3.7.2</version>
+            <version>3.8.0</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <groupId>org.apache.commons</groupId>
@@ -130,12 +130,12 @@
         <dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.11</version>
+            <version>3.12.0</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>
             <groupId>com.sun.mail</groupId>
             <artifactId>jakarta.mail</artifactId>
             <artifactId>jakarta.mail</artifactId>
-            <version>2.0.0</version>
+            <version>2.0.1</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <groupId>org.apache.httpcomponents</groupId>

+ 1 - 1
docker/pom.xml

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

+ 1 - 1
onejar/pom.xml

@@ -16,7 +16,7 @@
     <name>PWM Password Self Service: Executable Server JAR</name>
     <name>PWM Password Self Service: Executable Server JAR</name>
 
 
     <properties>
     <properties>
-        <tomcat.version>9.0.39</tomcat.version>
+        <tomcat.version>9.0.45</tomcat.version>
     </properties>
     </properties>
 
 
     <build>
     <build>

+ 13 - 13
pom.xml

@@ -102,7 +102,7 @@
             <plugin>
             <plugin>
                 <groupId>pl.project13.maven</groupId>
                 <groupId>pl.project13.maven</groupId>
                 <artifactId>git-commit-id-plugin</artifactId>
                 <artifactId>git-commit-id-plugin</artifactId>
-                <version>4.0.3</version>
+                <version>4.0.4</version>
                 <executions>
                 <executions>
                     <execution>
                     <execution>
                         <id>get-the-git-infos</id>
                         <id>get-the-git-infos</id>
@@ -230,12 +230,12 @@
             <plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>3.1.2</version>
                 <dependencies>
                 <dependencies>
                     <dependency>
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
                         <groupId>com.puppycrawl.tools</groupId>
                         <artifactId>checkstyle</artifactId>
                         <artifactId>checkstyle</artifactId>
-                        <version>8.38</version>
+                        <version>8.42</version>
                     </dependency>
                     </dependency>
                 </dependencies>
                 </dependencies>
                 <executions>
                 <executions>
@@ -314,12 +314,12 @@
             <plugin>
             <plugin>
                 <groupId>com.github.spotbugs</groupId>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
-                <version>4.1.4</version>
+                <version>4.2.3</version>
                 <dependencies>
                 <dependencies>
                     <dependency>
                     <dependency>
                         <groupId>com.github.spotbugs</groupId>
                         <groupId>com.github.spotbugs</groupId>
                         <artifactId>spotbugs</artifactId>
                         <artifactId>spotbugs</artifactId>
-                        <version>4.2.0</version>
+                        <version>4.2.3</version>
                     </dependency>
                     </dependency>
                 </dependencies>
                 </dependencies>
                 <configuration>
                 <configuration>
@@ -366,7 +366,7 @@
             <plugin> <!-- checks owsp vulnerability database -->
             <plugin> <!-- checks owsp vulnerability database -->
                 <groupId>org.owasp</groupId>
                 <groupId>org.owasp</groupId>
                 <artifactId>dependency-check-maven</artifactId>
                 <artifactId>dependency-check-maven</artifactId>
-                <version>6.0.3</version>
+                <version>6.1.6</version>
                 <executions>
                 <executions>
                     <execution>
                     <execution>
                         <goals>
                         <goals>
@@ -383,13 +383,13 @@
         <dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <artifactId>lombok</artifactId>
-            <version>1.18.16</version>
+            <version>1.18.20</version>
             <scope>provided</scope>
             <scope>provided</scope>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>com.github.spotbugs</groupId>
             <groupId>com.github.spotbugs</groupId>
             <artifactId>spotbugs-annotations</artifactId>
             <artifactId>spotbugs-annotations</artifactId>
-            <version>4.2.0</version>
+            <version>4.2.3</version>
             <scope>provided</scope>
             <scope>provided</scope>
         </dependency>
         </dependency>
 
 
@@ -397,19 +397,19 @@
         <dependency>
         <dependency>
             <groupId>junit</groupId>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <artifactId>junit</artifactId>
-            <version>4.13.1</version>
+            <version>4.13.2</version>
             <scope>test</scope>
             <scope>test</scope>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
             <artifactId>mockito-core</artifactId>
-            <version>3.6.28</version>
+            <version>3.9.0</version>
             <scope>test</scope>
             <scope>test</scope>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
             <artifactId>assertj-core</artifactId>
-            <version>3.18.1</version>
+            <version>3.19.0</version>
             <scope>test</scope>
             <scope>test</scope>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
@@ -427,13 +427,13 @@
         <dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
             <artifactId>jmh-core</artifactId>
-            <version>1.27</version>
+            <version>1.29</version>
             <scope>test</scope>
             <scope>test</scope>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
             <artifactId>jmh-generator-annprocess</artifactId>
-            <version>1.27</version>
+            <version>1.29</version>
             <scope>test</scope>
             <scope>test</scope>
         </dependency>
         </dependency>
 
 

+ 6 - 20
server/pom.xml

@@ -49,21 +49,7 @@
                     <compilerArgs>
                     <compilerArgs>
                         <arg>-Xmaxwarns</arg>
                         <arg>-Xmaxwarns</arg>
                         <arg>9999</arg>
                         <arg>9999</arg>
-                        <arg>-XDcompilePolicy=simple</arg>
-                        <arg>-Xplugin:ErrorProne</arg>
                     </compilerArgs>
                     </compilerArgs>
-                    <annotationProcessorPaths>
-                        <path>
-                            <groupId>com.google.errorprone</groupId>
-                            <artifactId>error_prone_core</artifactId>
-                            <version>2.4.0</version>
-                        </path>
-                        <path>
-                            <groupId>org.projectlombok</groupId>
-                            <artifactId>lombok</artifactId>
-                            <version>1.18.16</version>
-                        </path>
-                    </annotationProcessorPaths>
                 </configuration>
                 </configuration>
             </plugin>
             </plugin>
             <plugin>
             <plugin>
@@ -231,7 +217,7 @@
         <dependency>
         <dependency>
             <groupId>commons-net</groupId>
             <groupId>commons-net</groupId>
             <artifactId>commons-net</artifactId>
             <artifactId>commons-net</artifactId>
-            <version>3.7.2</version>
+            <version>3.8.0</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <groupId>org.apache.commons</groupId>
@@ -251,7 +237,7 @@
         <dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.11</version>
+            <version>3.12.0</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>commons-validator</groupId>
             <groupId>commons-validator</groupId>
@@ -261,7 +247,7 @@
         <dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>
             <groupId>com.sun.mail</groupId>
             <artifactId>jakarta.mail</artifactId>
             <artifactId>jakarta.mail</artifactId>
-            <version>2.0.0</version>
+            <version>2.0.1</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <groupId>org.apache.httpcomponents</groupId>
@@ -326,7 +312,7 @@
         <dependency>
         <dependency>
             <groupId>com.blueconic</groupId>
             <groupId>com.blueconic</groupId>
             <artifactId>browscap-java</artifactId>
             <artifactId>browscap-java</artifactId>
-            <version>1.3.3</version>
+            <version>1.3.5</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>org.jetbrains.xodus</groupId>
             <groupId>org.jetbrains.xodus</groupId>
@@ -347,12 +333,12 @@
         <dependency>
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>
             <groupId>com.github.ben-manes.caffeine</groupId>
             <artifactId>caffeine</artifactId>
             <artifactId>caffeine</artifactId>
-            <version>2.8.8</version>
+            <version>3.0.1</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>com.nulab-inc</groupId>
             <groupId>com.nulab-inc</groupId>
             <artifactId>zxcvbn</artifactId>
             <artifactId>zxcvbn</artifactId>
-            <version>1.3.1</version>
+            <version>1.5.0</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>com.github.ziplet</groupId>
             <groupId>com.github.ziplet</groupId>

+ 1 - 0
server/src/main/java/password/pwm/util/secure/BCrypt.java

@@ -30,6 +30,7 @@ import java.io.UnsupportedEncodingException;
 import java.security.SecureRandom;
 import java.security.SecureRandom;
 
 
 @SuppressWarnings( "all" )
 @SuppressWarnings( "all" )
+@SuppressFBWarnings( "DMI_RANDOM_USED_ONLY_ONCE" )
 public class BCrypt
 public class BCrypt
 {
 {
     private static final PwmLogger LOGGER = PwmLogger.forClass( BCrypt.class );
     private static final PwmLogger LOGGER = PwmLogger.forClass( BCrypt.class );

+ 2 - 0
server/src/main/java/password/pwm/util/secure/SecureEngine.java

@@ -20,6 +20,7 @@
 
 
 package password.pwm.util.secure;
 package password.pwm.util.secure;
 
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import password.pwm.PwmConstants;
 import password.pwm.PwmConstants;
 import password.pwm.error.ErrorInformation;
 import password.pwm.error.ErrorInformation;
 import password.pwm.error.PwmError;
 import password.pwm.error.PwmError;
@@ -502,6 +503,7 @@ public class SecureEngine
         }
         }
     }
     }
 
 
+    @SuppressFBWarnings( "DMI_RANDOM_USED_ONLY_ONCE" )
     public static void benchmark( final Writer outputData ) throws PwmUnrecoverableException, IOException
     public static void benchmark( final Writer outputData ) throws PwmUnrecoverableException, IOException
     {
     {
         final int testIterations = 10 * 1000;
         final int testIterations = 10 * 1000;

+ 5 - 5
webapp/pom.xml

@@ -153,7 +153,7 @@
             <plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
                 <artifactId>maven-deploy-plugin</artifactId>
-                <version>2.8.2</version>
+                <version>3.0.0-M1</version>
                 <executions>
                 <executions>
                     <execution>
                     <execution>
                         <phase>deploy</phase>
                         <phase>deploy</phase>
@@ -299,22 +299,22 @@
         <dependency>
         <dependency>
             <groupId>org.webjars.npm</groupId>
             <groupId>org.webjars.npm</groupId>
             <artifactId>dojo</artifactId>
             <artifactId>dojo</artifactId>
-            <version>1.16.3</version>
+            <version>1.16.4</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>org.webjars.npm</groupId>
             <groupId>org.webjars.npm</groupId>
             <artifactId>dijit</artifactId>
             <artifactId>dijit</artifactId>
-            <version>1.16.3</version>
+            <version>1.16.4</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>org.webjars.npm</groupId>
             <groupId>org.webjars.npm</groupId>
             <artifactId>dojox</artifactId>
             <artifactId>dojox</artifactId>
-            <version>1.16.3</version>
+            <version>1.16.4</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>org.webjars.npm</groupId>
             <groupId>org.webjars.npm</groupId>
             <artifactId>dgrid</artifactId>
             <artifactId>dgrid</artifactId>
-            <version>1.3.1</version>
+            <version>1.3.3</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>org.webjars.bower</groupId>
             <groupId>org.webjars.bower</groupId>