From 2e33efd2967ef212a270932aba92a2fe8b604d60 Mon Sep 17 00:00:00 2001 From: "sathishkumar.n" Date: Mon, 16 Sep 2024 11:32:41 +0530 Subject: [PATCH] upgraded cxf library changed javax to jakarta --- README.md | 2 +- client/pom.xml | 42 ++++++++++++++++++- client/src/jaxws/bindings.xml | 4 +- .../winrm4j/client/RetryingProxyHandler.java | 4 +- .../winrm4j/client/ShellCommand.java | 2 +- .../client/StripShellResponseHandler.java | 14 +++---- .../cloudsoft/winrm4j/client/WinRmClient.java | 4 +- .../winrm4j/client/WinRmFactory.java | 6 +-- .../winrm4j/client/retry/RetryPolicy.java | 2 +- .../retry/SimpleCounterRetryPolicy.java | 2 +- .../client/RetryingProxyHandlerTest.java | 2 +- pom.xml | 38 +++++++++-------- service/pom.xml | 26 +++++++++++- .../io/cloudsoft/winrm4j/service/WinRm.java | 16 +++---- .../winrm4j/service/shell/CommandLine.java | 8 ++-- .../service/shell/CommandStateType.java | 10 ++--- .../service/shell/DesiredStreamType.java | 10 ++--- .../service/shell/EnvironmentVariable.java | 10 ++--- .../shell/EnvironmentVariableList.java | 8 ++-- .../winrm4j/service/shell/Receive.java | 8 ++-- .../service/shell/ReceiveResponse.java | 12 +++--- .../winrm4j/service/shell/Shell.java | 14 +++---- .../winrm4j/service/shell/SignalResponse.java | 8 ++-- .../winrm4j/service/shell/StreamType.java | 12 +++--- .../winrm4j/service/shell/package-info.java | 2 +- .../service/transfer/ResourceCreated.java | 8 ++-- .../service/wsman/CommandResponse.java | 8 ++-- .../winrm4j/service/wsman/Locale.java | 8 ++-- .../winrm4j/service/wsman/OptionSetType.java | 10 ++--- .../winrm4j/service/wsman/OptionType.java | 16 +++---- .../service/wsman/SelectorSetType.java | 10 ++--- .../winrm4j/service/wsman/SelectorType.java | 20 ++++----- .../winrm4j/service/wsman/Signal.java | 10 ++--- .../winrm4j/service/wsman/package-info.java | 2 +- .../winrm4j/service/ExampleServer.java | 2 +- winrm4j/pom.xml | 4 +- .../io/cloudsoft/winrm4j/winrm/WinRmTool.java | 2 +- 37 files changed, 215 insertions(+), 151 deletions(-) diff --git a/README.md b/README.md index ee1f04fc..c235391f 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Add the following to your `pom.xml`: io.cloudsoft.windows winrm4j - 0.12.3 + 0.12.4-SNAPSHOT ``` diff --git a/client/pom.xml b/client/pom.xml index 4f0d1447..214ec583 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -23,11 +23,37 @@ io.cloudsoft.windows winrm4j-parent - 0.12.3 + 0.12.4-SNAPSHOT winrm4j-client WinRM Client + + + + + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.0 + + + jakarta.xml.ws + jakarta.xml.ws-api + 4.0.0 + + + org.glassfish.jaxb + jaxb-runtime + 4.0.2 + + + com.sun.xml.messaging.saaj + saaj-impl + 3.0.0 + + + + org.apache.cxf @@ -142,6 +168,18 @@ xmlunit-matchers ${xmlunit.version} + + org.glassfish.jaxb + jaxb-runtime + test + + + com.sun.xml.messaging.saaj + saaj-impl + test + true + + @@ -214,7 +252,7 @@ * Summary of conclusions: https://lists.apache.org/thread.html/f24c5833eb0ffda00021a57a606e143a4f5a2b7971df4e11406df1a6%40%3Cdev.brooklyn.apache.org%3E --> - javax.xml.bind*;version=!, + jakarta.xml.bind*;version=!, * diff --git a/client/src/jaxws/bindings.xml b/client/src/jaxws/bindings.xml index cf7069ad..d1c59bf3 100644 --- a/client/src/jaxws/bindings.xml +++ b/client/src/jaxws/bindings.xml @@ -1,6 +1,6 @@ - diff --git a/client/src/main/java/io/cloudsoft/winrm4j/client/RetryingProxyHandler.java b/client/src/main/java/io/cloudsoft/winrm4j/client/RetryingProxyHandler.java index 1e7897a1..aa506679 100644 --- a/client/src/main/java/io/cloudsoft/winrm4j/client/RetryingProxyHandler.java +++ b/client/src/main/java/io/cloudsoft/winrm4j/client/RetryingProxyHandler.java @@ -6,8 +6,8 @@ import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import javax.xml.ws.WebServiceException; -import javax.xml.ws.soap.SOAPFaultException; +import jakarta.xml.ws.WebServiceException; +import jakarta.xml.ws.soap.SOAPFaultException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/client/src/main/java/io/cloudsoft/winrm4j/client/ShellCommand.java b/client/src/main/java/io/cloudsoft/winrm4j/client/ShellCommand.java index acb9e978..f2f55d8b 100644 --- a/client/src/main/java/io/cloudsoft/winrm4j/client/ShellCommand.java +++ b/client/src/main/java/io/cloudsoft/winrm4j/client/ShellCommand.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.function.Predicate; -import javax.xml.ws.soap.SOAPFaultException; +import jakarta.xml.ws.soap.SOAPFaultException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/client/src/main/java/io/cloudsoft/winrm4j/client/StripShellResponseHandler.java b/client/src/main/java/io/cloudsoft/winrm4j/client/StripShellResponseHandler.java index 3a809bac..63c17fae 100644 --- a/client/src/main/java/io/cloudsoft/winrm4j/client/StripShellResponseHandler.java +++ b/client/src/main/java/io/cloudsoft/winrm4j/client/StripShellResponseHandler.java @@ -4,13 +4,13 @@ import java.util.Set; import javax.xml.namespace.QName; -import javax.xml.soap.SOAPBody; -import javax.xml.soap.SOAPElement; -import javax.xml.soap.SOAPEnvelope; -import javax.xml.soap.SOAPException; -import javax.xml.ws.handler.MessageContext; -import javax.xml.ws.handler.soap.SOAPHandler; -import javax.xml.ws.handler.soap.SOAPMessageContext; +import jakarta.xml.soap.SOAPBody; +import jakarta.xml.soap.SOAPElement; +import jakarta.xml.soap.SOAPEnvelope; +import jakarta.xml.soap.SOAPException; +import jakarta.xml.ws.handler.MessageContext; +import jakarta.xml.ws.handler.soap.SOAPHandler; +import jakarta.xml.ws.handler.soap.SOAPMessageContext; public class StripShellResponseHandler implements SOAPHandler { diff --git a/client/src/main/java/io/cloudsoft/winrm4j/client/WinRmClient.java b/client/src/main/java/io/cloudsoft/winrm4j/client/WinRmClient.java index 401c034d..2ccf495e 100644 --- a/client/src/main/java/io/cloudsoft/winrm4j/client/WinRmClient.java +++ b/client/src/main/java/io/cloudsoft/winrm4j/client/WinRmClient.java @@ -35,8 +35,8 @@ import javax.security.auth.login.Configuration; import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.handler.Handler; +import jakarta.xml.ws.BindingProvider; +import jakarta.xml.ws.handler.Handler; import javax.xml.xpath.XPath; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; diff --git a/client/src/main/java/io/cloudsoft/winrm4j/client/WinRmFactory.java b/client/src/main/java/io/cloudsoft/winrm4j/client/WinRmFactory.java index 89940d55..f20c9441 100644 --- a/client/src/main/java/io/cloudsoft/winrm4j/client/WinRmFactory.java +++ b/client/src/main/java/io/cloudsoft/winrm4j/client/WinRmFactory.java @@ -8,8 +8,8 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import javax.xml.ws.spi.Provider; -import javax.xml.ws.spi.ServiceDelegate; +import jakarta.xml.ws.spi.Provider; +import jakarta.xml.ws.spi.ServiceDelegate; import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.interceptor.Interceptor; @@ -86,7 +86,7 @@ private static WinRm doCreateServiceWithReflectivelySetDelegate() { WinRmService service = doCreateService_1_CreateMinimalServiceInstance(); try { - Field delegateField = javax.xml.ws.Service.class.getDeclaredField("delegate"); //ALLOW CXF SPECIFIC SERVICE DELEGATE ONLY! + Field delegateField = jakarta.xml.ws.Service.class.getDeclaredField("delegate"); //ALLOW CXF SPECIFIC SERVICE DELEGATE ONLY! delegateField.setAccessible(true); ServiceDelegate previousDelegate = (ServiceDelegate) delegateField.get(service); if (!previousDelegate.getClass().getName().contains("cxf")) { diff --git a/client/src/main/java/io/cloudsoft/winrm4j/client/retry/RetryPolicy.java b/client/src/main/java/io/cloudsoft/winrm4j/client/retry/RetryPolicy.java index 93a3d501..81ae7859 100644 --- a/client/src/main/java/io/cloudsoft/winrm4j/client/retry/RetryPolicy.java +++ b/client/src/main/java/io/cloudsoft/winrm4j/client/retry/RetryPolicy.java @@ -1,6 +1,6 @@ package io.cloudsoft.winrm4j.client.retry; -import javax.xml.ws.WebServiceException; +import jakarta.xml.ws.WebServiceException; /** * Policy to decide if a retry should be done. diff --git a/client/src/main/java/io/cloudsoft/winrm4j/client/retry/SimpleCounterRetryPolicy.java b/client/src/main/java/io/cloudsoft/winrm4j/client/retry/SimpleCounterRetryPolicy.java index 4bc92241..11fc8220 100644 --- a/client/src/main/java/io/cloudsoft/winrm4j/client/retry/SimpleCounterRetryPolicy.java +++ b/client/src/main/java/io/cloudsoft/winrm4j/client/retry/SimpleCounterRetryPolicy.java @@ -3,7 +3,7 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; -import javax.xml.ws.WebServiceException; +import jakarta.xml.ws.WebServiceException; /** * Retry policy that uses max number of retries. diff --git a/client/src/test/java/io/cloudsoft/winrm4j/client/RetryingProxyHandlerTest.java b/client/src/test/java/io/cloudsoft/winrm4j/client/RetryingProxyHandlerTest.java index 68986d39..582b9a61 100644 --- a/client/src/test/java/io/cloudsoft/winrm4j/client/RetryingProxyHandlerTest.java +++ b/client/src/test/java/io/cloudsoft/winrm4j/client/RetryingProxyHandlerTest.java @@ -14,7 +14,7 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; -import javax.xml.ws.WebServiceException; +import jakarta.xml.ws.WebServiceException; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/pom.xml b/pom.xml index 490e8494..fcc26156 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 4.0.0 io.cloudsoft.windows winrm4j-parent - 0.12.3 + 0.12.4-SNAPSHOT pom WinRM Parent @@ -61,19 +61,21 @@ Integration,Acceptance,Live,WIP false - 2.19.1 + 2.22.0 6.9.10 - 18.0 - 3.5.0 + 27.1-jre + 4.10.0 - 3.3.9 + 4.0.0 + 4.0.2 + 3.0.0 ${cxf.version} - 4.4.12 - 4.1.4 - 4.5.13 - 2.4 - 2.3.0 + 4.4.16 + 4.1.5 + 4.5.14 + 2.11.0 + 2.8.1 @@ -169,7 +171,7 @@ maven-compiler-plugin - 3.6.0 + 3.11.0 ${java.version} ${java.version} @@ -210,7 +212,7 @@ maven-failsafe-plugin - 2.18.1 + 3.0.0 maven-jar-plugin @@ -219,23 +221,23 @@ org.apache.felix maven-bundle-plugin - 3.0.0 + 5.1.8 maven-resources-plugin - 3.0.2 + 3.3.0 maven-source-plugin - 3.0.1 + 3.2.1 maven-assembly-plugin - 3.0.0 + 3.5.0 maven-clean-plugin - 3.0.0 + 3.1.0 maven-eclipse-plugin @@ -247,7 +249,7 @@ maven-javadoc-plugin - 2.10.4 + 3.5.0 maven-gpg-plugin diff --git a/service/pom.xml b/service/pom.xml index 8f633903..6d8516df 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -26,16 +26,40 @@ io.cloudsoft.windows winrm4j-parent - 0.12.3 + 0.12.4-SNAPSHOT ../pom.xml + + + + + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.0 + + + jakarta.xml.ws + jakarta.xml.ws-api + 4.0.0 + + + + org.apache.cxf cxf-core ${cxf.version} + + jakarta.xml.ws + jakarta.xml.ws-api + + + jakarta.xml.bind + jakarta.xml.bind-api + diff --git a/service/src/main/java/io/cloudsoft/winrm4j/service/WinRm.java b/service/src/main/java/io/cloudsoft/winrm4j/service/WinRm.java index 55b965c1..36186db0 100644 --- a/service/src/main/java/io/cloudsoft/winrm4j/service/WinRm.java +++ b/service/src/main/java/io/cloudsoft/winrm4j/service/WinRm.java @@ -2,14 +2,14 @@ import java.util.List; -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.xml.ws.Action; -import javax.xml.ws.BindingType; -import javax.xml.ws.RequestWrapper; +import jakarta.jws.WebMethod; +import jakarta.jws.WebParam; +import jakarta.jws.WebResult; +import jakarta.jws.WebService; +import jakarta.jws.soap.SOAPBinding; +import jakarta.xml.ws.Action; +import jakarta.xml.ws.BindingType; +import jakarta.xml.ws.RequestWrapper; import io.cloudsoft.winrm4j.service.shell.Receive; import io.cloudsoft.winrm4j.service.shell.ReceiveResponse; diff --git a/service/src/main/java/io/cloudsoft/winrm4j/service/shell/CommandLine.java b/service/src/main/java/io/cloudsoft/winrm4j/service/shell/CommandLine.java index 9b36b0a4..7346c0bc 100644 --- a/service/src/main/java/io/cloudsoft/winrm4j/service/shell/CommandLine.java +++ b/service/src/main/java/io/cloudsoft/winrm4j/service/shell/CommandLine.java @@ -3,10 +3,10 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; @XmlAccessorType(XmlAccessType.FIELD) diff --git a/service/src/main/java/io/cloudsoft/winrm4j/service/shell/CommandStateType.java b/service/src/main/java/io/cloudsoft/winrm4j/service/shell/CommandStateType.java index 513e972c..15672d67 100644 --- a/service/src/main/java/io/cloudsoft/winrm4j/service/shell/CommandStateType.java +++ b/service/src/main/java/io/cloudsoft/winrm4j/service/shell/CommandStateType.java @@ -2,11 +2,11 @@ package io.cloudsoft.winrm4j.service.shell; import java.math.BigInteger; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; @XmlAccessorType(XmlAccessType.FIELD) diff --git a/service/src/main/java/io/cloudsoft/winrm4j/service/shell/DesiredStreamType.java b/service/src/main/java/io/cloudsoft/winrm4j/service/shell/DesiredStreamType.java index b6df391f..0b78cae8 100644 --- a/service/src/main/java/io/cloudsoft/winrm4j/service/shell/DesiredStreamType.java +++ b/service/src/main/java/io/cloudsoft/winrm4j/service/shell/DesiredStreamType.java @@ -1,11 +1,11 @@ package io.cloudsoft.winrm4j.service.shell; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; @XmlAccessorType(XmlAccessType.FIELD) diff --git a/service/src/main/java/io/cloudsoft/winrm4j/service/shell/EnvironmentVariable.java b/service/src/main/java/io/cloudsoft/winrm4j/service/shell/EnvironmentVariable.java index bc5ebcd4..aaafa4ad 100644 --- a/service/src/main/java/io/cloudsoft/winrm4j/service/shell/EnvironmentVariable.java +++ b/service/src/main/java/io/cloudsoft/winrm4j/service/shell/EnvironmentVariable.java @@ -1,11 +1,11 @@ package io.cloudsoft.winrm4j.service.shell; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; @XmlAccessorType(XmlAccessType.FIELD) diff --git a/service/src/main/java/io/cloudsoft/winrm4j/service/shell/EnvironmentVariableList.java b/service/src/main/java/io/cloudsoft/winrm4j/service/shell/EnvironmentVariableList.java index a55bf434..0ef135c2 100644 --- a/service/src/main/java/io/cloudsoft/winrm4j/service/shell/EnvironmentVariableList.java +++ b/service/src/main/java/io/cloudsoft/winrm4j/service/shell/EnvironmentVariableList.java @@ -3,10 +3,10 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; @XmlAccessorType(XmlAccessType.FIELD) diff --git a/service/src/main/java/io/cloudsoft/winrm4j/service/shell/Receive.java b/service/src/main/java/io/cloudsoft/winrm4j/service/shell/Receive.java index 000a6704..f08b6b4e 100644 --- a/service/src/main/java/io/cloudsoft/winrm4j/service/shell/Receive.java +++ b/service/src/main/java/io/cloudsoft/winrm4j/service/shell/Receive.java @@ -1,10 +1,10 @@ package io.cloudsoft.winrm4j.service.shell; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; @XmlAccessorType(XmlAccessType.FIELD) diff --git a/service/src/main/java/io/cloudsoft/winrm4j/service/shell/ReceiveResponse.java b/service/src/main/java/io/cloudsoft/winrm4j/service/shell/ReceiveResponse.java index 46df995e..5ee0f0fb 100644 --- a/service/src/main/java/io/cloudsoft/winrm4j/service/shell/ReceiveResponse.java +++ b/service/src/main/java/io/cloudsoft/winrm4j/service/shell/ReceiveResponse.java @@ -4,12 +4,12 @@ import java.math.BigInteger; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; @XmlAccessorType(XmlAccessType.FIELD) diff --git a/service/src/main/java/io/cloudsoft/winrm4j/service/shell/Shell.java b/service/src/main/java/io/cloudsoft/winrm4j/service/shell/Shell.java index 4107ad9b..7ba264eb 100644 --- a/service/src/main/java/io/cloudsoft/winrm4j/service/shell/Shell.java +++ b/service/src/main/java/io/cloudsoft/winrm4j/service/shell/Shell.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlList; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlList; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; import javax.xml.datatype.Duration; import org.w3c.dom.Element; diff --git a/service/src/main/java/io/cloudsoft/winrm4j/service/shell/SignalResponse.java b/service/src/main/java/io/cloudsoft/winrm4j/service/shell/SignalResponse.java index 76bdb690..308718d1 100644 --- a/service/src/main/java/io/cloudsoft/winrm4j/service/shell/SignalResponse.java +++ b/service/src/main/java/io/cloudsoft/winrm4j/service/shell/SignalResponse.java @@ -3,10 +3,10 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlType; import org.w3c.dom.Element; diff --git a/service/src/main/java/io/cloudsoft/winrm4j/service/shell/StreamType.java b/service/src/main/java/io/cloudsoft/winrm4j/service/shell/StreamType.java index 1a3df78d..3111ac61 100644 --- a/service/src/main/java/io/cloudsoft/winrm4j/service/shell/StreamType.java +++ b/service/src/main/java/io/cloudsoft/winrm4j/service/shell/StreamType.java @@ -1,12 +1,12 @@ package io.cloudsoft.winrm4j.service.shell; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; @XmlAccessorType(XmlAccessType.FIELD) diff --git a/service/src/main/java/io/cloudsoft/winrm4j/service/shell/package-info.java b/service/src/main/java/io/cloudsoft/winrm4j/service/shell/package-info.java index 2a977e01..6f281f9e 100644 --- a/service/src/main/java/io/cloudsoft/winrm4j/service/shell/package-info.java +++ b/service/src/main/java/io/cloudsoft/winrm4j/service/shell/package-info.java @@ -1,2 +1,2 @@ -@javax.xml.bind.annotation.XmlSchema(namespace = "http://schemas.microsoft.com/wbem/wsman/1/windows/shell", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://schemas.microsoft.com/wbem/wsman/1/windows/shell", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package io.cloudsoft.winrm4j.service.shell; diff --git a/service/src/main/java/io/cloudsoft/winrm4j/service/transfer/ResourceCreated.java b/service/src/main/java/io/cloudsoft/winrm4j/service/transfer/ResourceCreated.java index 3c55a30c..99f44295 100644 --- a/service/src/main/java/io/cloudsoft/winrm4j/service/transfer/ResourceCreated.java +++ b/service/src/main/java/io/cloudsoft/winrm4j/service/transfer/ResourceCreated.java @@ -3,10 +3,10 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlType; import org.w3c.dom.Element; diff --git a/service/src/main/java/io/cloudsoft/winrm4j/service/wsman/CommandResponse.java b/service/src/main/java/io/cloudsoft/winrm4j/service/wsman/CommandResponse.java index 832b979a..a43d99cc 100644 --- a/service/src/main/java/io/cloudsoft/winrm4j/service/wsman/CommandResponse.java +++ b/service/src/main/java/io/cloudsoft/winrm4j/service/wsman/CommandResponse.java @@ -1,10 +1,10 @@ package io.cloudsoft.winrm4j.service.wsman; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; @XmlAccessorType(XmlAccessType.FIELD) diff --git a/service/src/main/java/io/cloudsoft/winrm4j/service/wsman/Locale.java b/service/src/main/java/io/cloudsoft/winrm4j/service/wsman/Locale.java index 5c6bef79..27bdeee6 100644 --- a/service/src/main/java/io/cloudsoft/winrm4j/service/wsman/Locale.java +++ b/service/src/main/java/io/cloudsoft/winrm4j/service/wsman/Locale.java @@ -1,10 +1,10 @@ package io.cloudsoft.winrm4j.service.wsman; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; @XmlAccessorType(XmlAccessType.FIELD) diff --git a/service/src/main/java/io/cloudsoft/winrm4j/service/wsman/OptionSetType.java b/service/src/main/java/io/cloudsoft/winrm4j/service/wsman/OptionSetType.java index 0eeaf715..57cd7588 100644 --- a/service/src/main/java/io/cloudsoft/winrm4j/service/wsman/OptionSetType.java +++ b/service/src/main/java/io/cloudsoft/winrm4j/service/wsman/OptionSetType.java @@ -5,11 +5,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; import javax.xml.namespace.QName; diff --git a/service/src/main/java/io/cloudsoft/winrm4j/service/wsman/OptionType.java b/service/src/main/java/io/cloudsoft/winrm4j/service/wsman/OptionType.java index 379bbd6b..93f98d90 100644 --- a/service/src/main/java/io/cloudsoft/winrm4j/service/wsman/OptionType.java +++ b/service/src/main/java/io/cloudsoft/winrm4j/service/wsman/OptionType.java @@ -1,14 +1,14 @@ package io.cloudsoft.winrm4j.service.wsman; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.namespace.QName; diff --git a/service/src/main/java/io/cloudsoft/winrm4j/service/wsman/SelectorSetType.java b/service/src/main/java/io/cloudsoft/winrm4j/service/wsman/SelectorSetType.java index ac0eb61a..f7df5708 100644 --- a/service/src/main/java/io/cloudsoft/winrm4j/service/wsman/SelectorSetType.java +++ b/service/src/main/java/io/cloudsoft/winrm4j/service/wsman/SelectorSetType.java @@ -5,11 +5,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; import javax.xml.namespace.QName; diff --git a/service/src/main/java/io/cloudsoft/winrm4j/service/wsman/SelectorType.java b/service/src/main/java/io/cloudsoft/winrm4j/service/wsman/SelectorType.java index c0581ef6..9fbbf4f3 100644 --- a/service/src/main/java/io/cloudsoft/winrm4j/service/wsman/SelectorType.java +++ b/service/src/main/java/io/cloudsoft/winrm4j/service/wsman/SelectorType.java @@ -5,16 +5,16 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyAttribute; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.namespace.QName; import org.w3c.dom.Element; diff --git a/service/src/main/java/io/cloudsoft/winrm4j/service/wsman/Signal.java b/service/src/main/java/io/cloudsoft/winrm4j/service/wsman/Signal.java index d2222e3c..0600479c 100644 --- a/service/src/main/java/io/cloudsoft/winrm4j/service/wsman/Signal.java +++ b/service/src/main/java/io/cloudsoft/winrm4j/service/wsman/Signal.java @@ -1,11 +1,11 @@ package io.cloudsoft.winrm4j.service.wsman; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; @XmlAccessorType(XmlAccessType.FIELD) diff --git a/service/src/main/java/io/cloudsoft/winrm4j/service/wsman/package-info.java b/service/src/main/java/io/cloudsoft/winrm4j/service/wsman/package-info.java index 58e1b413..6eae0d1a 100644 --- a/service/src/main/java/io/cloudsoft/winrm4j/service/wsman/package-info.java +++ b/service/src/main/java/io/cloudsoft/winrm4j/service/wsman/package-info.java @@ -1,2 +1,2 @@ -@javax.xml.bind.annotation.XmlSchema(namespace = "http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package io.cloudsoft.winrm4j.service.wsman; diff --git a/service/src/test/java/io/cloudsoft/winrm4j/service/ExampleServer.java b/service/src/test/java/io/cloudsoft/winrm4j/service/ExampleServer.java index 7ee872c2..996f85a2 100644 --- a/service/src/test/java/io/cloudsoft/winrm4j/service/ExampleServer.java +++ b/service/src/test/java/io/cloudsoft/winrm4j/service/ExampleServer.java @@ -1,6 +1,6 @@ package io.cloudsoft.winrm4j.service; -import javax.xml.ws.Endpoint; +import jakarta.xml.ws.Endpoint; public class ExampleServer { diff --git a/winrm4j/pom.xml b/winrm4j/pom.xml index d0fb3133..fb91401c 100644 --- a/winrm4j/pom.xml +++ b/winrm4j/pom.xml @@ -26,7 +26,7 @@ io.cloudsoft.windows winrm4j-parent - 0.12.3 + 0.12.4-SNAPSHOT Java WinRM library @@ -72,7 +72,7 @@ * Summary of conclusions: https://lists.apache.org/thread.html/f24c5833eb0ffda00021a57a606e143a4f5a2b7971df4e11406df1a6%40%3Cdev.brooklyn.apache.org%3E --> - javax.xml.bind*;version=!, + jakarta.xml.bind*;version=!, * diff --git a/winrm4j/src/main/java/io/cloudsoft/winrm4j/winrm/WinRmTool.java b/winrm4j/src/main/java/io/cloudsoft/winrm4j/winrm/WinRmTool.java index 410cc029..d461146a 100644 --- a/winrm4j/src/main/java/io/cloudsoft/winrm4j/winrm/WinRmTool.java +++ b/winrm4j/src/main/java/io/cloudsoft/winrm4j/winrm/WinRmTool.java @@ -446,7 +446,7 @@ public WinRmToolResponse executePs(List commands, Writer out, Writer err private String compilePs(String psScript) { byte[] cmd = psScript.getBytes(Charset.forName("UTF-16LE")); - String arg = javax.xml.bind.DatatypeConverter.printBase64Binary(cmd); + String arg = jakarta.xml.bind.DatatypeConverter.printBase64Binary(cmd); return "powershell -encodedcommand " + arg; }