dependency updates

build/checkstyle-import.xml

@@ -85,7 +85,7 @@
     <allow pkg="javax.servlet"/>
     <allow pkg="javax.net"/>
     <allow pkg="javax.crypto"/>
-    <allow pkg="javax.mail"/>
+    <allow pkg="jakarta.mail"/>
     <allow pkg="com.sun.mail"/>
     <allow pkg="org.xeustechnologies"/>
     <allow pkg="net.glxn"/>

client/pom.xml

@@ -75,7 +75,7 @@
             <plugin>
                 <groupId>com.github.eirslett</groupId>
                 <artifactId>frontend-maven-plugin</artifactId>
-                <version>1.10.0</version>
+                <version>1.10.3</version>
                 <configuration>
                     <nodeVersion>v12.13.1</nodeVersion>
                     <npmVersion>6.13.4</npmVersion>

data-service/pom.xml

@@ -120,7 +120,7 @@
         <dependency>
             <groupId>commons-net</groupId>
             <artifactId>commons-net</artifactId>
-            <version>3.7</version>
+            <version>3.7.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -135,12 +135,12 @@
         <dependency>
             <groupId>com.sun.mail</groupId>
             <artifactId>jakarta.mail</artifactId>
-            <version>1.6.4</version>
+            <version>2.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.12</version>
+            <version>4.5.13</version>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>

docker/pom.xml

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

onejar/pom.xml

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

pom.xml

@@ -99,7 +99,7 @@
             <plugin>
                 <groupId>pl.project13.maven</groupId>
                 <artifactId>git-commit-id-plugin</artifactId>
-                <version>4.0.1</version>
+                <version>4.0.2</version>
                 <executions>
                     <execution>
                         <id>get-the-git-infos</id>
@@ -231,7 +231,7 @@
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
                         <artifactId>checkstyle</artifactId>
-                        <version>8.36</version>
+                        <version>8.36.2</version>
                     </dependency>
                 </dependencies>
                 <executions>
@@ -310,12 +310,12 @@
             <plugin>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
-                <version>4.0.4</version>
+                <version>4.1.4</version>
                 <dependencies>
                     <dependency>
                         <groupId>com.github.spotbugs</groupId>
                         <artifactId>spotbugs</artifactId>
-                        <version>4.1.2</version>
+                        <version>4.1.4</version>
                     </dependency>
                 </dependencies>
                 <configuration>
@@ -362,7 +362,7 @@
             <plugin> <!-- checks owsp vulnerability database -->
                 <groupId>org.owasp</groupId>
                 <artifactId>dependency-check-maven</artifactId>
-                <version>5.3.2</version>
+                <version>6.0.2</version>
                 <executions>
                     <execution>
                         <goals>
@@ -379,13 +379,13 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.12</version>
+            <version>1.18.16</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.github.spotbugs</groupId>
             <artifactId>spotbugs-annotations</artifactId>
-            <version>4.1.2</version>
+            <version>4.1.4</version>
             <scope>provided</scope>
         </dependency>
 
@@ -399,19 +399,19 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>3.5.10</version>
+            <version>3.6.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.17.1</version>
+            <version>3.18.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
             <artifactId>wiremock</artifactId>
-            <version>2.27.1</version>
+            <version>2.27.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -423,13 +423,13 @@
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
-            <version>1.25.2</version>
+            <version>1.26</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
-            <version>1.25.2</version>
+            <version>1.26</version>
             <scope>test</scope>
         </dependency>
 

server/pom.xml

@@ -231,7 +231,7 @@
         <dependency>
             <groupId>commons-net</groupId>
             <artifactId>commons-net</artifactId>
-            <version>3.7</version>
+            <version>3.7.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -261,12 +261,12 @@
         <dependency>
             <groupId>com.sun.mail</groupId>
             <artifactId>jakarta.mail</artifactId>
-            <version>1.6.4</version>
+            <version>2.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.12</version>
+            <version>4.5.13</version>
         </dependency>
         <dependency>
             <groupId>org.graylog2</groupId>
@@ -347,12 +347,12 @@
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>
             <artifactId>caffeine</artifactId>
-            <version>2.8.5</version>
+            <version>2.8.6</version>
         </dependency>
         <dependency>
             <groupId>com.nulab-inc</groupId>
             <artifactId>zxcvbn</artifactId>
