Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix resend failure to persist to errordir #356

Merged
merged 3 commits into from
Feb 6, 2024
Merged

Fix resend failure to persist to errordir #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a1c6c0
Update packages and version numbe
uhurusurfa Feb 6, 2024
2104c1f
Fix resend not stpring failed message in errordir
uhurusurfa Feb 6, 2024
3772b17
Update change history
uhurusurfa Feb 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions RELEASE-NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion Remote/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion Server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
1 change: 1 addition & 0 deletions Server/src/main/java/org/openas2/processor/resender/DirectoryResenderModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions changes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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 -->
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
Loading