diff --git a/api/pom.xml b/api/pom.xml
index 9a72170..f19aece 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -1,35 +1,36 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <groupId>org.opennms.core</groupId>
-    <artifactId>org.opennms.core.wsman</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opennms.core.wsman</groupId>
-  <artifactId>org.opennms.core.wsman.api</artifactId>
-  <name>OpenNMS :: Core :: WS-Man :: API</name>
-  <packaging>bundle</packaging>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.opennms.core</groupId>
+        <artifactId>org.opennms.core.wsman</artifactId>
+        <version>1.3.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.opennms.core.wsman</groupId>
+    <artifactId>org.opennms.core.wsman.api</artifactId>
+    <name>OpenNMS :: Core :: WS-Man :: API</name>
+    <packaging>bundle</packaging>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>${javaVersion}</source>
-          <target>${javaVersion}</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-RequiredExecutionEnvironment>JavaSE-${javaVersion}</Bundle-RequiredExecutionEnvironment>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>${javaVersion}</source>
+                    <target>${javaVersion}</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-RequiredExecutionEnvironment>JavaSE-${javaVersion}</Bundle-RequiredExecutionEnvironment>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/api/src/main/java/org/opennms/core/wsman/WSManClient.java b/api/src/main/java/org/opennms/core/wsman/WSManClient.java
index 5a994ef..15c302c 100644
--- a/api/src/main/java/org/opennms/core/wsman/WSManClient.java
+++ b/api/src/main/java/org/opennms/core/wsman/WSManClient.java
@@ -15,12 +15,13 @@
  */
 package org.opennms.core.wsman;
 
-import java.util.List;
-import java.util.Map;
-
 import org.opennms.core.wsman.exceptions.WSManException;
+import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * A WS-Man client implementation that supports the following operations:
  *   * Enumerate and pull (DSP8037)
@@ -110,4 +111,14 @@ public interface WSManClient {
      * @throws WSManException on error
      */
     public String enumerateAndPullUsingFilter(String resourceUri, String dialect, String filter, List<Node> nodes, boolean recursive);
+
+    /**
+     *
+     *
+     * @param resourceUri uri
+     * @param body body with a root XML element
+     * @param selectors map of selectors
+     * @throws WSManException on error
+     */
+    public void put(String resourceUri, Element body, Map<String, String> selectors);
 }