-            <version>1.3.0</version>
+            <version>1.3.1</version>
         </dependency>
         <dependency>
             <groupId>com.github.ziplet</groupId>

server/src/main/java/password/pwm/http/servlet/configeditor/ConfigEditorServlet.java

@@ -20,7 +20,6 @@
 
 package password.pwm.http.servlet.configeditor;
 
-import com.novell.ldapchai.exception.ChaiUnavailableException;
 import lombok.Builder;
 import lombok.Value;
 import password.pwm.AppProperty;
@@ -84,7 +83,6 @@ import password.pwm.ws.server.RestResultBean;
 import password.pwm.ws.server.rest.RestRandomPasswordServer;
 import password.pwm.ws.server.rest.bean.HealthData;
 
-import javax.mail.MessagingException;
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
 import java.io.IOException;
@@ -186,7 +184,7 @@ public class ConfigEditorServlet extends ControlledPwmServlet
     }
 
     @Override
-    protected void nextStep( final PwmRequest pwmRequest ) throws PwmUnrecoverableException, IOException, ChaiUnavailableException, ServletException
+    protected void nextStep( final PwmRequest pwmRequest ) throws PwmUnrecoverableException, IOException, ServletException
     {
         pwmRequest.forwardToJsp( JspUrl.CONFIG_MANAGER_EDITOR );
     }
@@ -683,7 +681,7 @@ public class ConfigEditorServlet extends ControlledPwmServlet
                     EmailService.sendEmailSynchronous( emailServer.get(), testConfiguration, testEmailItem, macroRequest );
                     returnRecords.add( new HealthRecord( HealthStatus.INFO, HealthTopic.Email, "message sent" ) );
                 }
-                catch ( final MessagingException | PwmException e )
+                catch ( final PwmException e )
                 {
                     returnRecords.add( new HealthRecord( HealthStatus.WARN, HealthTopic.Email, JavaHelper.readHostileExceptionMessage( e ) ) );
                 }

server/src/main/java/password/pwm/svc/email/EmailConnection.java

@@ -23,8 +23,8 @@ package password.pwm.svc.email;
 import password.pwm.util.java.AtomicLoopIntIncrementer;
 import password.pwm.util.logging.PwmLogger;
 
-import javax.mail.MessagingException;
-import javax.mail.Transport;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Transport;
 import java.time.Instant;
 
 class EmailConnection

server/src/main/java/password/pwm/svc/email/EmailConnectionPool.java

@@ -28,7 +28,7 @@ import password.pwm.util.java.JavaHelper;
 import password.pwm.util.java.TimeDuration;
 import password.pwm.util.logging.PwmLogger;
 
-import javax.mail.Transport;
+import jakarta.mail.Transport;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collections;

server/src/main/java/password/pwm/svc/email/EmailServer.java

@@ -45,12 +45,12 @@ public class EmailServer
     private String username;
     private PasswordData password;
     private Properties javaMailProps;
-    private javax.mail.Session session;
+    private jakarta.mail.Session session;
     private SmtpServerType type;
 
     private final StatisticCounterBundle<ServerStat> connectionStats = new StatisticCounterBundle<>( ServerStat.class );
     private final MovingAverage averageSendTime = new MovingAverage( TimeDuration.MINUTE );
-    private final AtomicReference<ErrorInformation> lastConnectError = new AtomicReference();
+    private final AtomicReference<ErrorInformation> lastConnectError = new AtomicReference<>();
 
 
     enum ServerStat

server/src/main/java/password/pwm/svc/email/EmailServerUtil.java

@@ -41,18 +41,18 @@ import password.pwm.util.java.StringUtil;
 import password.pwm.util.java.TimeDuration;
 import password.pwm.util.logging.PwmLogger;
 import password.pwm.util.macro.MacroRequest;
-import password.pwm.util.secure.PwmTrustManager;
 import password.pwm.util.secure.CertificateReadingTrustManager;
+import password.pwm.util.secure.PwmTrustManager;
 import password.pwm.util.secure.X509Utils;
 
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Transport;
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Transport;
+import jakarta.mail.internet.AddressException;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.mail.internet.MimeBodyPart;
+import jakarta.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeMultipart;
 import javax.net.ssl.TrustManager;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -113,7 +113,7 @@ public class EmailServerUtil
                     ? trustManagerForProfile( configuration, profile )
                     : trustManagers;
             final Properties properties = makeJavaMailProps( configuration, profile, effectiveTrustManagers );
