Skip to content

Commit 7648d84

Browse files
NassimBtkNassimBtk
authored
Merge pull request #44 from sentrysoftware/dependabot/maven/org.apache.cxf-cxf-rt-frontend-jaxws-4.1.0
Bump org.apache.cxf:cxf-rt-frontend-jaxws from 3.5.0 to 4.1.0
2 parents 79f6c7a + 06e50a1 commit 7648d84

File tree

12 files changed

+114
-78
lines changed

12 files changed

+114
-78
lines changed

‎pom.xml‎

Lines changed: 47 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<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">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
24
<modelVersion>4.0.0</modelVersion>
35

46
<parent>
@@ -7,7 +9,6 @@
79
<version>2</version>
810
</parent>
911

10-
<groupId>org.sentrysoftware</groupId>
1112
<artifactId>winrm</artifactId>
1213
<version>1.1.01-SNAPSHOT</version>
1314

@@ -57,8 +58,8 @@
5758
</roles>
5859
</developer>
5960
<developer>
60-
<name>Kawtar Bakour (@KawtarBK9)</name>
61-
<email>kawtar@sentrysoftware.com</email>
61+
<name>Safae Ajib (@SafaeAJ)</name>
62+
<email>safae@sentrysoftware.com</email>
6263
<roles>
6364
<role>maintainer</role>
6465
</roles>
@@ -73,8 +74,8 @@
7374
</developers>
7475

7576
<properties>
76-
<!-- Java 8 -->
77-
<maven.compiler.release>8</maven.compiler.release>
77+
<!-- Java 11 -->
78+
<maven.compiler.release>11</maven.compiler.release>
7879

7980
<!-- Reproducible Build -->
8081
<!-- See https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
@@ -105,25 +106,35 @@
105106
<scope>test</scope>
106107
</dependency>
107108
<dependency>
108-
<groupId>javax.xml.bind</groupId>
109-
<artifactId>jaxb-api</artifactId>
110-
<version>2.3.1</version>
109+
<groupId>jakarta.xml.bind</groupId>
110+
<artifactId>jakarta.xml.bind-api</artifactId>
111+
<version>4.0.2</version>
111112
</dependency>
112113
<dependency>
113114
<groupId>org.apache.cxf</groupId>
114115
<artifactId>cxf-rt-frontend-jaxws</artifactId>
115-
<version>3.5.10</version>
116+
<version>4.1.0</version>
116117
</dependency>
117118
<dependency>
118119
<groupId>org.apache.cxf</groupId>
119120
<artifactId>cxf-rt-transports-http-hc</artifactId>
120-
<version>3.5.10</version>
121+
<version>4.1.0</version>
121122
</dependency>
122123
<dependency>
123124
<groupId>com.hierynomus</groupId>
124125
<artifactId>smbj</artifactId>
125126
<version>0.14.0</version>
126127
</dependency>
128+
<dependency>
129+
<groupId>jakarta.xml.ws</groupId>
130+
<artifactId>jakarta.xml.ws-api</artifactId>
131+
<version>4.0.2</version>
132+
</dependency>
133+
<dependency>
134+
<groupId>com.sun.xml.ws</groupId>
135+
<artifactId>jaxws-rt</artifactId>
136+
<version>4.0.2</version>
137+
</dependency>
127138
<dependency>
128139
<groupId>org.mockito</groupId>
129140
<artifactId>mockito-inline</artifactId>
@@ -136,34 +147,42 @@
136147

