This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 2_4_x-fixes
in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git
The following commit(s) were added to refs/heads/2_4_x-fixes by this push:
new 61059ba63 Backport fixes
61059ba63 is described below
commit 61059ba63b936944d62e485d6d062bdeb272c182
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Mon Sep 21 15:57:32 2026 +0100
Backport fixes
---
.../org/apache/wss4j/dom/handler/SignatureConfirmationTest.java | 1 +
.../test/java/org/apache/wss4j/stax/test/HeaderOrderingTest.java | 4 ++--
.../org/apache/wss4j/stax/test/SignatureConfirmationTest.java | 8 ++++----
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureConfirmationTest.java
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureConfirmationTest.java
index 24c991666..d0320a290 100644
---
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureConfirmationTest.java
+++
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureConfirmationTest.java
@@ -20,6 +20,7 @@
package org.apache.wss4j.dom.handler;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Set;
diff --git
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/HeaderOrderingTest.java
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/HeaderOrderingTest.java
index e3be2699e..b9dc55173 100644
---
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/HeaderOrderingTest.java
+++
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/HeaderOrderingTest.java
@@ -601,7 +601,7 @@ public class HeaderOrderingTest extends AbstractTestBase {
@Test
public void
testSignatureConfirmationUsernameTokenTimestampStrictHeaderOrdering() throws
Exception {
- Set<Integer> sigv;
+ Set<String> sigv;
ByteArrayOutputStream baos = new ByteArrayOutputStream();
{
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
@@ -609,7 +609,7 @@ public class HeaderOrderingTest extends AbstractTestBase {
Properties properties = new Properties();
properties.setProperty(WSHandlerConstants.ENABLE_SIGNATURE_CONFIRMATION,
"true");
Map<String, Object> messageContext =
doOutboundSecurityWithWSS4J_1(sourceDocument, action, properties);
- sigv = (Set<Integer>)
messageContext.get(WSHandlerConstants.SEND_SIGV);
+ sigv = (Set<String>)
messageContext.get(WSHandlerConstants.SEND_SIGV);
Document securedDocument = (Document)
messageContext.get(SECURED_DOCUMENT);
//some test that we can really sure we get what we want from WSS4J
diff --git
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureConfirmationTest.java
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureConfirmationTest.java
index 1af06fb65..5c4f72aae 100644
---
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureConfirmationTest.java
+++
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureConfirmationTest.java
@@ -64,7 +64,7 @@ public class SignatureConfirmationTest extends
AbstractTestBase {
@Test
public void testDefaultConfigurationInbound() throws Exception {
- Set<Integer> sigv;
+ Set<String> sigv;
ByteArrayOutputStream baos = new ByteArrayOutputStream();
{
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
@@ -72,7 +72,7 @@ public class SignatureConfirmationTest extends
AbstractTestBase {
Properties properties = new Properties();
properties.setProperty(WSHandlerConstants.ENABLE_SIGNATURE_CONFIRMATION,
"true");
Map<String, Object> messageContext =
doOutboundSecurityWithWSS4J_1(sourceDocument, action, properties);
- sigv = (Set<Integer>)
messageContext.get(WSHandlerConstants.SEND_SIGV);
+ sigv = (Set<String>)
messageContext.get(WSHandlerConstants.SEND_SIGV);
Document securedDocument = (Document)
messageContext.get(SECURED_DOCUMENT);
//some test that we can really sure we get what we want from WSS4J
@@ -160,7 +160,7 @@ public class SignatureConfirmationTest extends
AbstractTestBase {
@Test
public void testDefaultConfigurationInboundUnsignedConfirmation() throws
Exception {
- Set<Integer> sigv;
+ Set<String> sigv;
ByteArrayOutputStream baos = new ByteArrayOutputStream();
{
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
@@ -168,7 +168,7 @@ public class SignatureConfirmationTest extends
AbstractTestBase {
Properties properties = new Properties();
properties.setProperty(WSHandlerConstants.ENABLE_SIGNATURE_CONFIRMATION,
"true");
Map<String, Object> messageContext =
doOutboundSecurityWithWSS4J_1(sourceDocument, action, properties);
- sigv = (Set<Integer>)
messageContext.get(WSHandlerConstants.SEND_SIGV);
+ sigv = (Set<String>)
messageContext.get(WSHandlerConstants.SEND_SIGV);
Document securedDocument = (Document)
messageContext.get(SECURED_DOCUMENT);
//some test that we can really sure we get what we want from WSS4J
