Skip to content

Commit e70d359

Browse files
cortleppcortlepp
authored
Merge pull request #893 from cortlepp/cortlepp/fix-deprecation-warnings
fix: deprecation warnings
2 parents 833344d + 5beaaad commit e70d359

File tree

20 files changed

+102
-182
lines changed

20 files changed

+102
-182
lines changed

‎modules/clustering/pom.xml‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -125,16 +125,10 @@
125125
<artifactId>maven-surefire-plugin</artifactId>
126126
<inherited>true</inherited>
127127
<configuration>
128-
<systemProperties>
129-
<property>
130-
<name>maven.test.haltafterfailure</name>
131-
<value>false</value>
132-
</property>
133-
<property>
134-
<name>run.clustering.tests</name>
135-
<value>${run.clustering.tests}</value>
136-
</property>
137-
</systemProperties>
128+
<systemPropertyVariables>
129+
<maven.test.haltafterfailure>false</maven.test.haltafterfailure>
130+
<run.clustering.tests>${run.clustering.tests}</run.clustering.tests>
131+
</systemPropertyVariables>
138132
<excludes>
139133
<exclude>**/UpdateStateTest.java</exclude>
140134
<exclude>**/ConfigurationManagerTest.java</exclude>

‎modules/fastinfoset/pom.xml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -259,12 +259,9 @@
259259
<includes>
260260
<include>**/*Test.java</include>
261261
</includes>
262-
<systemProperties>
263-
<property>
264-
<name>build.repository</name>
265-
<value>./target/test-classes</value>
266-
</property>
267-
</systemProperties>
262+
<systemPropertyVariables>
263+
<build.repository>./target/test-classes</build.repository>
264+
</systemPropertyVariables>
268265
</configuration>
269266
</plugin>
270267
</plugins>

‎modules/integration/pom.xml‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -578,21 +578,12 @@
578578
<exclude>**/ComplexDataTypesDocLitBareTest.java</exclude>
579579
<exclude>**/ComplexDataTypesTest.java</exclude>
580580
</excludes>
581-
<systemProperties>
582-
<property>
583-
<name>build.repository</name>
584-
<value>./target/test-classes</value>
585-
</property>
581+
<systemPropertyVariables>
582+
<build.repository>./target/test-classes</build.repository>
586583
<!-- Prevent Mac OS X from showing an icon in the dock during the test run -->
587-
<property>
588-
<name>java.awt.headless</name>
589-
<value>true</value>
590-
</property>
591-
<property>
592-
<name>org.apache.axis2.transport.http.server.fastShutdown</name>
593-
<value>true</value>
594-
</property>
595-
</systemProperties>
584+
<java.awt.headless>true</java.awt.headless>
585+
<org.apache.axis2.transport.http.server.fastShutdown>true</org.apache.axis2.transport.http.server.fastShutdown>
586+
</systemPropertyVariables>
596587
</configuration>
597588
</plugin>
598589
<plugin>

