From ecfc03ed43b464cd32676aa45afc3e991f707656 Mon Sep 17 00:00:00 2001
From: Christopher Broderick <uhurusurfa@gmail.com>
Date: Tue, 6 Feb 2024 22:13:33 +0000
Subject: [PATCH] Fix resend failure to persist to errordir (#356)

* Update packages and version numbe

* Fix resend not stpring failed message in errordir

* Update change history
---
 RELEASE-NOTES.md                                     | 12 ++++++------
 Remote/pom.xml                                       |  2 +-
 Server/pom.xml                                       |  2 +-
 .../processor/resender/DirectoryResenderModule.java  |  1 +
 changes.txt                                          |  6 ++++++
 pom.xml                                              | 10 +++++-----
 6 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 854770bf..34664f3e 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,19 +1,19 @@
 #              OpenAS2 Server
-#              Version 3.9.0
+#              Version 3.9.1
 #              RELEASE NOTES
 -----
-The OpenAS2 project is pleased to announce the release of OpenAS2 3.9.0
+The OpenAS2 project is pleased to announce the release of OpenAS2 3.9.1
 
-The release download file is: OpenAS2Server-3.9.0.zip
+The release download file is: OpenAS2Server-3.9.1.zip
 
 The zip file contains a PDF document (OpenAS2HowTo.pdf) providing information on installing and using the application.
 ## NOTE: Testing covers Java 8 to 17. The application should work for older versions down to Java 7 but they are not tested as part of the CI/CD pipeline.
 
-Version 3.9.0 - 2023-12-20
-This is an enhancement release:
+Version 3.9.1 - 2024-02-06
+This is a minor bugfix release:
        **IMPORTANT NOTE**: Please review upgrade notes below if you are upgrading
 
- 1. Support for non-standard algorithm strings for partners that do not conform to the RFC standard. See documentation section 7.2.1 "Signing"
+ 1. Fix persistence to errordir after all resend attempts fail.
 
 ##Upgrade Notes
  See the openAS2HowTo appendix for the general process on upgrading OpenAS2.
diff --git a/Remote/pom.xml b/Remote/pom.xml
index 779bafa6..dd42d664 100644
--- a/Remote/pom.xml
+++ b/Remote/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>net.sf.openas2</groupId>
         <artifactId>OpenAS2</artifactId>
-        <version>3.9.0</version>
+        <version>3.9.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/Server/pom.xml b/Server/pom.xml
index 813632c8..110d7086 100644
--- a/Server/pom.xml
+++ b/Server/pom.xml
@@ -7,7 +7,7 @@
         <!-- DO NOT CHANGE THIS "groupId" WITHOUT CHANGING XMLSession.getManifestAttributes.MANIFEST_VENDOR_ID_ATTRIB -->
         <groupId>net.sf.openas2</groupId>
         <artifactId>OpenAS2</artifactId>
-        <version>3.9.0</version>
+        <version>3.9.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/Server/src/main/java/org/openas2/processor/resender/DirectoryResenderModule.java b/Server/src/main/java/org/openas2/processor/resender/DirectoryResenderModule.java
index 88874074..2ae415d5 100644
--- a/Server/src/main/java/org/openas2/processor/resender/DirectoryResenderModule.java
+++ b/Server/src/main/java/org/openas2/processor/resender/DirectoryResenderModule.java
@@ -190,6 +190,7 @@ protected void processFile(File file) throws OpenAS2Exception {
                 } catch (OpenAS2Exception e) {
                     // Just log and ignore since it will have been handled upstream
                     logger.error("Error resending message", e);
+                    IOUtil.handleArchive(file, getParameter(PARAM_ERROR_DIRECTORY, true));
                 }
 
                 if (!file.delete()) { // Delete the file, sender will re-queue if the transmission fails again
diff --git a/changes.txt b/changes.txt
index 550078f2..22989d43 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,3 +1,9 @@
+Version 3.9.1 - 2024-02-06
+This is a minor bugfix release:
+       **IMPORTANT NOTE**: Please review upgrade notes in the RELEASE-NOTES.md if you are upgrading
+
+ 1. Fix persistence to errordir after all resend attempts fail.
+
 Version 3.9.0 - 2023-12-20
 This is an enhancement release:
        **IMPORTANT NOTE**: Please review upgrade notes in the RELEASE-NOTES.md if you are upgrading
diff --git a/pom.xml b/pom.xml
index a73caa68..b7ecdb18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.sf.openas2</groupId>
     <artifactId>OpenAS2</artifactId>
-    <version>3.9.0</version>
+    <version>3.9.1</version>
     <name>OpenAS2</name>
     <packaging>pom</packaging>
 
@@ -120,7 +120,7 @@
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
 		        <artifactId>junit-jupiter</artifactId>
-		        <version>5.10.1</version>
+		        <version>5.10.2</version>
                 <scope>test</scope>
             </dependency>
             <!-- https://mvnrepository.com/artifact/org.mockito/mockito-core -->
@@ -171,13 +171,13 @@
            <dependency>
                <groupId>com.fasterxml.jackson.core</groupId>
                <artifactId>jackson-databind</artifactId>
-               <version>2.16.0</version>
+               <version>2.16.1</version>
                <type>jar</type>
            </dependency>
 		   <dependency>
 		        <groupId>com.fasterxml.jackson.module</groupId>
 		        <artifactId>jackson-module-jaxb-annotations</artifactId>
-		        <version>2.16.0</version>
+		        <version>2.16.1</version>
 		   </dependency>
            <dependency>
                <groupId>org.glassfish.jersey.media</groupId>
@@ -209,7 +209,7 @@
             <dependency>
                 <groupId>io.sentry</groupId>
                 <artifactId>sentry</artifactId>
-                <version>7.1.0</version>
+                <version>7.3.0</version>
             </dependency>
         </dependencies>
     </dependencyManagement>