Skip to content

Commit 58ec1e5

Browse files
committed
Version bump
1 parent 36e7968 commit 58ec1e5

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

phase2-lib/src/main/java/com/helger/phase2/client/AS2Client.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
import com.helger.phase2.processor.sender.AS2SenderModule;
6666
import com.helger.phase2.processor.sender.IProcessorSenderModule;
6767
import com.helger.phase2.session.AS2Session;
68-
import com.helger.security.certificate.CertificateHelper;
68+
import com.helger.security.certificate.CertificateDecodeHelper;
6969
import com.helger.typeconvert.collection.StringMap;
7070

7171
import jakarta.mail.MessagingException;
@@ -486,7 +486,9 @@ public AS2ClientResponse sendSynchronous (@NonNull final AS2ClientSettings aSett
486486
final String sReceivedCert = aMsg.attrs ().getAsString (AS2Message.ATTRIBUTE_RECEIVED_SIGNATURE_CERTIFICATE);
487487
if (sReceivedCert != null)
488488
{
489-
final X509Certificate aReceivedCert = CertificateHelper.convertStringToCertficateOrNull (sReceivedCert);
489+
final X509Certificate aReceivedCert = new CertificateDecodeHelper ().source (sReceivedCert)
490+
.pemEncoded (true)
491+
.getDecodedOrNull ();
490492
aResponse.setMDNVerificationCertificate (aReceivedCert);
491493
}
492494
}

phase2-lib/src/test/java/com/helger/phase2/processor/sender/ReadMDNFuncTest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
import com.helger.phase2.util.AS2Helper;
5959
import com.helger.phase2.util.AS2HttpHelper;
6060
import com.helger.phase2.util.AS2ResourceHelper;
61-
import com.helger.security.certificate.CertificateHelper;
61+
import com.helger.security.certificate.CertificateDecodeHelper;
6262

6363
import jakarta.mail.internet.MimeBodyPart;
6464

@@ -67,7 +67,7 @@ public final class ReadMDNFuncTest
6767
@Test
6868
public void testReadMDN02 () throws Exception
6969
{
70-
String sPrefix = "external/mdn/20190925-david";
70+
final String sPrefix = "external/mdn/20190925-david";
7171
final IReadableResource aHeaderRes = new ClassPathResource (sPrefix + ".header");
7272
assertTrue (aHeaderRes.exists ());
7373
final IReadableResource aPayloadRes = new ClassPathResource (sPrefix + ".payload");
@@ -92,8 +92,9 @@ public void testReadMDN02 () throws Exception
9292
assertEquals ("<[email protected]>",
9393
aHeaders.getFirstHeaderValue ("Message-ID"));
9494

95-
final X509Certificate aCert = CertificateHelper.convertStringToCertficateOrNull (StreamHelper.getAllBytesAsString (aCertRes,
96-
StandardCharsets.ISO_8859_1));
95+
final X509Certificate aCert = new CertificateDecodeHelper ().source (StreamHelper.getAllBytes (aCertRes))
96+
.pemEncoded (true)
97+
.getDecodedOrNull ();
9798
assertNotNull (aCert);
9899

99100
final AS2Message aMsg = new AS2Message ();

phase2-partnership-mongodb/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<!-- Include here to not bloat the global scope -->
5555
<properties>
5656
<mongodb-client.version>5.6.2</mongodb-client.version>
57-
<flapdoodle.version>4.21.0</flapdoodle.version>
57+
<flapdoodle.version>4.22.0</flapdoodle.version>
5858
</properties>
5959

6060
<dependencies>

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,15 @@
6969

7070
<properties>
7171
<httpclient.version>5.5.1</httpclient.version>
72-
<log4j.version>2.25.2</log4j.version>
72+
<log4j.version>2.25.3</log4j.version>
7373
</properties>
7474

7575
<dependencyManagement>
7676
<dependencies>
7777
<dependency>
7878
<groupId>com.helger.commons</groupId>
7979
<artifactId>ph-commons-parent-pom</artifactId>
80-
<version>12.1.0</version>
80+
<version>12.1.1</version>
8181
<type>pom</type>
8282
<scope>import</scope>
8383
</dependency>

0 commit comments

Comments
 (0)