diff --git a/onvif-java/pom.xml b/onvif-java/pom.xml
index 85c76c0..5056681 100644
--- a/onvif-java/pom.xml
+++ b/onvif-java/pom.xml
@@ -17,12 +17,6 @@
           <version>${cxf.version}</version>
       </dependency>
 
-      <dependency>
-          <groupId>org.apache.activemq</groupId>
-          <artifactId>activemq-broker</artifactId>
-          <version>6.1.4</version>
-      </dependency>
-
     <dependency>
       <groupId>org.onvif</groupId>
       <artifactId>onvif-ws-client</artifactId>
diff --git a/onvif-ws-client/pom.xml b/onvif-ws-client/pom.xml
index 8154053..014e711 100644
--- a/onvif-ws-client/pom.xml
+++ b/onvif-ws-client/pom.xml
@@ -15,11 +15,6 @@
       <artifactId>cxf-rt-frontend-jaxws</artifactId>
       <version>${cxf.version}</version>
     </dependency>
-    <!-- <dependency> -->
-    <!-- <groupId>org.apache.cxf</groupId> -->
-    <!-- <artifactId>cxf-rt-transports-http-hc</artifactId> -->
-    <!-- <version>${cxf.version}</version> -->
-    <!-- </dependency> -->
     <dependency>
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-rt-transports-http-jetty</artifactId>
@@ -51,7 +46,7 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
-      <version>3.8.1</version>
+      <version>3.17.0</version>
       <scope>compile</scope>
     </dependency>
 
@@ -70,17 +65,16 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model-builder</artifactId>
-      <version>3.6.1</version>
+      <version>3.9.9</version>
     </dependency>
 
-
   </dependencies>
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-codegen-plugin</artifactId>
-        <version>4.0.1</version>
+        <version>4.0.5</version>
         <executions>
           <execution>
             <id>generate-ws-stubs</id>
@@ -141,34 +135,6 @@
             <artifactId>maven-model-builder</artifactId>
             <version>3.9.9</version>
           </dependency>
-          <!-- for java 10+ -->
-          <dependency>
-            <groupId>com.sun.activation</groupId>
-            <artifactId>javax.activation</artifactId>
-            <version>${javax.activation.version}</version>
-          </dependency>
-
-          <dependency>
-            <groupId>jakarta.xml.bind</groupId>
-            <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>4.0.2</version>
-          </dependency>
-          <dependency>
-            <groupId>jakarta.annotation</groupId>
-            <artifactId>jakarta.annotation-api</artifactId>
-            <version>3.0.0</version>
-          </dependency>
-
-          <dependency>
-            <groupId>javax.xml.ws</groupId>
-            <artifactId>jaxws-api</artifactId>
-            <version>2.3.0</version>
-          </dependency>
-          <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>activation</artifactId>
-            <version>1.1.1</version>
-          </dependency>
         </dependencies>
       </plugin>
     </plugins>
diff --git a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/InvalidFilterFault.java b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/InvalidFilterFault.java
index 704177b..d9476e5 100644
--- a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/InvalidFilterFault.java
+++ b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/InvalidFilterFault.java
@@ -5,8 +5,8 @@ import jakarta.xml.ws.WebFault;
 
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  */
 
 @WebFault(name = "InvalidFilterFault", targetNamespace = "http://docs.oasis-open.org/wsn/b-2")
diff --git a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/InvalidMessageContentExpressionFault.java b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/InvalidMessageContentExpressionFault.java
index f272254..0124a1e 100644
--- a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/InvalidMessageContentExpressionFault.java
+++ b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/InvalidMessageContentExpressionFault.java
@@ -5,8 +5,8 @@ import jakarta.xml.ws.WebFault;
 
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  */
 
 @WebFault(name = "InvalidMessageContentExpressionFault", targetNamespace = "http://docs.oasis-open.org/wsn/b-2")
diff --git a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/InvalidProducerPropertiesExpressionFault.java b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/InvalidProducerPropertiesExpressionFault.java
index 34827cf..fa0a5e1 100644
--- a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/InvalidProducerPropertiesExpressionFault.java
+++ b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/InvalidProducerPropertiesExpressionFault.java
@@ -5,8 +5,8 @@ import jakarta.xml.ws.WebFault;
 
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  */
 
 @WebFault(name = "InvalidProducerPropertiesExpressionFault", targetNamespace = "http://docs.oasis-open.org/wsn/b-2")
diff --git a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/InvalidTopicExpressionFault.java b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/InvalidTopicExpressionFault.java
index df7a014..f2d8f40 100644
--- a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/InvalidTopicExpressionFault.java
+++ b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/InvalidTopicExpressionFault.java
@@ -5,8 +5,8 @@ import jakarta.xml.ws.WebFault;
 
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  */
 
 @WebFault(name = "InvalidTopicExpressionFault", targetNamespace = "http://docs.oasis-open.org/wsn/b-2")
diff --git a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/NotifyMessageNotSupportedFault.java b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/NotifyMessageNotSupportedFault.java
index 247e3bf..18f75ac 100644
--- a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/NotifyMessageNotSupportedFault.java
+++ b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/NotifyMessageNotSupportedFault.java
@@ -5,8 +5,8 @@ import jakarta.xml.ws.WebFault;
 
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  */
 
 @WebFault(name = "NotifyMessageNotSupportedFault", targetNamespace = "http://docs.oasis-open.org/wsn/b-2")
diff --git a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/SubscribeCreationFailedFault.java b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/SubscribeCreationFailedFault.java
index 4e16e7a..fc1a6e9 100644
--- a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/SubscribeCreationFailedFault.java
+++ b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/SubscribeCreationFailedFault.java
@@ -5,8 +5,8 @@ import jakarta.xml.ws.WebFault;
 
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  */
 
 @WebFault(name = "SubscribeCreationFailedFault", targetNamespace = "http://docs.oasis-open.org/wsn/b-2")
diff --git a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/TopicExpressionDialectUnknownFault.java b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/TopicExpressionDialectUnknownFault.java
index d5626bc..71a88c7 100644
--- a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/TopicExpressionDialectUnknownFault.java
+++ b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/TopicExpressionDialectUnknownFault.java
@@ -5,8 +5,8 @@ import jakarta.xml.ws.WebFault;
 
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  */
 
 @WebFault(name = "TopicExpressionDialectUnknownFault", targetNamespace = "http://docs.oasis-open.org/wsn/b-2")