‎modules/jaxbri-codegen/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@
175175
<artifactId>maven-surefire-plugin</artifactId>
176176
<inherited>true</inherited>
177177
<configuration>
178-
<forkMode>once</forkMode>
179178
<includes>
180179
<include>**/*Test.java</include>
181180
</includes>

‎modules/jaxws-integration/pom.xml‎

Lines changed: 10 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1387,41 +1387,17 @@
13871387
<include>**/*Test.java</include>
13881388
<include>**/*Tests.java</include>
13891389
</includes>
1390-
<systemProperties>
1391-
<property>
1392-
<name>javax.xml.accessExternalSchema</name>
1393-
<value>all</value>
1394-
</property>
1395-
<property>
1396-
<name>OASISCatalogManager.catalog.debug.level</name>
1397-
<value>0</value>
1398-
</property>
1399-
<property>
1400-
<name>jakarta.xml.soap.MessageFactory</name>
1401-
<value>org.apache.axis2.saaj.MessageFactoryImpl</value>
1402-
</property>
1403-
<property>
1404-
<name>jakarta.xml.soap.SOAPFactory</name>
1405-
<value>org.apache.axis2.saaj.SOAPFactoryImpl</value>
1406-
</property>
1407-
<property>
1408-
<name>jakarta.xml.soap.SOAPConnectionFactory</name>
1409-
<value>org.apache.axis2.saaj.SOAPConnectionFactoryImpl</value>
1410-
</property>
1411-
<property>
1412-
<name>jakarta.xml.soap.MetaFactory</name>
1413-
<value>org.apache.axis2.saaj.SAAJMetaFactoryImpl</value>
1414-
</property>
1390+
<systemPropertyVariables>
1391+
<javax.xml.accessExternalSchema>all</javax.xml.accessExternalSchema>
1392+
<OASISCatalogManager.catalog.debug.level>0</OASISCatalogManager.catalog.debug.level>
1393+
<jakarta.xml.soap.MessageFactory>org.apache.axis2.saaj.MessageFactoryImpl</jakarta.xml.soap.MessageFactory>
1394+
<jakarta.xml.soap.SOAPFactory>org.apache.axis2.saaj.SOAPFactoryImpl</jakarta.xml.soap.SOAPFactory>
1395+
<jakarta.xml.soap.SOAPConnectionFactory>org.apache.axis2.saaj.SOAPConnectionFactoryImpl</jakarta.xml.soap.SOAPConnectionFactory>
1396+
<jakarta.xml.soap.MetaFactory>org.apache.axis2.saaj.SAAJMetaFactoryImpl</jakarta.xml.soap.MetaFactory>
14151397
<!-- Prevent Mac OS X from showing an icon in the dock during the test run -->
1416-
<property>
1417-
<name>java.awt.headless</name>
1418-
<value>true</value>
1419-
</property>
1420-
<property>
1421-
<name>org.apache.axis2.transport.http.server.fastShutdown</name>
1422-
<value>true</value>
1423-
</property>
1424-
</systemProperties>
1398+
<java.awt.headless>true</java.awt.headless>
1399+
<org.apache.axis2.transport.http.server.fastShutdown>true</org.apache.axis2.transport.http.server.fastShutdown>
1400+
</systemPropertyVariables>
14251401
</configuration>
14261402
</plugin>
14271403
<plugin>

‎modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/proxy/doclitnonwrapped/META-INF/proxy_doclit_unwr.wsdl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
</wsdl:message>
7070

7171
<wsdl:portType name="DocLitnonWrappedProxy">
72-
<jaxws:bindings xmlns:jaxws="http://java.sun.com/xml/ns/jaxws">
72+
<jaxws:bindings xmlns:jaxws="https://jakarta.ee/xml/ns/jaxws">
7373
<jaxws:enableWrapperStyle>false</jaxws:enableWrapperStyle>
7474
<jaxws:enableAsyncMapping>true</jaxws:enableAsyncMapping>
7575
</jaxws:bindings>

‎modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/proxy/doclitwrapped/META-INF/ProxyDocLitWrapped.wsdl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@
189189
</wsdl:message>
190190

191191
<wsdl:portType name="DocLitWrappedProxy">
192-
<jaxws:bindings xmlns:jaxws="http://java.sun.com/xml/ns/jaxws">
192+
<jaxws:bindings xmlns:jaxws="https://jakarta.ee/xml/ns/jaxws">
193193
<jaxws:enableAsyncMapping>true</jaxws:enableAsyncMapping>
194194
</jaxws:bindings>
195195

‎modules/jaxws/pom.xml‎

Lines changed: 13 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -342,54 +342,28 @@
342342
<artifactId>maven-surefire-plugin</artifactId>
343343
<inherited>true</inherited>
344344
<configuration>
345-
<forkMode>once</forkMode>
346345
<argLine>${argLine} -Xms256m -Xmx512m --add-opens java.base/java.net=ALL-UNNAMED</argLine>
347346
<!-- Enable the next 2 lines if you want to attach a debugger
348347
<argLine>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006</argLine>-->
349348
<includes>
350349
<include>**/*Test.java</include>
351350
<include>**/*Tests.java</include>
352351
</includes>
353-
<systemProperties>
354-
<!--<property>
355-
<name>OASISCatalogManager.catalog.debug.level</name>
356-
<value>9999</value>
357-
</property>-->
358-
<property>
359-
<name>build.repository</name>
360-
<value>./target/test-classes</value>
361-
</property>
362-
<property>
363-
<name>jakarta.xml.soap.MessageFactory</name>
364-
<value>org.apache.axis2.saaj.MessageFactoryImpl</value>
365-
</property>
366-
<property>
367-
<name>jakarta.xml.soap.SOAPFactory</name>
368-
<value>org.apache.axis2.saaj.SOAPFactoryImpl</value>
369-
</property>
370-
<property>
371-
<name>jakarta.xml.soap.SOAPConnectionFactory</name>
372-
<value>org.apache.axis2.saaj.SOAPConnectionFactoryImpl</value>
373-
</property>
374-
<property>
375-
<name>jakarta.xml.soap.MetaFactory</name>
376-
<value>org.apache.axis2.saaj.SAAJMetaFactoryImpl</value>
377-
</property>
352+
<systemPropertyVariables>
353+
<!--
354+
<OASISCatalogManager.catalog.debug.level>9999</OASISCatalogManager.catalog.debug.level>
355+
-->
356+
<build.repository>./target/test-classes</build.repository>
357+
<jakarta.xml.soap.MessageFactory>org.apache.axis2.saaj.MessageFactoryImpl</jakarta.xml.soap.MessageFactory>
358+
<jakarta.xml.soap.SOAPFactory>org.apache.axis2.saaj.SOAPFactoryImpl</jakarta.xml.soap.SOAPFactory>
359+
<jakarta.xml.soap.SOAPConnectionFactory>org.apache.axis2.saaj.SOAPConnectionFactoryImpl</jakarta.xml.soap.SOAPConnectionFactory>
360+
<jakarta.xml.soap.MetaFactory>org.apache.axis2.saaj.SAAJMetaFactoryImpl</jakarta.xml.soap.MetaFactory>
378361
<!-- Need this for the client side to pickup an axis2.xml to configure SoapMessageMUProviderChecker -->
379-
<property>
380-
<name>org.apache.axis2.jaxws.config.path</name>
381-
<value>./target/test-classes/axis2.xml</value>
382-
</property>
383-
<property>
384-
<name>org.apache.axis2.jaxws.repo.path</name>
385-
<value>./target/repository</value>
386-
</property>
362+
<org.apache.axis2.jaxws.config.path>./target/test-classes/axis2.xml</org.apache.axis2.jaxws.config.path>
363+
<org.apache.axis2.jaxws.repo.path>./target/repository</org.apache.axis2.jaxws.repo.path>
387364
<!-- Prevent Mac OS X from showing an icon in the dock during the test run -->
388-
<property>
389-
<name>java.awt.headless</name>
390-
<value>true</value>
391-
</property>
392-
</systemProperties>
365+
<java.awt.headless>true</java.awt.headless>
366+
</systemPropertyVariables>
393367
</configuration>
394368
</plugin>
395369
</plugins>

‎modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -320,17 +320,10 @@ public void addMetaData(OMNode metaData) {
320320

321321
}
322322

323-
/**
324-
* @deprecated
325-
*/
326323
public String getName() {
327324
return name;
328325
}
329326

