From 87a50e134e8d822e2196459c03666a034b8235d0 Mon Sep 17 00:00:00 2001
From: richard-austin <richard.david.austin@gm>
Date: Sun, 1 Dec 2024 20:36:18 +0000
Subject: [PATCH] * Save work prior to creating new branch

---
 onvif-java/pom.xml                            | 47 ++++++++++++-------
 .../de/onvif/soap/SimpleSecurityHandler.java  | 38 ++++-----------
 onvif-ws-client/pom.xml                       |  6 +--
 pom.xml                                       |  2 +-
 4 files changed, 40 insertions(+), 53 deletions(-)

diff --git a/onvif-java/pom.xml b/onvif-java/pom.xml
index e8ba61f..7a4657c 100644
--- a/onvif-java/pom.xml
+++ b/onvif-java/pom.xml
@@ -20,12 +20,25 @@
 <!--      <groupId>org.apache.cxf</groupId>-->
 <!--      <artifactId>cxf-rt-ws-security</artifactId>-->
 <!--      <version>${cxf.version}</version>-->
+<!--        <exclusions>-->
+<!--            <exclusion>-->
+<!--                <groupId>org.ehcache</groupId>-->
+<!--                <artifactId>ehcache</artifactId>-->
+<!--            </exclusion>-->
+<!--        </exclusions>-->
 <!--    </dependency>-->
-<!--    <dependency>-->
-<!--      <groupId>org.apache.cxf</groupId>-->
-<!--      <artifactId>cxf-rt-transports-http</artifactId>-->
-<!--      <version>${cxf.version}</version>-->
-<!--    </dependency>-->
+    <dependency>
+      <groupId>org.apache.cxf</groupId>
+      <artifactId>cxf-rt-transports-http</artifactId>
+      <version>${cxf.version}</version>
+    </dependency>
+
+      <dependency>
+          <groupId>org.apache.cxf</groupId>
+          <artifactId>cxf-rt-ws-security</artifactId>
+          <version>${cxf.version}</version>
+      </dependency>
+
     <!-- 		<dependency> -->
     <!-- 			<groupId>org.apache.cxf.services.ws-discovery</groupId> -->
     <!-- 			<artifactId>cxf-services-ws-discovery-api</artifactId> -->
@@ -50,18 +63,18 @@
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.14.0</version>
+      <version>2.18.0</version>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
-      <version>1.10</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-      <version>3.4</version>
+      <version>1.17.1</version>
     </dependency>
+      <dependency>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-lang3</artifactId>
+          <version>3.17.0</version>
+      </dependency>
 
 
     <!-- https://mvnrepository.com/artifact/com.sun.xml.messaging.saaj/saaj-impl -->
@@ -132,11 +145,11 @@
       <scope>test</scope>
     </dependency>
 
-      <dependency>
-          <groupId>org.apache.wss4j</groupId>
-          <artifactId>wss4j-ws-security-common</artifactId>
-          <version>3.0.4</version>
-      </dependency>
+<!--      <dependency>-->
+<!--          <groupId>org.apache.wss4j</groupId>-->
+<!--          <artifactId>wss4j-ws-security-common</artifactId>-->
+<!--          <version>3.0.4</version>-->
+<!--      </dependency>-->
 
       <dependency>
           <groupId>jakarta.xml.soap</groupId>
diff --git a/onvif-java/src/main/java/de/onvif/soap/SimpleSecurityHandler.java b/onvif-java/src/main/java/de/onvif/soap/SimpleSecurityHandler.java
index 8ae0fe4..5c78676 100644
--- a/onvif-java/src/main/java/de/onvif/soap/SimpleSecurityHandler.java
+++ b/onvif-java/src/main/java/de/onvif/soap/SimpleSecurityHandler.java
@@ -1,41 +1,19 @@
 package de.onvif.soap;
 
-import static org.apache.wss4j.common.WSS4JConstants.BASE64_ENCODING;
-import static org.apache.wss4j.common.WSS4JConstants.CREATED_LN;
-import static org.apache.wss4j.common.WSS4JConstants.NONCE_LN;
-import static org.apache.wss4j.common.WSS4JConstants.PASSWORD_DIGEST;
-import static org.apache.wss4j.common.WSS4JConstants.PASSWORD_LN;
-import static org.apache.wss4j.common.WSS4JConstants.PASSWORD_TYPE_ATTR;
-import static org.apache.wss4j.common.WSS4JConstants.USERNAME_LN;
-import static org.apache.wss4j.common.WSS4JConstants.USERNAME_TOKEN_LN;
-import static org.apache.wss4j.common.WSS4JConstants.WSSE_LN;
-import static org.apache.wss4j.common.WSS4JConstants.WSSE_NS;
-import static org.apache.wss4j.common.WSS4JConstants.WSSE_PREFIX;
-import static org.apache.wss4j.common.WSS4JConstants.WSU_NS;
-import static org.apache.wss4j.common.WSS4JConstants.WSU_PREFIX;
+import jakarta.xml.soap.*;
+import jakarta.xml.ws.handler.MessageContext;
+import jakarta.xml.ws.handler.soap.SOAPHandler;
+import jakarta.xml.ws.handler.soap.SOAPMessageContext;
+import org.apache.commons.codec.binary.Base64;
 
+import javax.xml.namespace.QName;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-import java.util.Random;
-import java.util.Set;
-import java.util.SimpleTimeZone;
-import java.util.TimeZone;
-import javax.xml.namespace.QName;
-import jakarta.xml.soap.SOAPElement;
-import jakarta.xml.soap.SOAPEnvelope;
-import jakarta.xml.soap.SOAPHeader;
-import jakarta.xml.soap.SOAPMessage;
-import jakarta.xml.soap.SOAPPart;
-import jakarta.xml.ws.handler.MessageContext;
-import jakarta.xml.ws.handler.soap.SOAPHandler;
-import jakarta.xml.ws.handler.soap.SOAPMessageContext;
+import java.util.*;
 
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.codec.digest.MessageDigestAlgorithms;
+import static org.apache.wss4j.common.WSS4JConstants.*;
 
 /*
  Utility class to add user/password onvif credentials to SOAP communications
diff --git a/onvif-ws-client/pom.xml b/onvif-ws-client/pom.xml
index 9805a8c..531ac24 100644
--- a/onvif-ws-client/pom.xml
+++ b/onvif-ws-client/pom.xml
@@ -67,11 +67,7 @@
 <!--      <artifactId>cxf-rt-frontend-jaxws</artifactId>-->
 <!--      <version>${cxf.version}</version>-->
 <!--    </dependency>-->
-<!--    <dependency>-->
-<!--      <groupId>org.apache.cxf</groupId>-->
-<!--      <artifactId>cxf-rt-ws-security</artifactId>-->
-<!--      <version>${cxf.version}</version>-->
-<!--    </dependency>-->
+
 <!--    <dependency>-->
 <!--      <groupId>org.apache.cxf</groupId>-->
 <!--      <artifactId>cxf-rt-transports-http</artifactId>-->
diff --git a/pom.xml b/pom.xml
index cbc2edc..fe35e7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <properties>
     <java.version>21</java.version>
-    <cxf.version>4.0.0</cxf.version>
+    <cxf.version>4.0.5</cxf.version>
     <checkstyle-maven-plugin.version>3.0.0</checkstyle-maven-plugin.version>
     <javax.activation.version>1.2.0</javax.activation.version>
     <jaxb.api.version>2.3.1</jaxb.api.version>         <!-- 2.3.0,  2.3.1 or 2.4.0-b180830.0359 -->