diff --git a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/TopicNotSupportedFault.java b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/TopicNotSupportedFault.java
index 38b5a15..b0a0571 100644
--- a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/TopicNotSupportedFault.java
+++ b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/TopicNotSupportedFault.java
@@ -5,8 +5,8 @@ import jakarta.xml.ws.WebFault;
 
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  */
 
 @WebFault(name = "TopicNotSupportedFault", targetNamespace = "http://docs.oasis-open.org/wsn/b-2")
diff --git a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/UnacceptableInitialTerminationTimeFault.java b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/UnacceptableInitialTerminationTimeFault.java
index 7148790..34ea7a3 100644
--- a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/UnacceptableInitialTerminationTimeFault.java
+++ b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/UnacceptableInitialTerminationTimeFault.java
@@ -5,8 +5,8 @@ import jakarta.xml.ws.WebFault;
 
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  */
 
 @WebFault(name = "UnacceptableInitialTerminationTimeFault", targetNamespace = "http://docs.oasis-open.org/wsn/b-2")
diff --git a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/UnrecognizedPolicyRequestFault.java b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/UnrecognizedPolicyRequestFault.java
index 926cfc9..4a8f81e 100644
--- a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/UnrecognizedPolicyRequestFault.java
+++ b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/UnrecognizedPolicyRequestFault.java
@@ -5,8 +5,8 @@ import jakarta.xml.ws.WebFault;
 
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  */
 
 @WebFault(name = "UnrecognizedPolicyRequestFault", targetNamespace = "http://docs.oasis-open.org/wsn/b-2")
diff --git a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/UnsupportedPolicyRequestFault.java b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/UnsupportedPolicyRequestFault.java
index a94e92f..747fd0f 100644
--- a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/UnsupportedPolicyRequestFault.java
+++ b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/UnsupportedPolicyRequestFault.java
@@ -5,8 +5,8 @@ import jakarta.xml.ws.WebFault;
 
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  */
 
 @WebFault(name = "UnsupportedPolicyRequestFault", targetNamespace = "http://docs.oasis-open.org/wsn/b-2")