-            final javax.mail.Session session = javax.mail.Session.getInstance( properties, null );
+            final jakarta.mail.Session session = jakarta.mail.Session.getInstance( properties, null );
             return Optional.of( EmailServer.builder()
                     .id( id )
                     .host( address )

server/src/main/java/password/pwm/svc/email/EmailService.java

@@ -20,6 +20,10 @@
 
 package password.pwm.svc.email;
 
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Transport;
+
 import password.pwm.PwmApplication;
 import password.pwm.PwmApplicationMode;
 import password.pwm.bean.EmailItemBean;
@@ -48,9 +52,6 @@ import password.pwm.util.localdb.WorkQueueProcessor;
 import password.pwm.util.logging.PwmLogger;
 import password.pwm.util.macro.MacroRequest;
 
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Transport;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -427,28 +428,37 @@ public class EmailService implements PwmService
             final EmailItemBean emailItem,
             final MacroRequest macroRequest
     )
-            throws PwmOperationalException, PwmUnrecoverableException, MessagingException
+            throws PwmOperationalException, PwmUnrecoverableException
 
     {
-        validateEmailItem( emailItem );
-        EmailItemBean workingItemBean = emailItem;
-        if ( macroRequest != null )
+        try
         {
-            workingItemBean = EmailServerUtil.applyMacrosToEmail( workingItemBean, macroRequest );
-        }
-        final Transport transport = EmailServerUtil.makeSmtpTransport( emailServer );
-        final List<Message> messages = EmailServerUtil.convertEmailItemToMessages(
-                workingItemBean,
-                configuration,
-                emailServer
-        );
+            validateEmailItem( emailItem );
+            EmailItemBean workingItemBean = emailItem;
+            if ( macroRequest != null )
+            {
+                workingItemBean = EmailServerUtil.applyMacrosToEmail( workingItemBean, macroRequest );
+            }
+            final Transport transport = EmailServerUtil.makeSmtpTransport( emailServer );
+            final List<Message> messages = EmailServerUtil.convertEmailItemToMessages(
+                    workingItemBean,
+                    configuration,
+                    emailServer
+            );
 
-        for ( final Message message : messages )
+            for ( final Message message : messages )
+            {
+                message.saveChanges();
+                transport.sendMessage( message, message.getAllRecipients() );
+            }
+            transport.close();
+        }
+        catch ( final MessagingException e )
         {
-            message.saveChanges();
-            transport.sendMessage( message, message.getAllRecipients() );
+            final String errorMsg = "error sending message: " + e.getMessage();
+            final ErrorInformation errorInformation = new ErrorInformation( PwmError.ERROR_EMAIL_SEND_FAILURE, errorMsg );
+            throw new PwmUnrecoverableException( errorInformation );
         }
-        transport.close();
     }
 
     private WorkQueueProcessor.ProcessResult sendItem( final EmailItemBean emailItemBean )

server/src/test/java/password/pwm/config/stored/StoredConfigItemKeyTest.java

@@ -103,7 +103,7 @@ public class StoredConfigItemKeyTest
 
         Collections.shuffle( list );
         Collections.sort( list );
-        System.out.println( list.size() );
+        //System.out.println( list.size() );
         //list.forEach( System.out::println );
     }
 }

server/src/test/java/password/pwm/svc/email/InternetAddressTest.java

@@ -23,8 +23,8 @@ package password.pwm.svc.email;
 import org.junit.Assert;
 import org.junit.Test;
 
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
+import jakarta.mail.internet.AddressException;
+import jakarta.mail.internet.InternetAddress;
 
 /**
  * Tests to ensure the email address parsing from javax.mail.internet.InternetAddress is what we

server/src/test/java/password/pwm/util/queue/EmailQueueManagerTest.java

@@ -31,9 +31,9 @@ import password.pwm.svc.email.EmailServer;
 import password.pwm.svc.email.EmailServerUtil;
 import password.pwm.svc.email.EmailService;
 
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.internet.InternetAddress;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.InternetAddress;
 import java.io.IOException;
 import java.util.List;
 import java.util.Properties;