diff --git a/api/src/main/java/org/opennms/core/wsman/WSManEndpoint.java b/api/src/main/java/org/opennms/core/wsman/WSManEndpoint.java
index bc40cee..de89b6b 100644
--- a/api/src/main/java/org/opennms/core/wsman/WSManEndpoint.java
+++ b/api/src/main/java/org/opennms/core/wsman/WSManEndpoint.java
@@ -34,6 +34,8 @@ public class WSManEndpoint {
     private final String username;
     private final String password;
     private final boolean gssAuth;
+    private final boolean basicAuth;
+    private final boolean digestAuth;
     private final boolean strictSSL;
     private final WSManVersion serverVersion;
     private final Integer maxElements;
@@ -46,6 +48,8 @@ private WSManEndpoint(Builder builder) {
         username = builder.username;
         password = builder.password;
         gssAuth = builder.gssAuth;
+        basicAuth = builder.basicAuth;
+        digestAuth = builder.digestAuth;
         strictSSL = builder.strictSSL;
         serverVersion = builder.serverVersion;
         maxElements = builder.maxElements;
@@ -60,6 +64,8 @@ public static class Builder {
        private String username;
        private String password;
        private boolean gssAuth = false;
+       private boolean basicAuth = false;
+       private boolean digestAuth = false;
        private WSManVersion serverVersion = WSManVersion.WSMAN_1_2;
        private Integer maxElements;
        private Integer maxEnvelopeSize;
@@ -75,11 +81,19 @@ public Builder(URL url) {
        }
 
        public Builder withBasicAuth(String username, String password) {
+           this.basicAuth = true;
            this.username = Objects.requireNonNull(username, "username cannot be null");
            this.password = Objects.requireNonNull(password, "password cannot be null");
            return this;
        }
 
+        public Builder withDigestAuth(String username, String password) {
+            this.digestAuth= true;
+            this.username = Objects.requireNonNull(username, "username cannot be null");
+            this.password = Objects.requireNonNull(password, "password cannot be null");
+            return this;
+        }
+
        public Builder withGSSAuth() {
            gssAuth = true;
            return this;
@@ -137,7 +151,11 @@ public URL getUrl() {
     }
 
     public boolean isBasicAuth() {
-        return !isGSSAuth() && username != null;
+        return !isGSSAuth() && basicAuth && username != null;
+    }
+
+    public boolean isDigestAuth() {
+        return !isGSSAuth() && digestAuth && username != null;
     }
 
     public String getUsername() {
diff --git a/cli/pom.xml b/cli/pom.xml
index 5704fa0..b516b46 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -81,11 +81,18 @@
       <artifactId>jakarta.xml.ws-api</artifactId>
       <version>${jaxbVersion}</version>
     </dependency>
-    <dependency>
+ <!--   <dependency>
       <groupId>javax.activation</groupId>
       <artifactId>activation</artifactId>
       <version>${activationVersion}</version>
+    </dependency>-->
+    <!-- https://mvnrepository.com/artifact/jakarta.activation/jakarta.activation-api -->
+    <dependency>
+      <groupId>jakarta.activation</groupId>
+      <artifactId>jakarta.activation-api</artifactId>
+      <version>2.1.2</version>
     </dependency>
+
     <dependency>
       <groupId>args4j</groupId>
       <artifactId>args4j</artifactId>
diff --git a/cli/src/main/java/org/opennms/core/wsman/WSManCli.java b/cli/src/main/java/org/opennms/core/wsman/WSManCli.java
index bc7e6f2..dc94b0b 100644
--- a/cli/src/main/java/org/opennms/core/wsman/WSManCli.java
+++ b/cli/src/main/java/org/opennms/core/wsman/WSManCli.java
@@ -65,6 +65,9 @@ public enum WSManOperation {
     @Option(name="-gssAuth", usage="GSS authentication")
     private boolean gssAuth = false;
 
+    @Option(name="-digestAuth", usage="Digest authentication")
+    private boolean digestAuth = false;
+
     @Option(name="-o", usage="operation")
     WSManOperation operation = WSManOperation.ENUM;
 
@@ -126,6 +129,8 @@ public void doMain(String[] args) {
             builder.withBasicAuth(username, password);
         } else if (gssAuth) {
             builder.withGSSAuth();
+        } else if (digestAuth) {
+            builder.withDigestAuth(username, password);
         }
         WSManEndpoint endpoint = builder.build();
         LOG.info("Using endpoint: {}", endpoint);
diff --git a/cxf/pom.xml b/cxf/pom.xml
index a430938..9fe5b95 100644
--- a/cxf/pom.xml
+++ b/cxf/pom.xml
@@ -95,7 +95,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>jaxb2-maven-plugin</artifactId>
-        <version>2.5.0</version>
+        <version>3.1.0</version>
         <extensions>true</extensions>
         <executions>
           <execution>
@@ -164,5 +164,11 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>jakarta.xml.ws</groupId>
+      <artifactId>jakarta.xml.ws-api</artifactId>
+      <version>4.0.0</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/cxf/src/main/java/org/opennms/core/wsman/cxf/CXFWSManClient.java b/cxf/src/main/java/org/opennms/core/wsman/cxf/CXFWSManClient.java
index 8f7b822..f2e8f1c 100644
--- a/cxf/src/main/java/org/opennms/core/wsman/cxf/CXFWSManClient.java
+++ b/cxf/src/main/java/org/opennms/core/wsman/cxf/CXFWSManClient.java
@@ -24,10 +24,11 @@
 
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
 import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
+import jakarta.xml.ws.BindingProvider;
 
+import jakarta.xml.ws.Holder;
 import org.apache.cxf.Bus;
 import org.apache.cxf.binding.soap.SoapBindingConstants;
 import org.apache.cxf.bus.extension.ExtensionManagerBus;
@@ -42,6 +43,7 @@
 import org.apache.cxf.message.Message;
 import org.apache.cxf.transport.http.HTTPConduit;
 import org.apache.cxf.transport.http.auth.DefaultBasicAuthSupplier;
+import org.apache.cxf.transport.http.auth.DigestAuthSupplier;
 import org.apache.cxf.transport.http.auth.HttpAuthHeader;
 import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
 import org.apache.cxf.ws.addressing.AddressingProperties;
@@ -63,6 +65,8 @@
 import org.opennms.core.wsman.exceptions.WSManException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.xmlsoap.schemas.ws._2004._09.enumeration.Enumerate;
 import org.xmlsoap.schemas.ws._2004._09.enumeration.EnumerateResponse;
@@ -289,6 +293,25 @@ public String enumerateAndPullUsingFilter(String resourceUri, String dialect, St
         return enumerateAndPull(resourceUri, dialect, filter, nodes, recursive);
     }
 
+    @Override
+    public void put(String resourceUri, Element body, Map<String, String> selectors) {
+        String elementType = TypeUtils.getElementTypeFromResourceUri(resourceUri);
+        final TransferOperations transferer = getTransferer(resourceUri, elementType, selectors);
+        try {
+            TransferElement transferElement = new TransferElement();
+            transferElement.getAny().clear();
+            // Add the root XML element as a child element of TransferElement
+            transferElement.getAny().add(body);
+
+            Holder<TransferElement> holder = new Holder<>(transferElement);
+            transferer.put(holder);
+        } catch (RuntimeException e) {
+            throw wrapException(e);
+        } finally {
+            destroy(transferer);
+        }
+    }
+
     @Override
     public Node get(String resourceUri, Map<String, String> selectors) {
         String elementType = TypeUtils.getElementTypeFromResourceUri(resourceUri);
@@ -399,6 +422,14 @@ public java.security.cert.X509Certificate[] getAcceptedIssuers() {
             http.getAuthorization().setUserName(m_endpoint.getUsername());
             http.getAuthorization().setPassword(m_endpoint.getPassword());
 
+            requestContext.put(BindingProvider.USERNAME_PROPERTY, m_endpoint.getUsername());
+            requestContext.put(BindingProvider.PASSWORD_PROPERTY, m_endpoint.getPassword());
+        } else if (m_endpoint.isDigestAuth()) {
+            LOG.debug("Enabling digest authentication.");
+            http.setAuthSupplier(new DigestAuthSupplier());
+            http.getAuthorization().setUserName(m_endpoint.getUsername());
+            http.getAuthorization().setPassword(m_endpoint.getPassword());
+
             requestContext.put(BindingProvider.USERNAME_PROPERTY, m_endpoint.getUsername());
             requestContext.put(BindingProvider.PASSWORD_PROPERTY, m_endpoint.getPassword());
         }
diff --git a/cxf/src/main/java/org/opennms/core/wsman/cxf/EnumerationOperations.java b/cxf/src/main/java/org/opennms/core/wsman/cxf/EnumerationOperations.java
index e722387..4dccc78 100644
--- a/cxf/src/main/java/org/opennms/core/wsman/cxf/EnumerationOperations.java
+++ b/cxf/src/main/java/org/opennms/core/wsman/cxf/EnumerationOperations.java
@@ -15,14 +15,14 @@
  */
 package org.opennms.core.wsman.cxf;
 
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.Action;
-import javax.xml.ws.soap.Addressing;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.ws.Action;
+import jakarta.xml.ws.soap.Addressing;
 
 import org.xmlsoap.schemas.ws._2004._09.enumeration.Enumerate;
 import org.xmlsoap.schemas.ws._2004._09.enumeration.EnumerateResponse;
diff --git a/cxf/src/main/java/org/opennms/core/wsman/cxf/IdentifyOperations.java b/cxf/src/main/java/org/opennms/core/wsman/cxf/IdentifyOperations.java
index 09872ea..1935859 100644
--- a/cxf/src/main/java/org/opennms/core/wsman/cxf/IdentifyOperations.java
+++ b/cxf/src/main/java/org/opennms/core/wsman/cxf/IdentifyOperations.java
@@ -15,13 +15,13 @@
  */
 package org.opennms.core.wsman.cxf;
 
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.soap.Addressing;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.ws.soap.Addressing;
 
 import schemas.dmtf.org.wbem.wsman.v1.IdentifyResponseType;
 import schemas.dmtf.org.wbem.wsman.v1.IdentifyType;
diff --git a/cxf/src/main/java/org/opennms/core/wsman/cxf/TransferOperations.java b/cxf/src/main/java/org/opennms/core/wsman/cxf/TransferOperations.java
index 5f6997a..9a4925d 100644
--- a/cxf/src/main/java/org/opennms/core/wsman/cxf/TransferOperations.java
+++ b/cxf/src/main/java/org/opennms/core/wsman/cxf/TransferOperations.java
@@ -15,14 +15,14 @@
  */
 package org.opennms.core.wsman.cxf;
 
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.Action;
-import javax.xml.ws.soap.Addressing;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.ws.Action;
+import jakarta.xml.ws.soap.Addressing;
 
 import org.xmlsoap.schemas.ws._2004._09.transfer.ObjectFactory;
 import org.xmlsoap.schemas.ws._2004._09.transfer.TransferElement;
@@ -54,7 +54,7 @@ public interface TransferOperations {
     @Action(input = "http://schemas.xmlsoap.org/ws/2004/09/transfer/Put", output = "http://schemas.xmlsoap.org/ws/2004/09/transfer/PutResponse")
     public void put(
         @WebParam(partName = "Body", mode = WebParam.Mode.INOUT, name = "TransferElement", targetNamespace = "http://schemas.xmlsoap.org/ws/2004/09/transfer")
-        javax.xml.ws.Holder<TransferElement> body
+        jakarta.xml.ws.Holder<TransferElement> body
     );
 
     @WebMethod(operationName = "Delete")
diff --git a/cxf/src/main/java/org/opennms/core/wsman/cxf/TypeUtils.java b/cxf/src/main/java/org/opennms/core/wsman/cxf/TypeUtils.java
index 4fda580..01c26c6 100644
--- a/cxf/src/main/java/org/opennms/core/wsman/cxf/TypeUtils.java
+++ b/cxf/src/main/java/org/opennms/core/wsman/cxf/TypeUtils.java
@@ -3,9 +3,9 @@
 import java.net.URI;
 import java.util.List;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
 import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
diff --git a/cxf/src/main/java/org/opennms/core/wsman/cxf/WSManHeaderInterceptor.java b/cxf/src/main/java/org/opennms/core/wsman/cxf/WSManHeaderInterceptor.java
index cb0409c..d958174 100644
--- a/cxf/src/main/java/org/opennms/core/wsman/cxf/WSManHeaderInterceptor.java
+++ b/cxf/src/main/java/org/opennms/core/wsman/cxf/WSManHeaderInterceptor.java
@@ -21,8 +21,8 @@
 import java.util.Map.Entry;
 import java.util.Objects;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
 
 import org.apache.cxf.binding.soap.SoapMessage;
 import org.apache.cxf.binding.soap.interceptor.AbstractSoapInterceptor;
diff --git a/cxf/src/main/resources/xsds/addressing.xsd b/cxf/src/main/resources/xsds/addressing.xsd
new file mode 100644
index 0000000..6f66e74
--- /dev/null
+++ b/cxf/src/main/resources/xsds/addressing.xsd
@@ -0,0 +1,133 @@
+<?xml version="1.0"?>
+<!-- 
+Copyright © 2002-2004 BEA Systems Inc., International Business Machines Corporation, 
+Microsoft Corporation, Inc, SAP AG, and Sun Microsystems, Inc.. All rights reserved. 
+
+Permission to copy, display, perform, modify and distribute the WS-Addressing Specification, 
+and to authorize others to do the foregoing, in any medium without fee or royalty is hereby
+granted for the purpose of developing and evaluating the WS-Addressing Specification.
+
+BEA, IBM, Microsoft, SAP AG, and Sun Microsystems (collectively, the "Authors") each agree 
+to grant a license to third parties, under royalty-free  and otherwise reasonable, 
+non-discriminatory terms and conditions, to their respective essential patent claims that
+they deem necessary to implement the WS-Addressing Specification.
+
+DISCLAIMERS:
+
+THE WS-Addressing Specification IS PROVIDED "AS IS", AND THE AUTHORS MAKE NO REPRESENTATIONS
+OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF 
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE 
+CONTENTS OF THE WS-Addressing Specification IS SUITABLE FOR ANY PURPOSE; NOR THAT THE 
+IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, 
+TRADEMARKS OR OTHER RIGHTS.
+
+THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL 
+DAMAGES ARISING OUT OF ANY USE OF THE WS-Addressing Specification OR THE PERFORMANCE OR 
+IMPLEMENTATION OF THE CONTENTS THEREOF.
+
+You may remove these disclaimers from your modified versions of the WS-Addressing 
+Specification provided that you effectively disclaim all warranties and liabilities on behalf 
+of all copyright holders in the copies of any such modified versions you distribute.
+
+The name and trademarks of the Authors may NOT be used in any manner, including advertising 
+or publicity pertaining to the WS-Addressing Specification or its contents without specific, 
+written prior permission. Title to copyright in the WS-Addressing Specification will at all 
+times remain with the Authors.
+
+No other rights are granted by implication, estoppel or otherwise.
+
+-->
+<xs:schema targetNamespace="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" elementFormDefault="qualified" blockDefault="#all">
+  <!-- //////////////////// WS-Addressing //////////////////// -->
+  <!-- Endpoint reference -->
+  <xs:element name="EndpointReference" type="wsa:EndpointReferenceType"/>
+  <xs:complexType name="EndpointReferenceType">
+    <xs:sequence>
+      <xs:element name="Address" type="wsa:AttributedURI"/>
+      <xs:element name="ReferenceProperties" type="wsa:ReferencePropertiesType" minOccurs="0"/>
+      <xs:element name="ReferenceParameters" type="wsa:ReferenceParametersType" minOccurs="0"/>
+      <xs:element name="PortType" type="wsa:AttributedQName" minOccurs="0"/>
+      <xs:element name="ServiceName" type="wsa:ServiceNameType" minOccurs="0"/>
+      <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+        <xs:annotation>
+          <xs:documentation>
+					 If "Policy" elements from namespace "http://schemas.xmlsoap.org/ws/2002/12/policy#policy" are used, they must appear first (before any extensibility elements).
+					</xs:documentation>
+        </xs:annotation>
+      </xs:any>
+    </xs:sequence>
+    <xs:anyAttribute namespace="##other" processContents="lax"/>
+  </xs:complexType>
+  <xs:complexType name="ReferencePropertiesType">
+    <xs:sequence>
+      <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="ReferenceParametersType">
+    <xs:sequence>
+      <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="ServiceNameType">
+    <xs:simpleContent>
+      <xs:extension base="xs:QName">
+        <xs:attribute name="PortName" type="xs:NCName"/>
+        <xs:anyAttribute namespace="##other" processContents="lax"/>
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+  <!-- Message information header blocks -->
+  <xs:element name="MessageID" type="wsa:AttributedURI"/>
+  <xs:element name="RelatesTo" type="wsa:Relationship"/>
+  <xs:element name="To" type="wsa:AttributedURI"/>
+  <xs:element name="Action" type="wsa:AttributedURI"/>
+  <xs:element name="From" type="wsa:EndpointReferenceType"/>
+  <xs:element name="ReplyTo" type="wsa:EndpointReferenceType"/>
+  <xs:element name="FaultTo" type="wsa:EndpointReferenceType"/>
+  <xs:complexType name="Relationship">
+    <xs:simpleContent>
+      <xs:extension base="xs:anyURI">
+        <xs:attribute name="RelationshipType" type="xs:QName" use="optional"/>
+        <xs:anyAttribute namespace="##other" processContents="lax"/>
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+  <xs:simpleType name="RelationshipTypeValues">
+    <xs:restriction base="xs:QName">
+      <xs:enumeration value="wsa:Reply"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:element name="ReplyAfter" type="wsa:ReplyAfterType"/>
+  <xs:complexType name="ReplyAfterType">
+    <xs:simpleContent>
+      <xs:extension base="xs:nonNegativeInteger">
+        <xs:anyAttribute namespace="##other"/>
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+  <xs:simpleType name="FaultSubcodeValues">
+    <xs:restriction base="xs:QName">
+      <xs:enumeration value="wsa:InvalidMessageInformationHeader"/>
+      <xs:enumeration value="wsa:MessageInformationHeaderRequired"/>
+      <xs:enumeration value="wsa:DestinationUnreachable"/>
+      <xs:enumeration value="wsa:ActionNotSupported"/>
+      <xs:enumeration value="wsa:EndpointUnavailable"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:attribute name="Action" type="xs:anyURI"/>
+  <!-- Common declarations and definitions -->
+  <xs:complexType name="AttributedQName">
+    <xs:simpleContent>
+      <xs:extension base="xs:QName">
+        <xs:anyAttribute namespace="##other" processContents="lax"/>
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+  <xs:complexType name="AttributedURI">
+    <xs:simpleContent>
+      <xs:extension base="xs:anyURI">
+        <xs:anyAttribute namespace="##other" processContents="lax"/>
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+</xs:schema>
diff --git a/cxf/src/main/resources/xsds/wsman.xsd b/cxf/src/main/resources/xsds/wsman.xsd
index f826707..be2ee86 100644
--- a/cxf/src/main/resources/xsds/wsman.xsd
+++ b/cxf/src/main/resources/xsds/wsman.xsd
@@ -15,404 +15,440 @@ Change Requests:
 	None
 -->
 <xs:schema targetNamespace="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd"
-    xmlns:wsman="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd"
-    xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    elementFormDefault="qualified" version="1.0.0e">
-
-  <xs:import namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"
-             schemaLocation="https://schemasxmlsoap.azurewebsites.net/ws/2004/08/addressing/"/>
-  <xs:import namespace="http://www.w3.org/XML/1998/namespace" 
-             schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-
-  <xs:complexType name="attributableURI">
-    <xs:simpleContent>
-      <xs:extension base="xs:anyURI">
-        <xs:anyAttribute namespace="##other" processContents="lax"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="ResourceURI" type="wsman:attributableURI"/>
-
-  <xs:complexType name="SelectorType">
-    <xs:annotation>
-      <xs:documentation>
-        Instances of this type can be only simple types or EPRs, not arbitrary mixed data.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexContent mixed="true">
-      <xs:restriction base="xs:anyType">
+           xmlns:wsman="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd"
+           xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing"
+           xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           elementFormDefault="qualified" version="1.0.0e">
+
+    <xs:import namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"
+               schemaLocation="addressing.xsd"/>
+    <xs:import namespace="http://www.w3.org/XML/1998/namespace"
+               schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+
+    <xs:complexType name="attributableURI">
+        <xs:simpleContent>
+            <xs:extension base="xs:anyURI">
+                <xs:anyAttribute namespace="##other" processContents="lax"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+
+    <xs:element name="ResourceURI" type="wsman:attributableURI"/>
+
+    <xs:complexType name="SelectorType">
+        <xs:annotation>
+            <xs:documentation>
+                Instances of this type can be only simple types or EPRs, not arbitrary mixed data.
+            </xs:documentation>
+        </xs:annotation>
+        <xs:complexContent mixed="true">
+            <xs:restriction base="xs:anyType">
+                <xs:sequence>
+                    <xs:element ref="wsa:EndpointReference" minOccurs="0"/>
+                </xs:sequence>
+                <xs:attribute name="Name" type="xs:NCName" use="required"/>
+                <xs:anyAttribute namespace="##other" processContents="lax"/>
+            </xs:restriction>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:element name="Selector" type="wsman:SelectorType"/>
+
+    <xs:complexType name="SelectorSetType">
         <xs:sequence>
-          <xs:element ref="wsa:EndpointReference" minOccurs="0"/>
+            <xs:element ref="wsman:Selector" minOccurs="1" maxOccurs="unbounded"/>
         </xs:sequence>
-        <xs:attribute name="Name" type="xs:NCName" use="required"/>
-        <xs:anyAttribute namespace="##other" processContents="lax"/>
-      </xs:restriction>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:element name="Selector" type="wsman:SelectorType"/>
-
-  <xs:complexType name="SelectorSetType">
-    <xs:sequence>
-      <xs:element ref="wsman:Selector" minOccurs="1" maxOccurs="unbounded"/>
-    </xs:sequence>
-    <xs:anyAttribute namespace="##other" processContents="lax"/>
-  </xs:complexType>
-
-  <xs:element name="SelectorSet" type="wsman:SelectorSetType">
-    <xs:unique name="oneSelectorPerName">
-      <xs:selector xpath="./Selector"/>
-      <xs:field xpath="@Name"/>
-    </xs:unique>
-  </xs:element>
-
-  <xs:complexType name="attributableDuration">
-    <xs:simpleContent>
-      <xs:extension base="xs:duration">
         <xs:anyAttribute namespace="##other" processContents="lax"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
+    </xs:complexType>
 
-  <xs:element name="OperationTimeout" type="wsman:attributableDuration"/>
+    <xs:element name="SelectorSet" type="wsman:SelectorSetType">
+        <xs:unique name="oneSelectorPerName">
+            <xs:selector xpath="./Selector"/>
+            <xs:field xpath="@Name"/>
+        </xs:unique>
+    </xs:element>
+
+    <xs:complexType name="attributableDuration">
+        <xs:simpleContent>
+            <xs:extension base="xs:duration">
+                <xs:anyAttribute namespace="##other" processContents="lax"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+
+    <xs:element name="OperationTimeout" type="wsman:attributableDuration"/>
+
+    <xs:complexType name="attributablePositiveInteger">
+        <xs:simpleContent>
+            <xs:extension base="xs:positiveInteger">
+                <xs:anyAttribute namespace="##other" processContents="lax"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
 
-  <xs:complexType name="attributablePositiveInteger">
-    <xs:simpleContent>
-      <xs:extension base="xs:positiveInteger">
+    <xs:simpleType name="PolicyType">
+        <xs:restriction base="xs:token">
+            <xs:enumeration value="CancelSubscription"/>
+            <xs:enumeration value="Skip"/>
+            <xs:enumeration value="Notify"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:complexType name="MaxEnvelopeSizeType">
+        <xs:simpleContent>
+            <xs:extension base="wsman:attributablePositiveInteger">
+                <xs:attribute name="Policy" type="wsman:PolicyType" default="Notify"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+    <xs:element name="MaxEnvelopeSize" type="wsman:MaxEnvelopeSizeType"/>
+
+    <xs:element name="Locale">
+        <xs:complexType>
+            <xs:attribute ref="xml:lang" use="required"/>
+            <xs:anyAttribute namespace="##other" processContents="lax"/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:complexType name="OptionType">
+        <xs:simpleContent>
+            <xs:extension base="xs:string">
+                <xs:attribute name="Name" type="xs:NCName" use="required"/>
+                <xs:attribute name="MustComply" type="xs:boolean" default="false"/>
+                <xs:attribute name="Type" type="xs:QName"/>
+                <xs:anyAttribute namespace="##other" processContents="lax"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+    <xs:element name="Option" type="wsman:OptionType"/>
+
+    <xs:element name="OptionSet">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="wsman:Option" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+            <xs:anyAttribute namespace="##other" processContents="lax"/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:complexType name="attributableEmpty">
         <xs:anyAttribute namespace="##other" processContents="lax"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:simpleType name="PolicyType">
-    <xs:restriction base="xs:token">
-      <xs:enumeration value="CancelSubscription"/>
-      <xs:enumeration value="Skip"/>
-      <xs:enumeration value="Notify"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:complexType name="MaxEnvelopeSizeType">
-    <xs:simpleContent>
-      <xs:extension base="wsman:attributablePositiveInteger">
-        <xs:attribute name="Policy" type="wsman:PolicyType" default="Notify"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-  <xs:element name="MaxEnvelopeSize" type="wsman:MaxEnvelopeSizeType"/>
-
-  <xs:element name="Locale">
-    <xs:complexType>
-      <xs:attribute ref="xml:lang" use="required"/>
-      <xs:anyAttribute namespace="##other" processContents="lax"/>
     </xs:complexType>
-  </xs:element>
-
-  <xs:complexType name="OptionType">
-    <xs:simpleContent>
-      <xs:extension base="xs:string">
-        <xs:attribute name="Name" type="xs:NCName" use="required"/>
-        <xs:attribute name="MustComply" type="xs:boolean" default="false"/>
-        <xs:attribute name="Type" type="xs:QName"/>
+
+    <xs:element name="RequestEPR" type="wsman:attributableEmpty"/>
+    <xs:element name="EPRInvalid" type="wsman:attributableEmpty"/>
+    <xs:element name="EPRUnknown" type="wsman:attributableEmpty"/>
+
+    <xs:complexType name="RequestedEPRType">
+        <xs:choice>
+            <xs:element ref="wsa:EndpointReference"/>
+            <xs:element ref="wsman:EPRInvalid"/>
+            <xs:element ref="wsman:EPRUnknown"/>
+        </xs:choice>
         <xs:anyAttribute namespace="##other" processContents="lax"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-  <xs:element name="Option" type="wsman:OptionType"/>
-
-  <xs:element name="OptionSet">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="wsman:Option" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-      <xs:anyAttribute namespace="##other" processContents="lax"/>
     </xs:complexType>
-  </xs:element>
-
-  <xs:complexType name="attributableEmpty">
-    <xs:anyAttribute namespace="##other" processContents="lax"/>
-  </xs:complexType>
-
-  <xs:element name="RequestEPR" type="wsman:attributableEmpty"/>
-  <xs:element name="EPRInvalid" type="wsman:attributableEmpty"/>
-  <xs:element name="EPRUnknown" type="wsman:attributableEmpty"/>
-
-  <xs:complexType name="RequestedEPRType">
-    <xs:choice>
-      <xs:element ref="wsa:EndpointReference"/>
-      <xs:element ref="wsman:EPRInvalid"/>
-      <xs:element ref="wsman:EPRUnknown"/>
-    </xs:choice>
-    <xs:anyAttribute namespace="##other" processContents="lax"/>
-  </xs:complexType>
-  <xs:element name="RequestedEPR" type="wsman:RequestedEPRType"/>
-
-  <xs:complexType name="mixedDataType">
-    <xs:complexContent mixed="true">
-      <xs:restriction base="xs:anyType">
+    <xs:element name="RequestedEPR" type="wsman:RequestedEPRType"/>
+
+    <xs:complexType name="mixedDataType">
+        <xs:complexContent mixed="true">
+            <xs:restriction base="xs:anyType">
+                <xs:sequence>
+                    <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+                </xs:sequence>
+                <xs:anyAttribute namespace="##other" processContents="lax"/>
+            </xs:restriction>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:complexType name="fragmentMixedDataType">
+        <xs:complexContent mixed="true">
+            <xs:extension base="wsman:mixedDataType">
+                <xs:attribute name="Dialect" type="xs:anyURI" default="http://www.w3.org/TR/1999/REC-xpath-19991116"/>
+                <xs:anyAttribute namespace="##other" processContents="lax"/>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="FragmentTransfer" type="wsman:fragmentMixedDataType"/>
+    <xs:element name="XmlFragment" type="wsman:mixedDataType"/>
+
+    <xs:complexType name="attributableNonNegativeInteger">
+        <xs:simpleContent>
+            <xs:extension base="xs:nonNegativeInteger">
+                <xs:anyAttribute namespace="##other" processContents="lax"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+
+    <xs:element name="TotalItemsCountEstimate" type="wsman:attributableNonNegativeInteger" nillable="true"/>
+    <xs:element name="RequestTotalItemsCountEstimate" type="wsman:attributableEmpty"/>
+
+    <xs:element name="OptimizeEnumeration" type="wsman:attributableEmpty"/>
+    <xs:element name="MaxElements" type="wsman:attributablePositiveInteger"/>
+
+    <xs:simpleType name="EnumerationModeType">
+        <xs:restriction base="xs:token">
+            <xs:enumeration value="EnumerateEPR"/>
+            <xs:enumeration value="EnumerateObjectAndEPR"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:element name="EnumerationMode" type="wsman:EnumerationModeType"/>
+
+    <xs:complexType name="mixedDataFilterType" mixed="true">
+        <xs:complexContent mixed="true">
+            <xs:restriction base="xs:anyType">
+                <xs:sequence>
+                    <xs:any namespace="##any" processContents="skip" minOccurs="0" maxOccurs="unbounded"/>
+                </xs:sequence>
+                <xs:anyAttribute namespace="##any" processContents="lax"/>
+            </xs:restriction>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:complexType name="filterMixedDataType" mixed="true">
+        <xs:complexContent mixed="true">
+            <xs:extension base="wsman:mixedDataFilterType">
+                <xs:attribute name="Dialect" type="xs:anyURI" default="http://www.w3.org/TR/1999/REC-xpath-19991116"/>
+                <xs:anyAttribute namespace="##any" processContents="lax"/>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="Filter" type="wsman:filterMixedDataType"/>
+
+    <xs:complexType name="ObjectAndEPRType">
         <xs:sequence>
-          <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+            <xs:any namespace="##any" processContents="lax"/>
+            <xs:element ref="wsa:EndpointReference"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:element name="Item" type="wsman:ObjectAndEPRType"/>
+
+    <xs:complexType name="anyListType">
+        <xs:sequence>
+            <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
         </xs:sequence>
         <xs:anyAttribute namespace="##other" processContents="lax"/>
-      </xs:restriction>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="fragmentMixedDataType">
-    <xs:complexContent mixed="true">
-      <xs:extension base="wsman:mixedDataType">
-        <xs:attribute name="Dialect" type="xs:anyURI" default="http://www.w3.org/TR/1999/REC-xpath-19991116"/>
-        <xs:anyAttribute namespace="##other" processContents="lax"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  
-  <xs:element name="FragmentTransfer" type="wsman:fragmentMixedDataType"/>
-  <xs:element name="XmlFragment" type="wsman:mixedDataType"/>
-
-  <xs:complexType name="attributableNonNegativeInteger">
-    <xs:simpleContent>
-      <xs:extension base="xs:nonNegativeInteger">
-        <xs:anyAttribute namespace="##other" processContents="lax"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="TotalItemsCountEstimate" type="wsman:attributableNonNegativeInteger" nillable="true"/>
-  <xs:element name="RequestTotalItemsCountEstimate" type="wsman:attributableEmpty"/>
-
-  <xs:element name="OptimizeEnumeration" type="wsman:attributableEmpty"/>
-  <xs:element name="MaxElements" type="wsman:attributablePositiveInteger"/>
-
-  <xs:simpleType name="EnumerationModeType">
-    <xs:restriction base="xs:token">
-      <xs:enumeration value="EnumerateEPR"/>
-      <xs:enumeration value="EnumerateObjectAndEPR"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:element name="EnumerationMode" type="wsman:EnumerationModeType"/>
-
-  <xs:complexType name="mixedDataFilterType" mixed="true">
-    <xs:complexContent mixed="true">
-      <xs:restriction base="xs:anyType">
+    </xs:complexType>
+
+    <xs:element name="Items" type="wsman:anyListType"/>
+    <xs:element name="EndOfSequence" type="wsman:attributableEmpty"/>
+
+    <xs:complexType name="attributableLanguage">
+        <xs:simpleContent>
+            <xs:extension base="xs:language">
+                <xs:anyAttribute namespace="##other" processContents="lax"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+
+    <xs:element name="ContentEncoding" type="wsman:attributableLanguage"/>
+
+    <xs:complexType name="ConnectionRetryType">
+        <xs:simpleContent>
+            <xs:extension base="wsman:attributableDuration">
+                <xs:attribute name="Total" type="xs:unsignedLong"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+    <xs:element name="ConnectionRetry" type="wsman:ConnectionRetryType"/>
+
+    <xs:element name="Heartbeats" type="wsman:attributableDuration"/>
+    <xs:element name="SendBookmarks" type="wsman:attributableEmpty"/>
+
+    <xs:complexType name="attributableAny">
         <xs:sequence>
-          <xs:any namespace="##any" processContents="skip" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
         </xs:sequence>
-        <xs:anyAttribute namespace="##any" processContents="lax"/>
-      </xs:restriction>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="filterMixedDataType" mixed="true">
-    <xs:complexContent mixed="true">
-      <xs:extension base="wsman:mixedDataFilterType">
-        <xs:attribute name="Dialect" type="xs:anyURI" default="http://www.w3.org/TR/1999/REC-xpath-19991116"/>
-        <xs:anyAttribute namespace="##any" processContents="lax"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:element name="Filter" type="wsman:filterMixedDataType"/>
-
-  <xs:complexType name="ObjectAndEPRType">
-    <xs:sequence>
-      <xs:any namespace="##any" processContents="lax"/>
-      <xs:element ref="wsa:EndpointReference"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:element name="Item" type="wsman:ObjectAndEPRType"/>
-
-  <xs:complexType name="anyListType">
-    <xs:sequence>
-      <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
-    </xs:sequence>
-    <xs:anyAttribute namespace="##other" processContents="lax"/>
-  </xs:complexType>
-
-  <xs:element name="Items" type="wsman:anyListType"/>
-  <xs:element name="EndOfSequence" type="wsman:attributableEmpty"/>
-
-  <xs:complexType name="attributableLanguage">
-    <xs:simpleContent>
-      <xs:extension base="xs:language">
         <xs:anyAttribute namespace="##other" processContents="lax"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="ContentEncoding" type="wsman:attributableLanguage"/>
-
-  <xs:complexType name="ConnectionRetryType">
-    <xs:simpleContent>
-      <xs:extension base="wsman:attributableDuration">
-        <xs:attribute name="Total" type="xs:unsignedLong"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-  <xs:element name="ConnectionRetry" type="wsman:ConnectionRetryType"/>
-
-  <xs:element name="Heartbeats" type="wsman:attributableDuration"/>
-  <xs:element name="SendBookmarks" type="wsman:attributableEmpty"/>
-
-  <xs:complexType name="attributableAny">
-    <xs:sequence>
-      <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
-    </xs:sequence>
-    <xs:anyAttribute namespace="##other" processContents="lax"/>
-  </xs:complexType>
-
-  <xs:element name="Bookmark" type="wsman:mixedDataType"/>
-  <xs:element name="MaxTime" type="wsman:attributableDuration"/>
-
-  <xs:complexType name="EventType">
-    <xs:complexContent>
-      <xs:extension base="wsman:attributableAny">
-        <xs:attribute name="Action" type="xs:anyURI" use="required"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:element name="Event" type="wsman:EventType"/>
-
-  <xs:complexType name="EventsType">
-    <xs:sequence>
-      <xs:element ref="wsman:Event" minOccurs="1" maxOccurs="unbounded"/>
-    </xs:sequence>
-    <xs:anyAttribute namespace="##other" processContents="lax"/>
-  </xs:complexType>
-  <xs:element name="Events" type="wsman:EventsType"/>
-
-  <xs:element name="AckRequested" type="wsman:attributableEmpty"/>
-
-  <xs:complexType name="attributableInt">
-    <xs:simpleContent>
-      <xs:extension base="xs:int">
+    </xs:complexType>
+
+    <xs:element name="Bookmark" type="wsman:mixedDataType"/>
+    <xs:element name="MaxTime" type="wsman:attributableDuration"/>
+
+    <xs:complexType name="EventType">
+        <xs:complexContent>
+            <xs:extension base="wsman:attributableAny">
+                <xs:attribute name="Action" type="xs:anyURI" use="required"/>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:element name="Event" type="wsman:EventType"/>
+
+    <xs:complexType name="EventsType">
+        <xs:sequence>
+            <xs:element ref="wsman:Event" minOccurs="1" maxOccurs="unbounded"/>
+        </xs:sequence>
         <xs:anyAttribute namespace="##other" processContents="lax"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:complexType name="DroppedEventsType">
-    <xs:simpleContent>
-      <xs:extension base="wsman:attributableInt">
-        <xs:attribute name="Action" type="xs:anyURI" use="required"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-  <xs:element name="DroppedEvents" type="wsman:DroppedEventsType"/>
-
-  <xs:simpleType name="restrictedProfileType">
-    <xs:restriction base="xs:anyURI">
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/secprofile/http/basic"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/secprofile/http/digest"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/secprofile/https/basic"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/secprofile/https/digest"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/secprofile/https/mutual"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/secprofile/https/mutual/basic"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/secprofile/https/mutual/digest"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/secprofile/https/spnego-kerberos"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/secprofile/https/mutual/spnego-kerberos"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/secprofile/http/spnego-kerberos"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="ProfileType">
-    <xs:union memberTypes="wsman:restrictedProfileType xs:anyURI"/>
-  </xs:simpleType>
-
-  <xs:complexType name="AuthType">
-    <xs:complexContent>
-      <xs:extension base="wsman:attributableEmpty">
-        <xs:attribute name="Profile" type="wsman:ProfileType" use="required"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:element name="Auth" type="wsman:AuthType"/>
-
-  <xs:simpleType name="ThumbprintType">
-      <xs:restriction base="xs:string">
-          <xs:pattern value="[0-9a-fA-F]{40}"/>
-      </xs:restriction>
-  </xs:simpleType>
-  <xs:element name="CertificateThumbprint" type="wsman:ThumbprintType"/>
-
-
-  <xs:simpleType name="restrictedFaultDetailType">
-    <xs:restriction base="xs:anyURI">
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/ActionMismatch"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/Ack"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/AddressingMode"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/AsynchronousRequest"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/Bookmarks"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/CharacterSet"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/DeliveryRetries"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/DuplicateSelectors"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/EncodingType"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/EnumerationMode"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/ExpirationTime"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/Expired"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/FilteringRequired"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/FormatMismatch"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/FragmentLevelAccess"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/Heartbeats"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/InsecureAddress"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/InsufficientSelectors"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/Invalid"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/InvalidName"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/InvalidFragment"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/InvalidNamespace"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/InvalidResourceURI"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/InvalidValue"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/InvalidValues"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/Locale"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/MaxElements"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/MaxEnvelopePolicy"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/MaxEnvelopeSize"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/MaxTime"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/MinimumEnvelopeLimit"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/MissingValues"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/NotSupported"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/OperationTimeout"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/OptionLimit"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/ResourceOffline"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/SelectorLimit"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/ServiceEnvelopeLimit"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/TypeMismatch"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/UnexpectedSelectors"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/UnreportableSuccess"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/UnsupportedCharacter"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/UnusableAddress"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/URILimitExceeded"/>
-      <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/Whitespace"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="FaultDetailType">
-    <xs:union memberTypes="wsman:restrictedFaultDetailType xs:anyURI"/>
-  </xs:simpleType>
-
-  <xs:element name="FaultDetail" type="wsman:FaultDetailType"/>
-  <xs:element name="FragmentDialect" type="wsman:attributableURI"/>
-  <xs:element name="SupportedSelectorName" type="xs:NCName"/>
-
-  <!-- Master Fault Table subcode QNames -->
-  <xs:element name="AccessDenied"><xs:complexType/></xs:element>
-  <xs:element name="AlreadyExists"><xs:complexType/></xs:element>
-  <xs:element name="CannotProcessFilter"><xs:complexType/></xs:element>
-  <xs:element name="Concurrency"><xs:complexType/></xs:element>
-  <xs:element name="DeliveryRefused"><xs:complexType/></xs:element>
-  <xs:element name="EncodingLimit"><xs:complexType/></xs:element>
-  <xs:element name="EventDeliverToUnusable"><xs:complexType/></xs:element>
-  <xs:element name="FragmentDialectNotSupported"><xs:complexType/></xs:element>
-  <xs:element name="InternalError"><xs:complexType/></xs:element>
-  <xs:element name="InvalidBookmark"><xs:complexType/></xs:element>
-  <xs:element name="InvalidOptions"><xs:complexType/></xs:element>
-  <xs:element name="InvalidParameter"><xs:complexType/></xs:element>
-  <xs:element name="InvalidSelectors"><xs:complexType/></xs:element>
-  <xs:element name="NoAck"><xs:complexType/></xs:element>
-  <xs:element name="QuotaLimit"><xs:complexType/></xs:element>
-  <xs:element name="SchemaValidationError"><xs:complexType/></xs:element>
-  <xs:element name="TimedOut"><xs:complexType/></xs:element>
-  <xs:element name="UnsupportedFeature"><xs:complexType/></xs:element>
+    </xs:complexType>
+    <xs:element name="Events" type="wsman:EventsType"/>
+
+    <xs:element name="AckRequested" type="wsman:attributableEmpty"/>
+
+    <xs:complexType name="attributableInt">
+        <xs:simpleContent>
+            <xs:extension base="xs:int">
+                <xs:anyAttribute namespace="##other" processContents="lax"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+
+    <xs:complexType name="DroppedEventsType">
+        <xs:simpleContent>
+            <xs:extension base="wsman:attributableInt">
+                <xs:attribute name="Action" type="xs:anyURI" use="required"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+    <xs:element name="DroppedEvents" type="wsman:DroppedEventsType"/>
+
+    <xs:simpleType name="restrictedProfileType">
+        <xs:restriction base="xs:anyURI">
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/secprofile/http/basic"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/secprofile/http/digest"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/secprofile/https/basic"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/secprofile/https/digest"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/secprofile/https/mutual"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/secprofile/https/mutual/basic"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/secprofile/https/mutual/digest"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/secprofile/https/spnego-kerberos"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/secprofile/https/mutual/spnego-kerberos"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/secprofile/http/spnego-kerberos"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="ProfileType">
+        <xs:union memberTypes="wsman:restrictedProfileType xs:anyURI"/>
+    </xs:simpleType>
+
+    <xs:complexType name="AuthType">
+        <xs:complexContent>
+            <xs:extension base="wsman:attributableEmpty">
+                <xs:attribute name="Profile" type="wsman:ProfileType" use="required"/>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:element name="Auth" type="wsman:AuthType"/>
+
+    <xs:simpleType name="ThumbprintType">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[0-9a-fA-F]{40}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:element name="CertificateThumbprint" type="wsman:ThumbprintType"/>
+
+
+    <xs:simpleType name="restrictedFaultDetailType">
+        <xs:restriction base="xs:anyURI">
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/ActionMismatch"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/Ack"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/AddressingMode"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/AsynchronousRequest"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/Bookmarks"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/CharacterSet"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/DeliveryRetries"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/DuplicateSelectors"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/EncodingType"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/EnumerationMode"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/ExpirationTime"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/Expired"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/FilteringRequired"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/FormatMismatch"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/FragmentLevelAccess"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/Heartbeats"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/InsecureAddress"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/InsufficientSelectors"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/Invalid"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/InvalidName"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/InvalidFragment"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/InvalidNamespace"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/InvalidResourceURI"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/InvalidValue"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/InvalidValues"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/Locale"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/MaxElements"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/MaxEnvelopePolicy"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/MaxEnvelopeSize"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/MaxTime"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/MinimumEnvelopeLimit"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/MissingValues"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/NotSupported"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/OperationTimeout"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/OptionLimit"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/ResourceOffline"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/SelectorLimit"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/ServiceEnvelopeLimit"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/TypeMismatch"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/UnexpectedSelectors"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/UnreportableSuccess"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/UnsupportedCharacter"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/UnusableAddress"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/URILimitExceeded"/>
+            <xs:enumeration value="http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/Whitespace"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="FaultDetailType">
+        <xs:union memberTypes="wsman:restrictedFaultDetailType xs:anyURI"/>
+    </xs:simpleType>
+
+    <xs:element name="FaultDetail" type="wsman:FaultDetailType"/>
+    <xs:element name="FragmentDialect" type="wsman:attributableURI"/>
+    <xs:element name="SupportedSelectorName" type="xs:NCName"/>
+
+    <!-- Master Fault Table subcode QNames -->
+    <xs:element name="AccessDenied">
+        <xs:complexType/>
+    </xs:element>
+    <xs:element name="AlreadyExists">
+        <xs:complexType/>
+    </xs:element>
+    <xs:element name="CannotProcessFilter">
+        <xs:complexType/>
+    </xs:element>
+    <xs:element name="Concurrency">
+        <xs:complexType/>
+    </xs:element>
+    <xs:element name="DeliveryRefused">
+        <xs:complexType/>
+    </xs:element>
+    <xs:element name="EncodingLimit">
+        <xs:complexType/>
+    </xs:element>
+    <xs:element name="EventDeliverToUnusable">
+        <xs:complexType/>
+    </xs:element>
+    <xs:element name="FragmentDialectNotSupported">
+        <xs:complexType/>
+    </xs:element>
+    <xs:element name="InternalError">
+        <xs:complexType/>
+    </xs:element>
+    <xs:element name="InvalidBookmark">
+        <xs:complexType/>
+    </xs:element>
+    <xs:element name="InvalidOptions">
+        <xs:complexType/>
+    </xs:element>
+    <xs:element name="InvalidParameter">
+        <xs:complexType/>
+    </xs:element>
+    <xs:element name="InvalidSelectors">
+        <xs:complexType/>
+    </xs:element>
+    <xs:element name="NoAck">
+        <xs:complexType/>
+    </xs:element>
+    <xs:element name="QuotaLimit">
+        <xs:complexType/>
+    </xs:element>
+    <xs:element name="SchemaValidationError">
+        <xs:complexType/>
+    </xs:element>
+    <xs:element name="TimedOut">
+        <xs:complexType/>
+    </xs:element>
+    <xs:element name="UnsupportedFeature">
+        <xs:complexType/>
+    </xs:element>
 
 </xs:schema>
diff --git a/itests/pom.xml b/itests/pom.xml
index 765cf1c..1e61ffc 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -1,59 +1,61 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <groupId>org.opennms.core</groupId>
-    <artifactId>org.opennms.core.wsman</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opennms.core.wsman</groupId>
-  <artifactId>org.opennms.core.wsman.itests</artifactId>
-  <name>OpenNMS :: Core :: WS-Man :: Integration Tests</name>
-  <packaging>jar</packaging>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.opennms.core</groupId>
+        <artifactId>org.opennms.core.wsman</artifactId>
+        <version>1.3.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.opennms.core.wsman</groupId>
+    <artifactId>org.opennms.core.wsman.itests</artifactId>
+    <name>OpenNMS :: Core :: WS-Man :: Integration Tests</name>
+    <packaging>jar</packaging>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>${javaVersion}</source>
-          <target>${javaVersion}</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>${javaVersion}</source>
+                    <target>${javaVersion}</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.opennms.core.wsman</groupId>
-      <artifactId>org.opennms.core.wsman.api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
+    <dependencies>
+        <dependency>
+            <groupId>org.opennms.core.wsman</groupId>
+            <artifactId>org.opennms.core.wsman.api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junitVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.mycila</groupId>
-      <artifactId>mycila-xmltool</artifactId>
-      <version>${xmltoolVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-      <version>${slf4jVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>${guavaVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.github.tomakehurst</groupId>
-      <artifactId>wiremock-jre8-standalone</artifactId>
-      <version>${wiremockVersion}</version>
-    </dependency>
-  </dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junitVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.mycila</groupId>
+            <artifactId>mycila-xmltool</artifactId>
+            <version>${xmltoolVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>${slf4jVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guavaVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.tomakehurst</groupId>
+            <artifactId>wiremock</artifactId>
+            <version>${wiremockVersion}</version>
+        </dependency>
+    </dependencies>
 </project>
diff --git a/openwsman/src/main/java/org/opennms/core/wsman/openwsman/OpenWSManClient.java b/openwsman/src/main/java/org/opennms/core/wsman/openwsman/OpenWSManClient.java
index cc5dc4b..ed1b531 100644
--- a/openwsman/src/main/java/org/opennms/core/wsman/openwsman/OpenWSManClient.java
+++ b/openwsman/src/main/java/org/opennms/core/wsman/openwsman/OpenWSManClient.java
@@ -25,12 +25,12 @@
 
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.MimeHeaders;
-import javax.xml.soap.SOAPBody;
-import javax.xml.soap.SOAPConstants;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
+import jakarta.xml.soap.MessageFactory;
+import jakarta.xml.soap.MimeHeaders;
+import jakarta.xml.soap.SOAPBody;
+import jakarta.xml.soap.SOAPConstants;
+import jakarta.xml.soap.SOAPException;
+import jakarta.xml.soap.SOAPMessage;
 
 import org.opennms.core.wsman.IdentifyResponse;
 import org.opennms.core.wsman.WSManClient;
diff --git a/pom.xml b/pom.xml
index d87d0f1..57acf53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,13 +43,13 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <javaVersion>1.8</javaVersion>
-    <cxfVersion>3.4.10</cxfVersion>
+    <javaVersion>17</javaVersion>
+    <cxfVersion>4.0.3</cxfVersion>
     <slf4jVersion>1.7.36</slf4jVersion>
-    <guavaVersion>25.1-jre</guavaVersion>
+    <guavaVersion>33.0.0-jre</guavaVersion>
     <args4jVersion>2.33</args4jVersion>
     <xmltoolVersion>4.4.ga</xmltoolVersion>
-    <log4jVersion>2.20.0</log4jVersion>
+    <log4jVersion>2.22.1</log4jVersion>
     <junitVersion>4.13</junitVersion>
     <wiremockVersion>2.27.2</wiremockVersion>
     <jaxbVersion>4.0.0</jaxbVersion>
@@ -81,7 +81,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>4.2.1</version>
+        <version>5.1.1</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>