diff --git a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsrf/rw_2/ResourceUnknownFault.java b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsrf/rw_2/ResourceUnknownFault.java
index e29be4a..5ce8181 100644
--- a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsrf/rw_2/ResourceUnknownFault.java
+++ b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsrf/rw_2/ResourceUnknownFault.java
@@ -5,8 +5,8 @@ import jakarta.xml.ws.WebFault;
 
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  */
 
 public class ResourceUnknownFault extends Exception {
diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/accesscontrol/wsdl/PACSPort.java b/onvif-ws-client/src/main/java/org/onvif/ver10/accesscontrol/wsdl/PACSPort.java
index d97b8b6..cdbea88 100644
--- a/onvif-ws-client/src/main/java/org/onvif/ver10/accesscontrol/wsdl/PACSPort.java
+++ b/onvif-ws-client/src/main/java/org/onvif/ver10/accesscontrol/wsdl/PACSPort.java
@@ -9,8 +9,8 @@ import jakarta.xml.ws.RequestWrapper;
 import jakarta.xml.ws.ResponseWrapper;
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  *
  */
 @WebService(targetNamespace = "http://www.onvif.org/ver10/accesscontrol/wsdl", name = "PACSPort")
diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/accesscontrol/wsdl/PACSService.java b/onvif-ws-client/src/main/java/org/onvif/ver10/accesscontrol/wsdl/PACSService.java
index efb3fc6..f22ca86 100644
--- a/onvif-ws-client/src/main/java/org/onvif/ver10/accesscontrol/wsdl/PACSService.java
+++ b/onvif-ws-client/src/main/java/org/onvif/ver10/accesscontrol/wsdl/PACSService.java
@@ -1,5 +1,6 @@
 package org.onvif.ver10.accesscontrol.wsdl;
 
+import java.net.URI;
 import java.net.URL;
 import javax.xml.namespace.QName;
 import jakarta.xml.ws.WebEndpoint;
@@ -8,8 +9,8 @@ import jakarta.xml.ws.WebServiceFeature;
 import jakarta.xml.ws.Service;
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  *
  */
 @WebServiceClient(name = "PACSService",
@@ -17,10 +18,10 @@ import jakarta.xml.ws.Service;
                   targetNamespace = "http://www.onvif.org/ver10/accesscontrol/wsdl")
 public class PACSService extends Service {
 
-    public final static URL WSDL_LOCATION;
+    public static final URL WSDL_LOCATION;
 
-    public final static QName SERVICE = new QName("http://www.onvif.org/ver10/accesscontrol/wsdl", "PACSService");
-    public final static QName PACSPort = new QName("http://www.onvif.org/ver10/accesscontrol/wsdl", "PACSPort");
+    public static final QName SERVICE = new QName("http://www.onvif.org/ver10/accesscontrol/wsdl", "PACSService");
+    public static final QName PACSPort = new QName("http://www.onvif.org/ver10/accesscontrol/wsdl", "PACSPort");
     static {
         WSDL_LOCATION = null;
     }
diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/accessrules/wsdl/AccessRulesPort.java b/onvif-ws-client/src/main/java/org/onvif/ver10/accessrules/wsdl/AccessRulesPort.java
index a1a0182..d95fc1c 100644
--- a/onvif-ws-client/src/main/java/org/onvif/ver10/accessrules/wsdl/AccessRulesPort.java
+++ b/onvif-ws-client/src/main/java/org/onvif/ver10/accessrules/wsdl/AccessRulesPort.java
@@ -9,8 +9,8 @@ import jakarta.xml.ws.RequestWrapper;
 import jakarta.xml.ws.ResponseWrapper;
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  *
  */
 @WebService(targetNamespace = "http://www.onvif.org/ver10/accessrules/wsdl", name = "AccessRulesPort")
diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/accessrules/wsdl/AccessRulesService.java b/onvif-ws-client/src/main/java/org/onvif/ver10/accessrules/wsdl/AccessRulesService.java
index 2ad0362..db1719d 100644
--- a/onvif-ws-client/src/main/java/org/onvif/ver10/accessrules/wsdl/AccessRulesService.java
+++ b/onvif-ws-client/src/main/java/org/onvif/ver10/accessrules/wsdl/AccessRulesService.java
@@ -1,5 +1,6 @@
 package org.onvif.ver10.accessrules.wsdl;
 
+import java.net.URI;
 import java.net.URL;
 import javax.xml.namespace.QName;
 import jakarta.xml.ws.WebEndpoint;
@@ -8,8 +9,8 @@ import jakarta.xml.ws.WebServiceFeature;
 import jakarta.xml.ws.Service;
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  *
  */
 @WebServiceClient(name = "AccessRulesService",
@@ -17,10 +18,10 @@ import jakarta.xml.ws.Service;
                   targetNamespace = "http://www.onvif.org/ver10/accessrules/wsdl")
 public class AccessRulesService extends Service {
 
-    public final static URL WSDL_LOCATION;
+    public static final URL WSDL_LOCATION;
 
-    public final static QName SERVICE = new QName("http://www.onvif.org/ver10/accessrules/wsdl", "AccessRulesService");
-    public final static QName AccessRulesPort = new QName("http://www.onvif.org/ver10/accessrules/wsdl", "AccessRulesPort");
+    public static final QName SERVICE = new QName("http://www.onvif.org/ver10/accessrules/wsdl", "AccessRulesService");
+    public static final QName AccessRulesPort = new QName("http://www.onvif.org/ver10/accessrules/wsdl", "AccessRulesPort");
     static {
         WSDL_LOCATION = null;
     }
diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/advancedsecurity/wsdl/AdvancedSecurityService.java b/onvif-ws-client/src/main/java/org/onvif/ver10/advancedsecurity/wsdl/AdvancedSecurityService.java
index b5e6fc5..417ce1b 100644
--- a/onvif-ws-client/src/main/java/org/onvif/ver10/advancedsecurity/wsdl/AdvancedSecurityService.java
+++ b/onvif-ws-client/src/main/java/org/onvif/ver10/advancedsecurity/wsdl/AdvancedSecurityService.java
@@ -11,8 +11,8 @@ import jakarta.xml.ws.ResponseWrapper;
  * Common functionality for all advanced security service parts.
  *     
  *
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  *
  */
 @WebService(targetNamespace = "http://www.onvif.org/ver10/advancedsecurity/wsdl", name = "AdvancedSecurityService")
diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/advancedsecurity/wsdl/AdvancedSecurityService_Service.java b/onvif-ws-client/src/main/java/org/onvif/ver10/advancedsecurity/wsdl/AdvancedSecurityService_Service.java
index f94a756..aa1ef17 100644
--- a/onvif-ws-client/src/main/java/org/onvif/ver10/advancedsecurity/wsdl/AdvancedSecurityService_Service.java
+++ b/onvif-ws-client/src/main/java/org/onvif/ver10/advancedsecurity/wsdl/AdvancedSecurityService_Service.java
@@ -1,5 +1,6 @@
 package org.onvif.ver10.advancedsecurity.wsdl;
 
+import java.net.URI;
 import java.net.URL;
 import javax.xml.namespace.QName;
 import jakarta.xml.ws.WebEndpoint;
@@ -8,8 +9,8 @@ import jakarta.xml.ws.WebServiceFeature;
 import jakarta.xml.ws.Service;
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  *
  */
 @WebServiceClient(name = "AdvancedSecurityService",
@@ -17,12 +18,12 @@ import jakarta.xml.ws.Service;
                   targetNamespace = "http://www.onvif.org/ver10/advancedsecurity/wsdl")
 public class AdvancedSecurityService_Service extends Service {
 
-    public final static URL WSDL_LOCATION;
+    public static final URL WSDL_LOCATION;
 
-    public final static QName SERVICE = new QName("http://www.onvif.org/ver10/advancedsecurity/wsdl", "AdvancedSecurityService");
-    public final static QName TLSServerPort = new QName("http://www.onvif.org/ver10/advancedsecurity/wsdl", "TLSServerPort");
-    public final static QName KeystorePort = new QName("http://www.onvif.org/ver10/advancedsecurity/wsdl", "KeystorePort");
-    public final static QName AdvancedSecurityServicePort = new QName("http://www.onvif.org/ver10/advancedsecurity/wsdl", "AdvancedSecurityServicePort");
+    public static final QName SERVICE = new QName("http://www.onvif.org/ver10/advancedsecurity/wsdl", "AdvancedSecurityService");
+    public static final QName TLSServerPort = new QName("http://www.onvif.org/ver10/advancedsecurity/wsdl", "TLSServerPort");
+    public static final QName KeystorePort = new QName("http://www.onvif.org/ver10/advancedsecurity/wsdl", "KeystorePort");
+    public static final QName AdvancedSecurityServicePort = new QName("http://www.onvif.org/ver10/advancedsecurity/wsdl", "AdvancedSecurityServicePort");
     static {
         WSDL_LOCATION = null;
     }
diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/advancedsecurity/wsdl/Keystore.java b/onvif-ws-client/src/main/java/org/onvif/ver10/advancedsecurity/wsdl/Keystore.java
index 24a8820..3602e93 100644
--- a/onvif-ws-client/src/main/java/org/onvif/ver10/advancedsecurity/wsdl/Keystore.java
+++ b/onvif-ws-client/src/main/java/org/onvif/ver10/advancedsecurity/wsdl/Keystore.java
@@ -11,8 +11,8 @@ import jakarta.xml.ws.ResponseWrapper;
 /**
  * Basic keystore functionality.
  *
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  *
  */
 @WebService(targetNamespace = "http://www.onvif.org/ver10/advancedsecurity/wsdl", name = "Keystore")
diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/advancedsecurity/wsdl/TLSServer.java b/onvif-ws-client/src/main/java/org/onvif/ver10/advancedsecurity/wsdl/TLSServer.java
index cf39750..e33f900 100644
--- a/onvif-ws-client/src/main/java/org/onvif/ver10/advancedsecurity/wsdl/TLSServer.java
+++ b/onvif-ws-client/src/main/java/org/onvif/ver10/advancedsecurity/wsdl/TLSServer.java
@@ -11,8 +11,8 @@ import jakarta.xml.ws.ResponseWrapper;
 /**
  * TLS server functionality.
  *
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  *
  */
 @WebService(targetNamespace = "http://www.onvif.org/ver10/advancedsecurity/wsdl", name = "TLSServer")
diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/device/wsdl/Device.java b/onvif-ws-client/src/main/java/org/onvif/ver10/device/wsdl/Device.java
index cc22d64..ddc5585 100644
--- a/onvif-ws-client/src/main/java/org/onvif/ver10/device/wsdl/Device.java
+++ b/onvif-ws-client/src/main/java/org/onvif/ver10/device/wsdl/Device.java
@@ -10,8 +10,8 @@ import jakarta.xml.ws.RequestWrapper;
 import jakarta.xml.ws.ResponseWrapper;
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  *
  */
 @WebService(targetNamespace = "http://www.onvif.org/ver10/device/wsdl", name = "Device")
diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/device/wsdl/DeviceService.java b/onvif-ws-client/src/main/java/org/onvif/ver10/device/wsdl/DeviceService.java
index 6af4aaf..f22ce3e 100644
--- a/onvif-ws-client/src/main/java/org/onvif/ver10/device/wsdl/DeviceService.java
+++ b/onvif-ws-client/src/main/java/org/onvif/ver10/device/wsdl/DeviceService.java
@@ -1,5 +1,6 @@
 package org.onvif.ver10.device.wsdl;
 
+import java.net.URI;
 import java.net.URL;
 import javax.xml.namespace.QName;
 import jakarta.xml.ws.WebEndpoint;
@@ -7,8 +8,8 @@ import jakarta.xml.ws.WebServiceClient;
 import jakarta.xml.ws.WebServiceFeature;
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  *
  */
 @WebServiceClient(name = "DeviceService",
@@ -16,10 +17,10 @@ import jakarta.xml.ws.WebServiceFeature;
                   targetNamespace = "http://www.onvif.org/ver10/device/wsdl")
 public class DeviceService extends jakarta.xml.ws.Service {
 
-    public final static URL WSDL_LOCATION;
+    public static final URL WSDL_LOCATION;
 
-    public final static QName SERVICE = new QName("http://www.onvif.org/ver10/device/wsdl", "DeviceService");
-    public final static QName DevicePort = new QName("http://www.onvif.org/ver10/device/wsdl", "DevicePort");
+    public static final QName SERVICE = new QName("http://www.onvif.org/ver10/device/wsdl", "DeviceService");
+    public static final QName DevicePort = new QName("http://www.onvif.org/ver10/device/wsdl", "DevicePort");
     static {
         WSDL_LOCATION = null;
     }
diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/deviceio/wsdl/DeviceIOPService.java b/onvif-ws-client/src/main/java/org/onvif/ver10/deviceio/wsdl/DeviceIOPService.java
index 28cc5f5..9e79f4b 100644
--- a/onvif-ws-client/src/main/java/org/onvif/ver10/deviceio/wsdl/DeviceIOPService.java
+++ b/onvif-ws-client/src/main/java/org/onvif/ver10/deviceio/wsdl/DeviceIOPService.java
@@ -1,5 +1,6 @@
 package org.onvif.ver10.deviceio.wsdl;
 
+import java.net.URI;
 import java.net.URL;
 import javax.xml.namespace.QName;
 import jakarta.xml.ws.WebEndpoint;
@@ -8,8 +9,8 @@ import jakarta.xml.ws.WebServiceFeature;
 import jakarta.xml.ws.Service;
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  *
  */
 @WebServiceClient(name = "DeviceIOPService",
@@ -17,10 +18,10 @@ import jakarta.xml.ws.Service;
                   targetNamespace = "http://www.onvif.org/ver10/deviceIO/wsdl")
 public class DeviceIOPService extends Service {
 
-    public final static URL WSDL_LOCATION;
+    public static final URL WSDL_LOCATION;
 
-    public final static QName SERVICE = new QName("http://www.onvif.org/ver10/deviceIO/wsdl", "DeviceIOPService");
-    public final static QName DeviceIOPort = new QName("http://www.onvif.org/ver10/deviceIO/wsdl", "DeviceIOPort");
+    public static final QName SERVICE = new QName("http://www.onvif.org/ver10/deviceIO/wsdl", "DeviceIOPService");
+    public static final QName DeviceIOPort = new QName("http://www.onvif.org/ver10/deviceIO/wsdl", "DeviceIOPort");
     static {
         WSDL_LOCATION = null;
     }
diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/deviceio/wsdl/DeviceIOPort.java b/onvif-ws-client/src/main/java/org/onvif/ver10/deviceio/wsdl/DeviceIOPort.java
index 0ee5838..a8bef8a 100644
--- a/onvif-ws-client/src/main/java/org/onvif/ver10/deviceio/wsdl/DeviceIOPort.java
+++ b/onvif-ws-client/src/main/java/org/onvif/ver10/deviceio/wsdl/DeviceIOPort.java
@@ -10,8 +10,8 @@ import jakarta.xml.ws.RequestWrapper;
 import jakarta.xml.ws.ResponseWrapper;
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  *
  */
 @WebService(targetNamespace = "http://www.onvif.org/ver10/deviceIO/wsdl", name = "DeviceIOPort")
diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/display/wsdl/DisplayPort.java b/onvif-ws-client/src/main/java/org/onvif/ver10/display/wsdl/DisplayPort.java
index ac8622f..1bcbfa8 100644
--- a/onvif-ws-client/src/main/java/org/onvif/ver10/display/wsdl/DisplayPort.java
+++ b/onvif-ws-client/src/main/java/org/onvif/ver10/display/wsdl/DisplayPort.java
@@ -10,8 +10,8 @@ import jakarta.xml.ws.RequestWrapper;
 import jakarta.xml.ws.ResponseWrapper;
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  *
  */
 @WebService(targetNamespace = "http://www.onvif.org/ver10/display/wsdl", name = "DisplayPort")
diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/display/wsdl/DisplayService.java b/onvif-ws-client/src/main/java/org/onvif/ver10/display/wsdl/DisplayService.java
index 0fec40c..59e8b00 100644
--- a/onvif-ws-client/src/main/java/org/onvif/ver10/display/wsdl/DisplayService.java
+++ b/onvif-ws-client/src/main/java/org/onvif/ver10/display/wsdl/DisplayService.java
@@ -1,5 +1,6 @@
 package org.onvif.ver10.display.wsdl;
 
+import java.net.URI;
 import java.net.URL;
 import javax.xml.namespace.QName;
 import jakarta.xml.ws.WebEndpoint;
@@ -8,8 +9,8 @@ import jakarta.xml.ws.WebServiceFeature;
 import jakarta.xml.ws.Service;
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  *
  */
 @WebServiceClient(name = "DisplayService",
@@ -17,10 +18,10 @@ import jakarta.xml.ws.Service;
                   targetNamespace = "http://www.onvif.org/ver10/display/wsdl")
 public class DisplayService extends Service {
 
-    public final static URL WSDL_LOCATION;
+    public static final URL WSDL_LOCATION;
 
-    public final static QName SERVICE = new QName("http://www.onvif.org/ver10/display/wsdl", "DisplayService");
-    public final static QName DisplayPort = new QName("http://www.onvif.org/ver10/display/wsdl", "DisplayPort");
+    public static final QName SERVICE = new QName("http://www.onvif.org/ver10/display/wsdl", "DisplayService");
+    public static final QName DisplayPort = new QName("http://www.onvif.org/ver10/display/wsdl", "DisplayPort");
     static {
         WSDL_LOCATION = null;
     }
diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/doorcontrol/wsdl/DoorControlPort.java b/onvif-ws-client/src/main/java/org/onvif/ver10/doorcontrol/wsdl/DoorControlPort.java
index 04ffd1e..61edb9c 100644
--- a/onvif-ws-client/src/main/java/org/onvif/ver10/doorcontrol/wsdl/DoorControlPort.java
+++ b/onvif-ws-client/src/main/java/org/onvif/ver10/doorcontrol/wsdl/DoorControlPort.java
@@ -9,8 +9,8 @@ import jakarta.xml.ws.RequestWrapper;
 import jakarta.xml.ws.ResponseWrapper;
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  *
  */
 @WebService(targetNamespace = "http://www.onvif.org/ver10/doorcontrol/wsdl", name = "DoorControlPort")
diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/doorcontrol/wsdl/DoorControlService.java b/onvif-ws-client/src/main/java/org/onvif/ver10/doorcontrol/wsdl/DoorControlService.java
index ed9a92f..e981d8b 100644
--- a/onvif-ws-client/src/main/java/org/onvif/ver10/doorcontrol/wsdl/DoorControlService.java
+++ b/onvif-ws-client/src/main/java/org/onvif/ver10/doorcontrol/wsdl/DoorControlService.java
@@ -1,5 +1,6 @@
 package org.onvif.ver10.doorcontrol.wsdl;
 
+import java.net.URI;
 import java.net.URL;
 import javax.xml.namespace.QName;
 import jakarta.xml.ws.WebEndpoint;
@@ -8,8 +9,8 @@ import jakarta.xml.ws.WebServiceFeature;
 import jakarta.xml.ws.Service;
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  *
  */
 @WebServiceClient(name = "DoorControlService",
@@ -17,10 +18,10 @@ import jakarta.xml.ws.Service;
                   targetNamespace = "http://www.onvif.org/ver10/doorcontrol/wsdl")
 public class DoorControlService extends Service {
 
-    public final static URL WSDL_LOCATION;
+    public static final URL WSDL_LOCATION;
 
-    public final static QName SERVICE = new QName("http://www.onvif.org/ver10/doorcontrol/wsdl", "DoorControlService");
-    public final static QName DoorControlPort = new QName("http://www.onvif.org/ver10/doorcontrol/wsdl", "DoorControlPort");
+    public static final QName SERVICE = new QName("http://www.onvif.org/ver10/doorcontrol/wsdl", "DoorControlService");
+    public static final QName DoorControlPort = new QName("http://www.onvif.org/ver10/doorcontrol/wsdl", "DoorControlPort");
     static {
         WSDL_LOCATION = null;
     }
diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/events/wsdl/EventPortType.java b/onvif-ws-client/src/main/java/org/onvif/ver10/events/wsdl/EventPortType.java
index 55c6642..230ba2c 100644
--- a/onvif-ws-client/src/main/java/org/onvif/ver10/events/wsdl/EventPortType.java
+++ b/onvif-ws-client/src/main/java/org/onvif/ver10/events/wsdl/EventPortType.java
@@ -11,8 +11,8 @@ import jakarta.xml.ws.RequestWrapper;
 import jakarta.xml.ws.ResponseWrapper;
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  *
  */
 @WebService(targetNamespace = "http://www.onvif.org/ver10/events/wsdl", name = "EventPortType")
diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/events/wsdl/EventService.java b/onvif-ws-client/src/main/java/org/onvif/ver10/events/wsdl/EventService.java
index 012b740..ad75c06 100644
--- a/onvif-ws-client/src/main/java/org/onvif/ver10/events/wsdl/EventService.java
+++ b/onvif-ws-client/src/main/java/org/onvif/ver10/events/wsdl/EventService.java
@@ -1,5 +1,6 @@
 package org.onvif.ver10.events.wsdl;
 
+import java.net.URI;
 import java.net.URL;
 import javax.xml.namespace.QName;
 import jakarta.xml.ws.WebEndpoint;
@@ -8,8 +9,8 @@ import jakarta.xml.ws.WebServiceFeature;
 import jakarta.xml.ws.Service;
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  *
  */
 @WebServiceClient(name = "EventService",
@@ -17,10 +18,10 @@ import jakarta.xml.ws.Service;
                   targetNamespace = "http://www.onvif.org/ver10/events/wsdl")
 public class EventService extends Service {
 
-    public final static URL WSDL_LOCATION;
+    public static final URL WSDL_LOCATION;
 
-    public final static QName SERVICE = new QName("http://www.onvif.org/ver10/events/wsdl", "EventService");
-    public final static QName EventPort = new QName("http://www.onvif.org/ver10/events/wsdl", "EventPort");
+    public static final QName SERVICE = new QName("http://www.onvif.org/ver10/events/wsdl", "EventService");
+    public static final QName EventPort = new QName("http://www.onvif.org/ver10/events/wsdl", "EventPort");
     static {
         WSDL_LOCATION = null;
     }
diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/media/wsdl/Media.java b/onvif-ws-client/src/main/java/org/onvif/ver10/media/wsdl/Media.java
index f43ca5a..5200ff3 100644
--- a/onvif-ws-client/src/main/java/org/onvif/ver10/media/wsdl/Media.java
+++ b/onvif-ws-client/src/main/java/org/onvif/ver10/media/wsdl/Media.java
@@ -10,8 +10,8 @@ import jakarta.xml.ws.RequestWrapper;
 import jakarta.xml.ws.ResponseWrapper;
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  *
  */
 @WebService(targetNamespace = "http://www.onvif.org/ver10/media/wsdl", name = "Media")
diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/media/wsdl/MediaService.java b/onvif-ws-client/src/main/java/org/onvif/ver10/media/wsdl/MediaService.java
index a2c2ccf..755dc99 100644
--- a/onvif-ws-client/src/main/java/org/onvif/ver10/media/wsdl/MediaService.java
+++ b/onvif-ws-client/src/main/java/org/onvif/ver10/media/wsdl/MediaService.java
@@ -1,5 +1,6 @@
 package org.onvif.ver10.media.wsdl;
 
+import java.net.URI;
 import java.net.URL;
 import javax.xml.namespace.QName;
 import jakarta.xml.ws.WebEndpoint;
@@ -8,8 +9,8 @@ import jakarta.xml.ws.WebServiceFeature;
 import jakarta.xml.ws.Service;
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  *
  */
 @WebServiceClient(name = "MediaService",
@@ -17,10 +18,10 @@ import jakarta.xml.ws.Service;
                   targetNamespace = "http://www.onvif.org/ver10/media/wsdl")
 public class MediaService extends Service {
 
-    public final static URL WSDL_LOCATION;
+    public static final URL WSDL_LOCATION;
 
-    public final static QName SERVICE = new QName("http://www.onvif.org/ver10/media/wsdl", "MediaService");
-    public final static QName MediaPort = new QName("http://www.onvif.org/ver10/media/wsdl", "MediaPort");
+    public static final QName SERVICE = new QName("http://www.onvif.org/ver10/media/wsdl", "MediaService");
+    public static final QName MediaPort = new QName("http://www.onvif.org/ver10/media/wsdl", "MediaPort");
     static {
         WSDL_LOCATION = null;
     }
diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/network/wsdl/DiscoveryLookupPort.java b/onvif-ws-client/src/main/java/org/onvif/ver10/network/wsdl/DiscoveryLookupPort.java
index 192d48f..a9df5b0 100644
--- a/onvif-ws-client/src/main/java/org/onvif/ver10/network/wsdl/DiscoveryLookupPort.java
+++ b/onvif-ws-client/src/main/java/org/onvif/ver10/network/wsdl/DiscoveryLookupPort.java
@@ -8,8 +8,8 @@ import jakarta.jws.soap.SOAPBinding;
 import jakarta.xml.bind.annotation.XmlSeeAlso;
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  *
  */
 @WebService(targetNamespace = "http://www.onvif.org/ver10/network/wsdl", name = "DiscoveryLookupPort")
diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/network/wsdl/DiscoveryService.java b/onvif-ws-client/src/main/java/org/onvif/ver10/network/wsdl/DiscoveryService.java
index 4a639c7..b007e92 100644
--- a/onvif-ws-client/src/main/java/org/onvif/ver10/network/wsdl/DiscoveryService.java
+++ b/onvif-ws-client/src/main/java/org/onvif/ver10/network/wsdl/DiscoveryService.java
@@ -1,5 +1,6 @@
 package org.onvif.ver10.network.wsdl;
 
+import java.net.URI;
 import java.net.URL;
 import javax.xml.namespace.QName;
 import jakarta.xml.ws.WebEndpoint;
@@ -8,8 +9,8 @@ import jakarta.xml.ws.WebServiceFeature;
 import jakarta.xml.ws.Service;
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  *
  */
 @WebServiceClient(name = "DiscoveryService",
@@ -17,11 +18,11 @@ import jakarta.xml.ws.Service;
                   targetNamespace = "http://www.onvif.org/ver10/network/wsdl")
 public class DiscoveryService extends Service {
 
-    public final static URL WSDL_LOCATION;
+    public static final URL WSDL_LOCATION;
 
-    public final static QName SERVICE = new QName("http://www.onvif.org/ver10/network/wsdl", "DiscoveryService");
-    public final static QName RemoteDiscoveryPort = new QName("http://www.onvif.org/ver10/network/wsdl", "RemoteDiscoveryPort");
-    public final static QName DiscoveryLookupPort = new QName("http://www.onvif.org/ver10/network/wsdl", "DiscoveryLookupPort");
+    public static final QName SERVICE = new QName("http://www.onvif.org/ver10/network/wsdl", "DiscoveryService");
+    public static final QName RemoteDiscoveryPort = new QName("http://www.onvif.org/ver10/network/wsdl", "RemoteDiscoveryPort");
+    public static final QName DiscoveryLookupPort = new QName("http://www.onvif.org/ver10/network/wsdl", "DiscoveryLookupPort");
     static {
         WSDL_LOCATION = null;
     }
diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/network/wsdl/RemoteDiscoveryPort.java b/onvif-ws-client/src/main/java/org/onvif/ver10/network/wsdl/RemoteDiscoveryPort.java
index 4bf3a25..5424a72 100644
--- a/onvif-ws-client/src/main/java/org/onvif/ver10/network/wsdl/RemoteDiscoveryPort.java
+++ b/onvif-ws-client/src/main/java/org/onvif/ver10/network/wsdl/RemoteDiscoveryPort.java
@@ -8,8 +8,8 @@ import jakarta.jws.soap.SOAPBinding;
 import jakarta.xml.bind.annotation.XmlSeeAlso;
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  *
  */
 @WebService(targetNamespace = "http://www.onvif.org/ver10/network/wsdl", name = "RemoteDiscoveryPort")
diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/receiver/wsdl/ReceiverPort.java b/onvif-ws-client/src/main/java/org/onvif/ver10/receiver/wsdl/ReceiverPort.java
index 66b23f8..fc08cb7 100644
--- a/onvif-ws-client/src/main/java/org/onvif/ver10/receiver/wsdl/ReceiverPort.java
+++ b/onvif-ws-client/src/main/java/org/onvif/ver10/receiver/wsdl/ReceiverPort.java
@@ -9,8 +9,8 @@ import jakarta.xml.ws.RequestWrapper;
 import jakarta.xml.ws.ResponseWrapper;
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  *
  */
 @WebService(targetNamespace = "http://www.onvif.org/ver10/receiver/wsdl", name = "ReceiverPort")
diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/receiver/wsdl/ReceiverService.java b/onvif-ws-client/src/main/java/org/onvif/ver10/receiver/wsdl/ReceiverService.java
index 2087aa4..5c1a043 100644
--- a/onvif-ws-client/src/main/java/org/onvif/ver10/receiver/wsdl/ReceiverService.java
+++ b/onvif-ws-client/src/main/java/org/onvif/ver10/receiver/wsdl/ReceiverService.java
@@ -1,5 +1,6 @@
 package org.onvif.ver10.receiver.wsdl;
 
+import java.net.URI;
 import java.net.URL;
 import javax.xml.namespace.QName;
 import jakarta.xml.ws.WebEndpoint;
@@ -8,8 +9,8 @@ import jakarta.xml.ws.WebServiceFeature;
 import jakarta.xml.ws.Service;
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  *
  */
 @WebServiceClient(name = "ReceiverService",
@@ -17,10 +18,10 @@ import jakarta.xml.ws.Service;
                   targetNamespace = "http://www.onvif.org/ver10/receiver/wsdl")
 public class ReceiverService extends Service {
 
-    public final static URL WSDL_LOCATION;
+    public static final URL WSDL_LOCATION;
 
-    public final static QName SERVICE = new QName("http://www.onvif.org/ver10/receiver/wsdl", "ReceiverService");
-    public final static QName ReceiverPort = new QName("http://www.onvif.org/ver10/receiver/wsdl", "ReceiverPort");
+    public static final QName SERVICE = new QName("http://www.onvif.org/ver10/receiver/wsdl", "ReceiverService");
+    public static final QName ReceiverPort = new QName("http://www.onvif.org/ver10/receiver/wsdl", "ReceiverPort");
     static {
         WSDL_LOCATION = null;
     }
diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/recording/wsdl/RecordingPort.java b/onvif-ws-client/src/main/java/org/onvif/ver10/recording/wsdl/RecordingPort.java
index 4fa4928..9c66f20 100644
--- a/onvif-ws-client/src/main/java/org/onvif/ver10/recording/wsdl/RecordingPort.java
+++ b/onvif-ws-client/src/main/java/org/onvif/ver10/recording/wsdl/RecordingPort.java
@@ -10,8 +10,8 @@ import jakarta.xml.ws.RequestWrapper;
 import jakarta.xml.ws.ResponseWrapper;
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  *
  */
 @WebService(targetNamespace = "http://www.onvif.org/ver10/recording/wsdl", name = "RecordingPort")
diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/recording/wsdl/RecordingService.java b/onvif-ws-client/src/main/java/org/onvif/ver10/recording/wsdl/RecordingService.java
index bab7284..bc575ec 100644
--- a/onvif-ws-client/src/main/java/org/onvif/ver10/recording/wsdl/RecordingService.java
+++ b/onvif-ws-client/src/main/java/org/onvif/ver10/recording/wsdl/RecordingService.java
@@ -1,5 +1,6 @@
 package org.onvif.ver10.recording.wsdl;
 
+import java.net.URI;
 import java.net.URL;
 import javax.xml.namespace.QName;
 import jakarta.xml.ws.WebEndpoint;
@@ -8,8 +9,8 @@ import jakarta.xml.ws.WebServiceFeature;
 import jakarta.xml.ws.Service;
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  *
  */
 @WebServiceClient(name = "RecordingService",
@@ -17,10 +18,10 @@ import jakarta.xml.ws.Service;
                   targetNamespace = "http://www.onvif.org/ver10/recording/wsdl")
 public class RecordingService extends Service {
 
-    public final static URL WSDL_LOCATION;
+    public static final URL WSDL_LOCATION;
 
-    public final static QName SERVICE = new QName("http://www.onvif.org/ver10/recording/wsdl", "RecordingService");
-    public final static QName RecordingPort = new QName("http://www.onvif.org/ver10/recording/wsdl", "RecordingPort");
+    public static final QName SERVICE = new QName("http://www.onvif.org/ver10/recording/wsdl", "RecordingService");
+    public static final QName RecordingPort = new QName("http://www.onvif.org/ver10/recording/wsdl", "RecordingPort");
     static {
         WSDL_LOCATION = null;
     }
diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/replay/wsdl/ReplayPort.java b/onvif-ws-client/src/main/java/org/onvif/ver10/replay/wsdl/ReplayPort.java
index d72cb34..55c17e7 100644
--- a/onvif-ws-client/src/main/java/org/onvif/ver10/replay/wsdl/ReplayPort.java
+++ b/onvif-ws-client/src/main/java/org/onvif/ver10/replay/wsdl/ReplayPort.java
@@ -9,8 +9,8 @@ import jakarta.xml.ws.RequestWrapper;
 import jakarta.xml.ws.ResponseWrapper;
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  *
  */
 @WebService(targetNamespace = "http://www.onvif.org/ver10/replay/wsdl", name = "ReplayPort")
diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/replay/wsdl/ReplayService.java b/onvif-ws-client/src/main/java/org/onvif/ver10/replay/wsdl/ReplayService.java
index 13e7dab..3491e54 100644
--- a/onvif-ws-client/src/main/java/org/onvif/ver10/replay/wsdl/ReplayService.java
+++ b/onvif-ws-client/src/main/java/org/onvif/ver10/replay/wsdl/ReplayService.java
@@ -1,5 +1,6 @@
 package org.onvif.ver10.replay.wsdl;
 
+import java.net.URI;
 import java.net.URL;
 import javax.xml.namespace.QName;
 import jakarta.xml.ws.WebEndpoint;
@@ -8,8 +9,8 @@ import jakarta.xml.ws.WebServiceFeature;
 import jakarta.xml.ws.Service;
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  *
  */
 @WebServiceClient(name = "ReplayService",
@@ -17,10 +18,10 @@ import jakarta.xml.ws.Service;
                   targetNamespace = "http://www.onvif.org/ver10/replay/wsdl")
 public class ReplayService extends Service {
 
-    public final static URL WSDL_LOCATION;
+    public static final URL WSDL_LOCATION;
 
-    public final static QName SERVICE = new QName("http://www.onvif.org/ver10/replay/wsdl", "ReplayService");
-    public final static QName ReplayPort = new QName("http://www.onvif.org/ver10/replay/wsdl", "ReplayPort");
+    public static final QName SERVICE = new QName("http://www.onvif.org/ver10/replay/wsdl", "ReplayService");
+    public static final QName ReplayPort = new QName("http://www.onvif.org/ver10/replay/wsdl", "ReplayPort");
     static {
         WSDL_LOCATION = null;
     }
diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/search/wsdl/SearchPort.java b/onvif-ws-client/src/main/java/org/onvif/ver10/search/wsdl/SearchPort.java
index e31491a..931d76b 100644
--- a/onvif-ws-client/src/main/java/org/onvif/ver10/search/wsdl/SearchPort.java
+++ b/onvif-ws-client/src/main/java/org/onvif/ver10/search/wsdl/SearchPort.java
@@ -9,8 +9,8 @@ import jakarta.xml.ws.RequestWrapper;
 import jakarta.xml.ws.ResponseWrapper;
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  *
  */
 @WebService(targetNamespace = "http://www.onvif.org/ver10/search/wsdl", name = "SearchPort")
diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/search/wsdl/SearchService.java b/onvif-ws-client/src/main/java/org/onvif/ver10/search/wsdl/SearchService.java
index 8c910e2..32df9fd 100644
--- a/onvif-ws-client/src/main/java/org/onvif/ver10/search/wsdl/SearchService.java
+++ b/onvif-ws-client/src/main/java/org/onvif/ver10/search/wsdl/SearchService.java
@@ -1,5 +1,6 @@
 package org.onvif.ver10.search.wsdl;
 
+import java.net.URI;
 import java.net.URL;
 import javax.xml.namespace.QName;
 import jakarta.xml.ws.WebEndpoint;
@@ -8,8 +9,8 @@ import jakarta.xml.ws.WebServiceFeature;
 import jakarta.xml.ws.Service;
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  *
  */
 @WebServiceClient(name = "SearchService",
@@ -17,10 +18,10 @@ import jakarta.xml.ws.Service;
                   targetNamespace = "http://www.onvif.org/ver10/search/wsdl")
 public class SearchService extends Service {
 
-    public final static URL WSDL_LOCATION;
+    public static final URL WSDL_LOCATION;
 
-    public final static QName SERVICE = new QName("http://www.onvif.org/ver10/search/wsdl", "SearchService");
-    public final static QName SearchPort = new QName("http://www.onvif.org/ver10/search/wsdl", "SearchPort");
+    public static final QName SERVICE = new QName("http://www.onvif.org/ver10/search/wsdl", "SearchService");
+    public static final QName SearchPort = new QName("http://www.onvif.org/ver10/search/wsdl", "SearchPort");
     static {
         WSDL_LOCATION = null;
     }
diff --git a/onvif-ws-client/src/main/java/org/onvif/ver20/imaging/wsdl/ImagingPort.java b/onvif-ws-client/src/main/java/org/onvif/ver20/imaging/wsdl/ImagingPort.java
index 4422a30..1eaa8bc 100644
--- a/onvif-ws-client/src/main/java/org/onvif/ver20/imaging/wsdl/ImagingPort.java
+++ b/onvif-ws-client/src/main/java/org/onvif/ver20/imaging/wsdl/ImagingPort.java
@@ -9,8 +9,8 @@ import jakarta.xml.ws.RequestWrapper;
 import jakarta.xml.ws.ResponseWrapper;
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  *
  */
 @WebService(targetNamespace = "http://www.onvif.org/ver20/imaging/wsdl", name = "ImagingPort")
diff --git a/onvif-ws-client/src/main/java/org/onvif/ver20/imaging/wsdl/ImagingService.java b/onvif-ws-client/src/main/java/org/onvif/ver20/imaging/wsdl/ImagingService.java
index 94b6dc4..dd0492c 100644
--- a/onvif-ws-client/src/main/java/org/onvif/ver20/imaging/wsdl/ImagingService.java
+++ b/onvif-ws-client/src/main/java/org/onvif/ver20/imaging/wsdl/ImagingService.java
@@ -1,5 +1,6 @@
 package org.onvif.ver20.imaging.wsdl;
 
+import java.net.URI;
 import java.net.URL;
 import javax.xml.namespace.QName;
 import jakarta.xml.ws.WebEndpoint;
@@ -8,8 +9,8 @@ import jakarta.xml.ws.WebServiceFeature;
 import jakarta.xml.ws.Service;
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  *
  */
 @WebServiceClient(name = "ImagingService",
@@ -17,10 +18,10 @@ import jakarta.xml.ws.Service;
                   targetNamespace = "http://www.onvif.org/ver20/imaging/wsdl")
 public class ImagingService extends Service {
 
-    public final static URL WSDL_LOCATION;
+    public static final URL WSDL_LOCATION;
 
-    public final static QName SERVICE = new QName("http://www.onvif.org/ver20/imaging/wsdl", "ImagingService");
-    public final static QName ImagingPort = new QName("http://www.onvif.org/ver20/imaging/wsdl", "ImagingPort");
+    public static final QName SERVICE = new QName("http://www.onvif.org/ver20/imaging/wsdl", "ImagingService");
+    public static final QName ImagingPort = new QName("http://www.onvif.org/ver20/imaging/wsdl", "ImagingPort");
     static {
         WSDL_LOCATION = null;
     }
diff --git a/onvif-ws-client/src/main/java/org/onvif/ver20/ptz/wsdl/PTZ.java b/onvif-ws-client/src/main/java/org/onvif/ver20/ptz/wsdl/PTZ.java
index 75fd799..f1e6a23 100644
--- a/onvif-ws-client/src/main/java/org/onvif/ver20/ptz/wsdl/PTZ.java
+++ b/onvif-ws-client/src/main/java/org/onvif/ver20/ptz/wsdl/PTZ.java
@@ -9,8 +9,8 @@ import jakarta.xml.ws.RequestWrapper;
 import jakarta.xml.ws.ResponseWrapper;
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  *
  */
 @WebService(targetNamespace = "http://www.onvif.org/ver20/ptz/wsdl", name = "PTZ")
diff --git a/onvif-ws-client/src/main/java/org/onvif/ver20/ptz/wsdl/PtzService.java b/onvif-ws-client/src/main/java/org/onvif/ver20/ptz/wsdl/PtzService.java
index 442bd60..3283f4c 100644
--- a/onvif-ws-client/src/main/java/org/onvif/ver20/ptz/wsdl/PtzService.java
+++ b/onvif-ws-client/src/main/java/org/onvif/ver20/ptz/wsdl/PtzService.java
@@ -1,5 +1,6 @@
 package org.onvif.ver20.ptz.wsdl;
 
+import java.net.URI;
 import java.net.URL;
 import javax.xml.namespace.QName;
 import jakarta.xml.ws.WebEndpoint;
@@ -8,8 +9,8 @@ import jakarta.xml.ws.WebServiceFeature;
 import jakarta.xml.ws.Service;
 
 /**
- * This class was generated by Apache CXF 4.0.1
- * Generated source version: 4.0.1
+ * This class was generated by Apache CXF 4.0.5
+ * Generated source version: 4.0.5
  *
  */
 @WebServiceClient(name = "PtzService",
@@ -17,10 +18,10 @@ import jakarta.xml.ws.Service;
                   targetNamespace = "http://www.onvif.org/ver20/ptz/wsdl")
 public class PtzService extends Service {
 
-    public final static URL WSDL_LOCATION;
+    public static final URL WSDL_LOCATION;
 
-    public final static QName SERVICE = new QName("http://www.onvif.org/ver20/ptz/wsdl", "PtzService");
-    public final static QName PtzPort = new QName("http://www.onvif.org/ver20/ptz/wsdl", "PtzPort");
+    public static final QName SERVICE = new QName("http://www.onvif.org/ver20/ptz/wsdl", "PtzService");
+    public static final QName PtzPort = new QName("http://www.onvif.org/ver20/ptz/wsdl", "PtzPort");
     static {
         WSDL_LOCATION = null;
     }
diff --git a/pom.xml b/pom.xml
index 99d01db..45624c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,6 @@
     <java.version>21</java.version>
     <cxf.version>4.0.1</cxf.version>
     <checkstyle-maven-plugin.version>3.6.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 -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>