137148
<!-- Actual build plugins -->
138149
<plugins>
139-
150+
140151
<plugin>
141-
<groupId>org.codehaus.mojo</groupId>
142-
<artifactId>jaxws-maven-plugin</artifactId>
143-
<version>2.6</version>
152+
<groupId>org.apache.cxf</groupId>
153+
<artifactId>cxf-codegen-plugin</artifactId>
154+
<version>4.1.0</version>
144155
<executions>
145156
<execution>
146-
<id>import-wsdl</id>
157+
<id>generate-cxf-stubs</id>
158+
<phase>generate-sources</phase>
147159
<goals>
148-
<goal>wsimport</goal>
160+
<goal>wsdl2java</goal>
149161
</goals>
150162
<configuration>
151-
<extension>true</extension>
152-
<keep>true</keep>
153-
<xnocompile>true</xnocompile>
154-
<bindingFiles>
155-
<bindingFile>${basedir}/src/main/resources/jaxws/bindings.xml</bindingFile>
156-
</bindingFiles>
157-
<wsdlDirectory>${basedir}/src/main/resources/wsdl</wsdlDirectory>
158-
<args>
159-
<arg>-clientjar</arg>
160-
<arg>${project.build.directory}/wsdl.jar</arg>
161-
</args>
163+
<sourceRoot>${project.build.directory}/generated-sources/cxf</sourceRoot>
164+
<wsdlOptions>
165+
<wsdlOption>
166+
<wsdl>${project.basedir}/src/main/resources/wsdl/WinRM.wsdl</wsdl>
167+
168+
<bindingFiles>
169+
<bindingFile>
170+
${project.basedir}/src/main/resources/jaxws/bindings.xml</bindingFile>
171+
</bindingFiles>
172+
173+
<extraargs>
174+
<extraarg>-validate=basic</extraarg> <!-- enables basic validation -->
175+
<extraarg>-keep</extraarg> <!-- Keeps the generated sources -->
176+
</extraargs>
177+
178+
</wsdlOption>
179+
</wsdlOptions>
162180
</configuration>
163181
</execution>
164182
</executions>
165183
</plugin>
166184

185+
167186
</plugins>
168187
</build>
169188

‎src/main/java/org/sentrysoftware/winrm/service/StripShellResponseHandler.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,20 @@
2020
* ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
2121
*/
2222

23-
import static javax.xml.ws.handler.MessageContext.WSDL_OPERATION;
23+
import static jakarta.xml.ws.handler.MessageContext.WSDL_OPERATION;
2424

2525
import java.util.Collections;
2626
import java.util.Iterator;
2727
import java.util.Set;
2828

2929
import javax.xml.namespace.QName;
30-
import javax.xml.soap.SOAPBody;
31-
import javax.xml.soap.SOAPElement;
32-
import javax.xml.soap.SOAPEnvelope;
33-
import javax.xml.soap.SOAPException;
34-
import javax.xml.ws.handler.MessageContext;
35-
import javax.xml.ws.handler.soap.SOAPHandler;
36-
import javax.xml.ws.handler.soap.SOAPMessageContext;
30+
import jakarta.xml.soap.SOAPBody;
31+
import jakarta.xml.soap.SOAPElement;
32+
import jakarta.xml.soap.SOAPEnvelope;
33+
import jakarta.xml.soap.SOAPException;
34+
import jakarta.xml.ws.handler.MessageContext;
35+
import jakarta.xml.ws.handler.soap.SOAPHandler;
36+
import jakarta.xml.ws.handler.soap.SOAPMessageContext;
3737

3838
/**
3939
* Code from io.cloudsoft.winrm4j.client.StripShellResponseHandler

‎src/main/java/org/sentrysoftware/winrm/service/WSManHeaderInterceptor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222

2323
import java.util.List;
2424

25-
import javax.xml.bind.JAXBElement;
26-
import javax.xml.bind.JAXBException;
25+
import jakarta.xml.bind.JAXBElement;
26+
import jakarta.xml.bind.JAXBException;
2727

2828
import org.apache.cxf.binding.soap.SoapMessage;
2929
import org.apache.cxf.binding.soap.interceptor.AbstractSoapInterceptor;

‎src/main/java/org/sentrysoftware/winrm/service/WinRMInvocationHandler.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@
4040

4141
import javax.net.ssl.TrustManager;
4242
import javax.xml.namespace.QName;
43-
import javax.xml.ws.BindingProvider;
44-
import javax.xml.ws.WebServiceException;
45-
import javax.xml.ws.handler.Handler;
46-
import javax.xml.ws.soap.SOAPFaultException;
43+
import jakarta.xml.ws.BindingProvider;
44+
import jakarta.xml.ws.WebServiceException;
45+
import jakarta.xml.ws.handler.Handler;
46+
import jakarta.xml.ws.soap.SOAPFaultException;
4747

4848
import org.apache.cxf.Bus;
4949
import org.apache.cxf.binding.soap.SoapBindingConstants;

‎src/main/java/org/sentrysoftware/winrm/service/WinRMService.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@
4444
import java.util.stream.Collectors;
4545
import java.util.stream.IntStream;
4646

47-
import javax.xml.bind.JAXBElement;
47+
import jakarta.xml.bind.JAXBElement;
4848
import javax.xml.namespace.QName;
4949
import javax.xml.parsers.DocumentBuilderFactory;
5050
import javax.xml.parsers.ParserConfigurationException;
51-
import javax.xml.ws.BindingProvider;
52-
import javax.xml.ws.soap.SOAPFaultException;
51+
import jakarta.xml.ws.BindingProvider;
52+
import jakarta.xml.ws.soap.SOAPFaultException;
5353
import javax.xml.xpath.XPath;
5454
import javax.xml.xpath.XPathExpressionException;
5555
import javax.xml.xpath.XPathFactory;

‎src/main/java/org/sentrysoftware/winrm/service/client/StripShellResponseHandler.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,20 @@
2020
* ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
2121
*/
2222