330-
/**
331-
* @param name
332-
* @deprecated
333-
*/
334327
public void setName(String name) {
335328
this.name = name;
336329
}

‎modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ public class BuilderUtil {
7777
/**
7878
* @deprecated
7979
*/
80+
@Deprecated
8081
public static final int BOM_SIZE = 4;
8182

8283
public static SOAPEnvelope buildsoapMessage(MessageContext messageContext,
@@ -275,6 +276,7 @@ public static OMXMLParserWrapper createPOXBuilder(InputStream in, String encodin
275276
* directly to the XML parser. If the stream is not XML, you shouldn't be using this
276277
* method anyway.
277278
*/
279+
@Deprecated
278280
public static Reader getReader(final InputStream is, final String charSetEncoding)
279281
throws IOException {
280282
final PushbackInputStream is2 = getPushbackInputStream(is);
@@ -298,6 +300,7 @@ public Object run() throws UnsupportedEncodingException {
298300
* @deprecated If you need a {@link PushbackInputStream} just construct one (with the
299301
* appropriate size).
300302
*/
303+
@Deprecated
301304
public static PushbackInputStream getPushbackInputStream(InputStream is) {
302305
return new PushbackInputStream(is, BOM_SIZE);
303306
}
@@ -309,6 +312,7 @@ public static PushbackInputStream getPushbackInputStream(InputStream is) {
309312
* probably you are using a {@link Reader} where you should use an
310313
* {@link InputStream}.
311314
*/
315+
@Deprecated
312316
public static String getCharSetEncoding(PushbackInputStream is2, String defaultEncoding)
313317
throws IOException {
314318
String encoding;
@@ -584,6 +588,7 @@ public static SOAPModelBuilder createSOAPModelBuilder(InputStream in, String enc
584588
/**
585589
* @deprecated Use {@link MessageProcessorSelector#getMessageBuilder(String, MessageContext)}.
586590
*/
591+
@Deprecated
587592
public static Builder getBuilderFromSelector(String type, MessageContext msgContext)
588593
throws AxisFault {
589594
return MessageProcessorSelector.getMessageBuilder(type, msgContext);

0 commit comments

Comments
 (0)