From 94153f2383fe8f9e93f69549c17e3285b51460bd Mon Sep 17 00:00:00 2001
From: Christopher Broderick <uhurusurfa@gmail.com>
Date: Mon, 6 May 2024 09:53:20 +0100
Subject: [PATCH] Log meesage fix and library upgrades (#373)

* Make log message more useful.

* Version upgrades

* Document release notes

* Revert Glassfish to retain Java 8 compatibility
---
 RELEASE-NOTES.md                              | 15 +++++++-----
 Remote/pom.xml                                |  2 +-
 Server/pom.xml                                |  2 +-
 .../processor/sender/MDNSenderModule.java     |  2 +-
 changes.txt                                   |  8 +++++++
 pom.xml                                       | 24 +++++++++----------
 6 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index d0fad0fd..f47a15da 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,19 +1,22 @@
 #              OpenAS2 Server
-#              Version 3.10.0
+#              Version 3.10.1
 #              RELEASE NOTES
 -----
-The OpenAS2 project is pleased to announce the release of OpenAS2 3.10.0
+The OpenAS2 project is pleased to announce the release of OpenAS2 3.10.1
 
-The release download file is: OpenAS2Server-3.10.0.zip
+The release download file is: OpenAS2Server-3.10.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.10.0 - 2024-03-17
-This is an enhancement release:
+Version 3.10.1 - 2024-03-17
+This is a minor bugfix release:
        **IMPORTANT NOTE**: Please review upgrade notes below if you are upgrading
 
- 1. Support Elliptic Curve algorithm.
+ 1. Fix sending the Content-Length header correctly on MDN response when chinked transfer is not supported by the receiving software.
+ 2. Fix log message to indicate SYNC or ASYNC mode when receiving an MDN.
+ 3. Change the default Java package to Eclipse Temurin for the docker creation.
+ 4. Upgrade the encryprion packages to fix a low severity security issue.
 
 ##Upgrade Notes
  See the openAS2HowTo appendix for the general process on upgrading OpenAS2.
diff --git a/Remote/pom.xml b/Remote/pom.xml
index 034abe1f..a02b2c71 100644
--- a/Remote/pom.xml
+++ b/Remote/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>net.sf.openas2</groupId>
         <artifactId>OpenAS2</artifactId>
-        <version>3.10.0</version>
+        <version>3.10.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/Server/pom.xml b/Server/pom.xml
index 6fe25dd0..205f595c 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.10.0</version>
+        <version>3.10.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/Server/src/main/java/org/openas2/processor/sender/MDNSenderModule.java b/Server/src/main/java/org/openas2/processor/sender/MDNSenderModule.java
index 5ab1db45..99ae5773 100644
--- a/Server/src/main/java/org/openas2/processor/sender/MDNSenderModule.java
+++ b/Server/src/main/java/org/openas2/processor/sender/MDNSenderModule.java
@@ -57,7 +57,7 @@ public boolean canHandle(String action, Message msg, Map<String, Object> options
 
     public void handle(String action, Message msg, Map<String, Object> options) throws OpenAS2Exception {
         if (logger.isDebugEnabled()) {
-            logger.debug("ASYNC MDN send started...");
+            logger.debug("MDN sending started. Partner requested " + (msg.isRequestingAsynchMDN()?"ASYNC":"SYNC") + " mode for MDN response.");
         }
         if (options == null) {
             options = new HashMap<String, Object>();
diff --git a/changes.txt b/changes.txt
index 2d99d079..df8b7e6e 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,3 +1,11 @@
+Version 3.10.1 - 2024-05-06
+This is an minor bugfix release:
+       **IMPORTANT NOTE**: Please review upgrade notes in the RELEASE-NOTES.md if you are upgrading
+ 1. Fix sending the Content-Length header correctly on MDN response when chinked transfer is not supported by the receiving software.
+ 2. Fix log message to indicate SYNC or ASYNC mode when receiving an MDN.
+ 3. Change the default Java package to Eclipse Temurin for the docker creation.
+ 4. Upgrade the encryprion packages to fix a low severity security issue.
+
 Version 3.10.0 - 2024-03-17
 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 3b649f32..8584a800 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.10.0</version>
+    <version>3.10.1</version>
     <name>OpenAS2</name>
     <packaging>pom</packaging>
 
@@ -52,27 +52,27 @@
             <dependency>
                 <groupId>org.bouncycastle</groupId>
                 <artifactId>bcmail-jdk18on</artifactId>
-                <version>1.77</version>
+                <version>1.78.1</version>
             </dependency>
             <dependency>
                 <groupId>org.bouncycastle</groupId>
                 <artifactId>bcpkix-jdk18on</artifactId>
-                <version>1.77</version>
+                <version>1.78.1</version>
             </dependency>
             <dependency>
                 <groupId>org.bouncycastle</groupId>
                 <artifactId>bcprov-jdk18on</artifactId>
-                <version>1.77</version>
+                <version>1.78.1</version>
             </dependency>
             <dependency>
                 <groupId>org.bouncycastle</groupId>
                 <artifactId>bcprov-ext-jdk18on</artifactId>
-                <version>1.77</version>
+                <version>1.78</version>
             </dependency>
             <dependency>
                 <groupId>org.bouncycastle</groupId>
                 <artifactId>bcpg-jdk18on</artifactId>
-                <version>1.77</version>
+                <version>1.78.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
@@ -82,12 +82,12 @@
             <dependency>
                 <groupId>commons-cli</groupId>
                 <artifactId>commons-cli</artifactId>
-                <version>1.6.0</version>
+                <version>1.7.0</version>
             </dependency>
             <dependency>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>
-                <version>1.3.0</version>
+                <version>1.3.1</version>
             </dependency>
             <dependency>
                 <groupId>com.sun.mail</groupId>
@@ -148,7 +148,7 @@
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
-                <version>2.15.1</version>
+                <version>2.16.1</version>
             </dependency>
 			<!-- https://mvnrepository.com/artifact/javax.ws.rs/javax.ws.rs-api -->
 			<dependency>
@@ -171,13 +171,13 @@
            <dependency>
                <groupId>com.fasterxml.jackson.core</groupId>
                <artifactId>jackson-databind</artifactId>
-               <version>2.17.0</version>
+               <version>2.17.1</version>
                <type>jar</type>
            </dependency>
 		   <dependency>
 		        <groupId>com.fasterxml.jackson.module</groupId>
 		        <artifactId>jackson-module-jaxb-annotations</artifactId>
-		        <version>2.17.0</version>
+		        <version>2.17.1</version>
 		   </dependency>
            <dependency>
                <groupId>org.glassfish.jersey.media</groupId>
@@ -209,7 +209,7 @@
             <dependency>
                 <groupId>io.sentry</groupId>
                 <artifactId>sentry</artifactId>
-                <version>7.6.0</version>
+                <version>7.8.0</version>
             </dependency>
         </dependencies>
     </dependencyManagement>