23-
import static javax.xml.ws.handler.MessageContext.WSDL_OPERATION;
23+
import static jakarta.xml.ws.handler.MessageContext.WSDL_OPERATION;
2424

2525
import java.util.Collections;
2626
import java.util.Iterator;
2727
import java.util.Set;
2828

2929
import javax.xml.namespace.QName;
30-
import javax.xml.soap.SOAPBody;
31-
import javax.xml.soap.SOAPElement;
32-
import javax.xml.soap.SOAPEnvelope;
33-
import javax.xml.soap.SOAPException;
34-
import javax.xml.ws.handler.MessageContext;
35-
import javax.xml.ws.handler.soap.SOAPHandler;
36-
import javax.xml.ws.handler.soap.SOAPMessageContext;
30+
import jakarta.xml.soap.SOAPBody;
31+
import jakarta.xml.soap.SOAPElement;
32+
import jakarta.xml.soap.SOAPEnvelope;
33+
import jakarta.xml.soap.SOAPException;
34+
import jakarta.xml.ws.handler.MessageContext;
35+
import jakarta.xml.ws.handler.soap.SOAPHandler;
36+
import jakarta.xml.ws.handler.soap.SOAPMessageContext;
3737

3838
/**
3939
* Code from io.cloudsoft.winrm4j.client.StripShellResponseHandler

‎src/main/java/org/sentrysoftware/winrm/service/client/WSManHeaderInterceptor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222

2323
import java.util.List;
2424

25-
import javax.xml.bind.JAXBElement;
26-
import javax.xml.bind.JAXBException;
25+
import jakarta.xml.bind.JAXBElement;
26+
import jakarta.xml.bind.JAXBException;
2727

2828
import org.apache.cxf.binding.soap.SoapMessage;
2929
import org.apache.cxf.binding.soap.interceptor.AbstractSoapInterceptor;

‎src/main/java/org/sentrysoftware/winrm/service/client/WinRMInvocationHandler.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@
4040

4141
import javax.net.ssl.TrustManager;
4242
import javax.xml.namespace.QName;
43-
import javax.xml.ws.BindingProvider;
44-
import javax.xml.ws.WebServiceException;
45-
import javax.xml.ws.handler.Handler;
46-
import javax.xml.ws.soap.SOAPFaultException;
43+
import jakarta.xml.ws.BindingProvider;
44+
import jakarta.xml.ws.WebServiceException;
45+
import jakarta.xml.ws.handler.Handler;
46+
import jakarta.xml.ws.soap.SOAPFaultException;
4747

4848
import org.apache.cxf.Bus;
4949
import org.apache.cxf.binding.soap.SoapBindingConstants;

‎src/main/java/org/sentrysoftware/winrm/service/client/encryption/AsyncHttpEncryptionAwareConduit.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ protected void setupConnection(
121121
final BasicHttpEntity entity = new EncryptionAwareHttpEntity() {
122122
@Override
123123
public boolean isRepeatable() {
124-
return requestEntity.getOutputStream().retransmitable();
124+
return requestEntity.getEntity().isRepeatable();
125125
}
126126

127127
@Override

‎src/main/resources/jaxws/bindings.xml‎

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,48 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<jaxws:bindings xmlns:jaxws="http://java.sun.com/xml/ns/jaxws" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xs="http://www.w3.org/2001/XMLSchema" version="2.0">
3-
<jaxws:package name="org.sentrysoftware.winrm.service"/>
2+
<jaxws:bindings xmlns:jaxws="https://jakarta.ee/xml/ns/jaxws"
3+
xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
4+
xmlns:xjc="https://jakarta.ee/xml/ns/jaxb/xjc"
5+
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
6+
xmlns:xs="http://www.w3.org/2001/XMLSchema"
7+
version="3.0"> <!-- Updated to Jakarta version -->
8+
9+
<jaxws:package name="org.sentrysoftware.winrm.service" />
410
<jaxws:enableWrapperStyle>false</jaxws:enableWrapperStyle>
511
<jaxws:enableAsyncMapping>false</jaxws:enableAsyncMapping>
6-
<jaxws:bindings schemaLocation="../xsd/dsp8033_1.0.xsd" node="wsdl:definitions/wsdl:types/xs:schema[@targetNamespace='http://schemas.xmlsoap.org/ws/2004/09/enumeration']">
7-
<jaxb:globalBindings xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
12+
13+
<jaxws:bindings schemaLocation="../xsd/dsp8033_1.0.xsd"
14+
node="wsdl:definitions/wsdl:types/xs:schema[@targetNamespace='http://schemas.xmlsoap.org/ws/2004/09/enumeration']">
15+
<jaxb:globalBindings xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
16+
xmlns:xs="http://www.w3.org/2001/XMLSchema" />
817
<jaxb:schemaBindings>
9-
<jaxb:package name="org.sentrysoftware.winrm.service.enumeration"/>
18+
<jaxb:package name="org.sentrysoftware.winrm.service.enumeration" />
1019
</jaxb:schemaBindings>
1120
</jaxws:bindings>
12-
<jaxws:bindings node="wsdl:definitions/wsdl:types/xs:schema[@targetNamespace='http://schemas.microsoft.com/wbem/wsman/1/windows/shell']">
13-
<jaxb:globalBindings xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
21+
22+
<jaxws:bindings
23+
node="wsdl:definitions/wsdl:types/xs:schema[@targetNamespace='http://schemas.microsoft.com/wbem/wsman/1/windows/shell']">
24+
<jaxb:globalBindings xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
25+
xmlns:xs="http://www.w3.org/2001/XMLSchema" />
1426
<jaxb:schemaBindings>
15-
<jaxb:package name="org.sentrysoftware.winrm.service.shell"/>
27+
<jaxb:package name="org.sentrysoftware.winrm.service.shell" />
1628
</jaxb:schemaBindings>
1729
</jaxws:bindings>
18-
<jaxws:bindings schemaLocation="../xsd/transfer.xsd" node="wsdl:definitions/wsdl:types/xs:schema[@targetNamespace='http://schemas.xmlsoap.org/ws/2004/09/transfer']">
19-
<jaxb:globalBindings xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
30+
31+
<jaxws:bindings schemaLocation="../xsd/transfer.xsd"
32+
node="wsdl:definitions/wsdl:types/xs:schema[@targetNamespace='http://schemas.xmlsoap.org/ws/2004/09/transfer']">
33+
<jaxb:globalBindings xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
34+
xmlns:xs="http://www.w3.org/2001/XMLSchema" />
2035
<jaxb:schemaBindings>
21-
<jaxb:package name="org.sentrysoftware.winrm.service.transfer"/>
36+
<jaxb:package name="org.sentrysoftware.winrm.service.transfer" />
2237
</jaxb:schemaBindings>
2338
</jaxws:bindings>
24-
<jaxws:bindings schemaLocation="../xsd/wsman.xsd" node="wsdl:definitions/wsdl:types/xs:schema[@targetNamespace='http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd']">
25-
<jaxb:globalBindings xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
39+
40+
<jaxws:bindings schemaLocation="../xsd/wsman.xsd"
41+
node="wsdl:definitions/wsdl:types/xs:schema[@targetNamespace='http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd']">
42+
<jaxb:globalBindings xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
43+
xmlns:xs="http://www.w3.org/2001/XMLSchema" />
2644
<jaxb:schemaBindings>
27-
<jaxb:package name="org.sentrysoftware.winrm.service.wsman"/>
45+
<jaxb:package name="org.sentrysoftware.winrm.service.wsman" />
2846
</jaxb:schemaBindings>
2947
</jaxws:bindings>
3048
</jaxws:bindings>

0 commit comments

Comments
 (0)