diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 4975b645da..b20c05f923 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -225,12 +225,6 @@ ${project.groupId} axis2-transport-jms ${project.version} - - - org.apache.geronimo.specs - geronimo-jms_1.1_spec - - ${project.groupId} diff --git a/modules/jaxws-integration/pom.xml b/modules/jaxws-integration/pom.xml index 6b2b9b74c1..78db0dacc5 100644 --- a/modules/jaxws-integration/pom.xml +++ b/modules/jaxws-integration/pom.xml @@ -43,14 +43,6 @@ - - org.apache.geronimo.specs - geronimo-jaxws_2.2_spec - - - org.apache.geronimo.specs - geronimo-annotation_1.0_spec - org.apache.axis2 axis2-kernel @@ -140,6 +132,10 @@ log4j-jcl test + + xml-resolver + xml-resolver + diff --git a/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/context/MessageContextImpl.java b/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/context/MessageContextImpl.java index 9ed86b2ea9..f78fe83379 100644 --- a/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/context/MessageContextImpl.java +++ b/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/context/MessageContextImpl.java @@ -21,7 +21,7 @@ import org.apache.axis2.jaxws.context.sei.MessageContext; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import jakarta.jws.WebService; import jakarta.xml.ws.Holder; import jakarta.xml.ws.WebServiceContext; @@ -61,4 +61,4 @@ public void isPropertyPresent( } } } -} +} diff --git a/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/addnumbers/AddNumbersPortTypeImpl.java b/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/addnumbers/AddNumbersPortTypeImpl.java index 44bc8daa5e..c0f46cbfc6 100644 --- a/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/addnumbers/AddNumbersPortTypeImpl.java +++ b/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/addnumbers/AddNumbersPortTypeImpl.java @@ -21,7 +21,7 @@ import org.apache.axis2.jaxws.TestLogger; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import jakarta.jws.WebService; import jakarta.xml.ws.WebServiceContext; import jakarta.xml.ws.handler.MessageContext; diff --git a/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersHandlerPortTypeImpl.java b/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersHandlerPortTypeImpl.java index 533f66a113..88301711aa 100644 --- a/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersHandlerPortTypeImpl.java +++ b/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersHandlerPortTypeImpl.java @@ -24,7 +24,7 @@ import org.test.addnumbershandler.AddNumbersHandlerResponse; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import jakarta.jws.HandlerChain; import jakarta.jws.WebService; import jakarta.xml.ws.AsyncHandler; diff --git a/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersLogicalHandler2.java b/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersLogicalHandler2.java index 278d6388e4..2f9f709786 100644 --- a/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersLogicalHandler2.java +++ b/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersLogicalHandler2.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.StringTokenizer; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import javax.xml.transform.OutputKeys; import javax.xml.transform.Source; import javax.xml.transform.Transformer; diff --git a/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersProtocolHandler.java b/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersProtocolHandler.java index 60cac191d5..de6e416c11 100644 --- a/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersProtocolHandler.java +++ b/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersProtocolHandler.java @@ -21,7 +21,7 @@ import org.apache.axis2.jaxws.TestLogger; -import javax.annotation.PreDestroy; +import jakarta.annotation.PreDestroy; import jakarta.xml.bind.JAXBContext; import jakarta.xml.bind.JAXBElement; import javax.xml.namespace.QName; diff --git a/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/faultsservice/FaultsServiceSoapBindingImpl.java b/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/faultsservice/FaultsServiceSoapBindingImpl.java index 0c619fdc92..96d4063d6a 100644 --- a/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/faultsservice/FaultsServiceSoapBindingImpl.java +++ b/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/faultsservice/FaultsServiceSoapBindingImpl.java @@ -27,9 +27,9 @@ import org.test.polymorphicfaults.DerivedFault1; import org.test.polymorphicfaults.DerivedFault2; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.annotation.Resource; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.annotation.Resource; import jakarta.jws.WebService; import javax.xml.namespace.QName; import jakarta.xml.soap.Detail; diff --git a/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/headershandler/HeadersHandlerPortTypeImpl.java b/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/headershandler/HeadersHandlerPortTypeImpl.java index 803a029df0..025e7886f9 100644 --- a/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/headershandler/HeadersHandlerPortTypeImpl.java +++ b/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/headershandler/HeadersHandlerPortTypeImpl.java @@ -21,7 +21,7 @@ import java.util.concurrent.Future; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import jakarta.jws.HandlerChain; import jakarta.jws.WebService; import jakarta.xml.ws.AsyncHandler; diff --git a/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/resourceinjection/ResourceInjectionPortTypeImpl.java b/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/resourceinjection/ResourceInjectionPortTypeImpl.java index b30cb4d26e..49a2f80c4a 100644 --- a/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/resourceinjection/ResourceInjectionPortTypeImpl.java +++ b/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/resourceinjection/ResourceInjectionPortTypeImpl.java @@ -23,9 +23,9 @@ import org.apache.axis2.jaxws.TestLogger; import org.apache.axis2.jaxws.sample.resourceinjection.sei.ResourceInjectionPortType; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.annotation.Resource; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.annotation.Resource; import jakarta.jws.WebService; import javax.xml.namespace.QName; import jakarta.xml.ws.EndpointReference; diff --git a/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/xmlhttp/provider/message/datasource/XMessageDataSourceProvider.java b/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/xmlhttp/provider/message/datasource/XMessageDataSourceProvider.java index 02ebbf0bf1..ebe85e839d 100644 --- a/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/xmlhttp/provider/message/datasource/XMessageDataSourceProvider.java +++ b/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/xmlhttp/provider/message/datasource/XMessageDataSourceProvider.java @@ -28,7 +28,7 @@ import jakarta.xml.ws.WebServiceContext; import jakarta.xml.ws.handler.MessageContext; import jakarta.xml.ws.http.HTTPBinding; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.Map; /** diff --git a/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/xmlhttp/provider/message/source/XMessageSourceProvider.java b/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/xmlhttp/provider/message/source/XMessageSourceProvider.java index e6777088d2..5ffc5ac04f 100644 --- a/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/xmlhttp/provider/message/source/XMessageSourceProvider.java +++ b/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/xmlhttp/provider/message/source/XMessageSourceProvider.java @@ -22,7 +22,7 @@ import java.io.ByteArrayInputStream; import java.io.InputStream; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.xml.transform.Source; import javax.xml.transform.stream.StreamSource; import jakarta.xml.ws.BindingType; diff --git a/modules/jaxws/pom.xml b/modules/jaxws/pom.xml index 25206ab667..e27b251aa7 100644 --- a/modules/jaxws/pom.xml +++ b/modules/jaxws/pom.xml @@ -42,14 +42,6 @@ - - org.apache.geronimo.specs - geronimo-annotation_1.0_spec - - - org.apache.geronimo.specs - geronimo-jaxws_2.2_spec - org.apache.axis2 axis2-kernel diff --git a/modules/jaxws/src/org/apache/axis2/jaxws/lifecycle/BaseLifecycleManager.java b/modules/jaxws/src/org/apache/axis2/jaxws/lifecycle/BaseLifecycleManager.java index 2eefb010c1..ae50b5780a 100644 --- a/modules/jaxws/src/org/apache/axis2/jaxws/lifecycle/BaseLifecycleManager.java +++ b/modules/jaxws/src/org/apache/axis2/jaxws/lifecycle/BaseLifecycleManager.java @@ -24,8 +24,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; import java.lang.annotation.Annotation; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/modules/jaxws/src/org/apache/axis2/jaxws/runtime/description/injection/impl/ResourceInjectionServiceRuntimeDescriptionBuilder.java b/modules/jaxws/src/org/apache/axis2/jaxws/runtime/description/injection/impl/ResourceInjectionServiceRuntimeDescriptionBuilder.java index d750044387..9ef03e577e 100644 --- a/modules/jaxws/src/org/apache/axis2/jaxws/runtime/description/injection/impl/ResourceInjectionServiceRuntimeDescriptionBuilder.java +++ b/modules/jaxws/src/org/apache/axis2/jaxws/runtime/description/injection/impl/ResourceInjectionServiceRuntimeDescriptionBuilder.java @@ -23,9 +23,9 @@ import org.apache.axis2.jaxws.description.ServiceDescription; import org.apache.axis2.jaxws.runtime.description.injection.ResourceInjectionServiceRuntimeDescription; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.annotation.Resource; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.annotation.Resource; import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Field; diff --git a/modules/jaxws/src/org/apache/axis2/jaxws/server/endpoint/injection/impl/WebServiceContextInjectorImpl.java b/modules/jaxws/src/org/apache/axis2/jaxws/server/endpoint/injection/impl/WebServiceContextInjectorImpl.java index d76f615d68..556370d56a 100644 --- a/modules/jaxws/src/org/apache/axis2/jaxws/server/endpoint/injection/impl/WebServiceContextInjectorImpl.java +++ b/modules/jaxws/src/org/apache/axis2/jaxws/server/endpoint/injection/impl/WebServiceContextInjectorImpl.java @@ -27,7 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import jakarta.xml.ws.WebServiceContext; import jakarta.xml.ws.handler.MessageContext; import java.lang.annotation.Annotation; diff --git a/modules/jaxws/src/org/apache/axis2/jaxws/spi/handler/LifecycleManager.java b/modules/jaxws/src/org/apache/axis2/jaxws/spi/handler/LifecycleManager.java index 5112377443..160553b396 100644 --- a/modules/jaxws/src/org/apache/axis2/jaxws/spi/handler/LifecycleManager.java +++ b/modules/jaxws/src/org/apache/axis2/jaxws/spi/handler/LifecycleManager.java @@ -22,8 +22,8 @@ import org.apache.axis2.java.security.AccessController; import org.apache.axis2.jaxws.lifecycle.BaseLifecycleManager; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Method; diff --git a/modules/jaxws/test/org/apache/axis2/jaxws/description/sample/addnumbers/AddNumbersPortTypeImpl.java b/modules/jaxws/test/org/apache/axis2/jaxws/description/sample/addnumbers/AddNumbersPortTypeImpl.java index 762eb39bf3..6dca39b4f3 100644 --- a/modules/jaxws/test/org/apache/axis2/jaxws/description/sample/addnumbers/AddNumbersPortTypeImpl.java +++ b/modules/jaxws/test/org/apache/axis2/jaxws/description/sample/addnumbers/AddNumbersPortTypeImpl.java @@ -21,7 +21,7 @@ import org.apache.axis2.jaxws.unitTest.TestLogger; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import jakarta.jws.WebService; import jakarta.xml.ws.WebServiceContext; import jakarta.xml.ws.handler.MessageContext; diff --git a/modules/jaxws/test/org/apache/axis2/jaxws/injection/ResourceInjectionTestImpl1.java b/modules/jaxws/test/org/apache/axis2/jaxws/injection/ResourceInjectionTestImpl1.java index 5c9789a2fd..fb1b2f143e 100644 --- a/modules/jaxws/test/org/apache/axis2/jaxws/injection/ResourceInjectionTestImpl1.java +++ b/modules/jaxws/test/org/apache/axis2/jaxws/injection/ResourceInjectionTestImpl1.java @@ -21,9 +21,9 @@ import org.apache.axis2.jaxws.unitTest.TestLogger; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.annotation.Resource; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.annotation.Resource; import jakarta.xml.ws.WebServiceContext; public class ResourceInjectionTestImpl1 { diff --git a/modules/jaxws/test/org/apache/axis2/jaxws/injection/ResourceInjectionTestImpl2.java b/modules/jaxws/test/org/apache/axis2/jaxws/injection/ResourceInjectionTestImpl2.java index 193cee903b..83f3b1174a 100644 --- a/modules/jaxws/test/org/apache/axis2/jaxws/injection/ResourceInjectionTestImpl2.java +++ b/modules/jaxws/test/org/apache/axis2/jaxws/injection/ResourceInjectionTestImpl2.java @@ -21,9 +21,9 @@ import org.apache.axis2.jaxws.unitTest.TestLogger; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.annotation.Resource; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.annotation.Resource; import jakarta.xml.ws.WebServiceContext; diff --git a/modules/jaxws/test/org/apache/axis2/jaxws/injection/ResourceInjectionTestImpl3.java b/modules/jaxws/test/org/apache/axis2/jaxws/injection/ResourceInjectionTestImpl3.java index 0f8194aec3..d84ab68aeb 100644 --- a/modules/jaxws/test/org/apache/axis2/jaxws/injection/ResourceInjectionTestImpl3.java +++ b/modules/jaxws/test/org/apache/axis2/jaxws/injection/ResourceInjectionTestImpl3.java @@ -21,9 +21,9 @@ import org.apache.axis2.jaxws.unitTest.TestLogger; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.annotation.Resource; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.annotation.Resource; import jakarta.xml.ws.WebServiceContext; public class ResourceInjectionTestImpl3 { diff --git a/modules/jaxws/test/org/apache/axis2/jaxws/injection/ResourceInjectionTestImpl4.java b/modules/jaxws/test/org/apache/axis2/jaxws/injection/ResourceInjectionTestImpl4.java index 22c833c417..26d5dfe0e0 100644 --- a/modules/jaxws/test/org/apache/axis2/jaxws/injection/ResourceInjectionTestImpl4.java +++ b/modules/jaxws/test/org/apache/axis2/jaxws/injection/ResourceInjectionTestImpl4.java @@ -21,9 +21,9 @@ import org.apache.axis2.jaxws.unitTest.TestLogger; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.annotation.Resource; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.annotation.Resource; import jakarta.xml.ws.WebServiceContext; public class ResourceInjectionTestImpl4 { diff --git a/modules/jaxws/test/org/apache/axis2/jaxws/injection/ResourceInjectionTestImpl5.java b/modules/jaxws/test/org/apache/axis2/jaxws/injection/ResourceInjectionTestImpl5.java index 416621702c..d7fd8a4902 100644 --- a/modules/jaxws/test/org/apache/axis2/jaxws/injection/ResourceInjectionTestImpl5.java +++ b/modules/jaxws/test/org/apache/axis2/jaxws/injection/ResourceInjectionTestImpl5.java @@ -21,9 +21,9 @@ import org.apache.axis2.jaxws.unitTest.TestLogger; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.annotation.Resource; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.annotation.Resource; import jakarta.xml.ws.WebServiceContext; diff --git a/modules/jaxws/test/org/apache/axis2/jaxws/spi/handler/DummyLogicalHandler.java b/modules/jaxws/test/org/apache/axis2/jaxws/spi/handler/DummyLogicalHandler.java index be2ebf404c..e92f43b858 100644 --- a/modules/jaxws/test/org/apache/axis2/jaxws/spi/handler/DummyLogicalHandler.java +++ b/modules/jaxws/test/org/apache/axis2/jaxws/spi/handler/DummyLogicalHandler.java @@ -21,7 +21,7 @@ import org.apache.axis2.jaxws.unitTest.TestLogger; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import jakarta.xml.ws.handler.LogicalHandler; import jakarta.xml.ws.handler.LogicalMessageContext; import jakarta.xml.ws.handler.MessageContext; diff --git a/modules/json/pom.xml b/modules/json/pom.xml index ebb0d7c4d8..3ce67e9a17 100644 --- a/modules/json/pom.xml +++ b/modules/json/pom.xml @@ -119,6 +119,10 @@ axiom-truth test + + jakarta.annotation + jakarta.annotation-api + diff --git a/modules/json/src/org/apache/axis2/json/moshi/rpc/JsonUtils.java b/modules/json/src/org/apache/axis2/json/moshi/rpc/JsonUtils.java index 84e7fc5da6..ca3d94c9c8 100644 --- a/modules/json/src/org/apache/axis2/json/moshi/rpc/JsonUtils.java +++ b/modules/json/src/org/apache/axis2/json/moshi/rpc/JsonUtils.java @@ -26,7 +26,6 @@ import com.squareup.moshi.JsonReader; import com.squareup.moshi.JsonWriter; import com.squareup.moshi.Moshi; -import com.squareup.moshi.Types; import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter; import java.io.IOException; @@ -34,11 +33,10 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Type; -import java.util.Arrays; import java.util.Date; import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; public class JsonUtils { diff --git a/modules/kernel/pom.xml b/modules/kernel/pom.xml index 335c8a1724..eaccc74d2b 100644 --- a/modules/kernel/pom.xml +++ b/modules/kernel/pom.xml @@ -57,10 +57,6 @@ org.apache.ws.commons.axiom axiom-legacy-attachments - - org.apache.geronimo.specs - geronimo-ws-metadata_2.0_spec - jakarta.transaction jakarta.transaction-api diff --git a/modules/metadata/pom.xml b/modules/metadata/pom.xml index ad2b09b08d..462a96ecf5 100755 --- a/modules/metadata/pom.xml +++ b/modules/metadata/pom.xml @@ -54,10 +54,6 @@ ${project.version} test - - org.apache.geronimo.specs - geronimo-jaxws_2.2_spec - org.apache.axis2 axis2-saaj diff --git a/modules/samples/book/pom.xml b/modules/samples/book/pom.xml index 27a439c8ad..fd868df17d 100644 --- a/modules/samples/book/pom.xml +++ b/modules/samples/book/pom.xml @@ -94,16 +94,6 @@ wsdl4j 1.6.3 - - org.apache.geronimo.specs - geronimo-javamail_1.4_spec - 1.2 - - - org.apache.geronimo.specs - geronimo-activation_1.1_spec - 1.0.1 - org.apache.axis2 axis2-transport-http diff --git a/modules/samples/jaxws-addressbook/pom.xml b/modules/samples/jaxws-addressbook/pom.xml index a9a9f1053d..44849cd571 100644 --- a/modules/samples/jaxws-addressbook/pom.xml +++ b/modules/samples/jaxws-addressbook/pom.xml @@ -44,10 +44,14 @@ jakarta.xml.bind jakarta.xml.bind-api + + jakarta.xml.ws + jakarta.xml.ws-api + org.apache.axis2 axis2-jaxws - 2.0.1-SNAPSHOT + ${project.version} diff --git a/modules/samples/jaxws-addressbook/src/org/apache/axis2/jaxws/addressbook/AddressBookClient.java b/modules/samples/jaxws-addressbook/src/org/apache/axis2/jaxws/addressbook/AddressBookClient.java index 490cf7a887..99028ae1ef 100644 --- a/modules/samples/jaxws-addressbook/src/org/apache/axis2/jaxws/addressbook/AddressBookClient.java +++ b/modules/samples/jaxws-addressbook/src/org/apache/axis2/jaxws/addressbook/AddressBookClient.java @@ -1,12 +1,10 @@ package org.apache.axis2.jaxws.addressbook; import javax.xml.namespace.QName; -import jakarta.xml.ws.BindingProvider; + import jakarta.xml.ws.Dispatch; import jakarta.xml.ws.Service; -import java.util.Map; - /** * Simple JAX-WS Dispatch client for the address book service implementation. */ diff --git a/modules/samples/jaxws-calculator/pom.xml b/modules/samples/jaxws-calculator/pom.xml index 3354fd57af..3142a2e531 100644 --- a/modules/samples/jaxws-calculator/pom.xml +++ b/modules/samples/jaxws-calculator/pom.xml @@ -44,10 +44,19 @@ jakarta.xml.bind jakarta.xml.bind-api + + jakarta.xml.ws + jakarta.xml.ws-api + + + jakarta.annotation + jakarta.annotation-api + 3.0.0 + org.apache.axis2 axis2-jaxws - 2.0.1-SNAPSHOT + ${project.version} diff --git a/modules/samples/jaxws-calculator/src/org/apache/axis2/jaxws/calculator/CalculatorServer.java b/modules/samples/jaxws-calculator/src/org/apache/axis2/jaxws/calculator/CalculatorServer.java index cbc953d2d5..f3bcd23130 100644 --- a/modules/samples/jaxws-calculator/src/org/apache/axis2/jaxws/calculator/CalculatorServer.java +++ b/modules/samples/jaxws-calculator/src/org/apache/axis2/jaxws/calculator/CalculatorServer.java @@ -18,7 +18,7 @@ */ package org.apache.axis2.jaxws.calculator; -import javax.xml.ws.Endpoint; +import jakarta.xml.ws.Endpoint; public class CalculatorServer{ diff --git a/modules/samples/jaxws-calculator/src/org/apache/axis2/jaxws/calculator/CalculatorService.java b/modules/samples/jaxws-calculator/src/org/apache/axis2/jaxws/calculator/CalculatorService.java index f2e29b34e7..2f08013335 100644 --- a/modules/samples/jaxws-calculator/src/org/apache/axis2/jaxws/calculator/CalculatorService.java +++ b/modules/samples/jaxws-calculator/src/org/apache/axis2/jaxws/calculator/CalculatorService.java @@ -21,7 +21,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import jakarta.jws.WebService; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/modules/samples/jaxws-dynamic/src/org/apache/axis2/jaxws/sample/dynamic/DynamicServiceProvider.java b/modules/samples/jaxws-dynamic/src/org/apache/axis2/jaxws/sample/dynamic/DynamicServiceProvider.java index 2195ead067..76e58621a5 100644 --- a/modules/samples/jaxws-dynamic/src/org/apache/axis2/jaxws/sample/dynamic/DynamicServiceProvider.java +++ b/modules/samples/jaxws-dynamic/src/org/apache/axis2/jaxws/sample/dynamic/DynamicServiceProvider.java @@ -18,7 +18,7 @@ */ package org.apache.axis2.jaxws.sample.dynamic; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.xml.namespace.QName; import javax.xml.transform.Result; import javax.xml.transform.Source; diff --git a/modules/samples/jaxws-interop/pom.xml b/modules/samples/jaxws-interop/pom.xml index 66f9950751..5b9ebc7bcf 100644 --- a/modules/samples/jaxws-interop/pom.xml +++ b/modules/samples/jaxws-interop/pom.xml @@ -51,7 +51,12 @@ org.apache.axis2 axis2-jaxws - 2.0.1-SNAPSHOT + ${project.version} + + + org.apache.axis2 + axis2-metadata + ${project.version} junit @@ -66,13 +71,13 @@ org.apache.axis2 axis2-testutils - 2.0.1-SNAPSHOT + ${project.version} test org.apache.axis2 axis2-transport-http - 2.0.1-SNAPSHOT + ${project.version} test diff --git a/modules/samples/userguide/src/userguide/springbootdemo/pom.xml b/modules/samples/userguide/src/userguide/springbootdemo/pom.xml index 6916b3edb3..cf9eadcf59 100644 --- a/modules/samples/userguide/src/userguide/springbootdemo/pom.xml +++ b/modules/samples/userguide/src/userguide/springbootdemo/pom.xml @@ -168,16 +168,6 @@ commons-fileupload2-jakarta-servlet6 2.0.0-M2 - - org.apache.geronimo.specs - geronimo-ws-metadata_2.0_spec - 1.1.3 - - - org.apache.geronimo.specs - geronimo-jaxws_2.2_spec - 1.2 - org.apache.axis2 axis2-kernel diff --git a/modules/tool/axis2-idea-plugin/idea-plugin-aseembly.xml b/modules/tool/axis2-idea-plugin/idea-plugin-aseembly.xml index c5aae7bcd3..b900ed2afc 100644 --- a/modules/tool/axis2-idea-plugin/idea-plugin-aseembly.xml +++ b/modules/tool/axis2-idea-plugin/idea-plugin-aseembly.xml @@ -54,8 +54,6 @@ org.apache.axis2:axis2-adb:jar org.apache.axis2:axis2-adb-codegen:jar org.apache.axis2:axis2-java2wsdl:jar - org.apache.geronimo.specs:geronimo-javamail_1.4_spec:jar - org.apache.geronimo.specs:geronimo-activation_1.1_spec:jar wsdl4j:wsdl4j:jar diff --git a/modules/webapp/pom.xml b/modules/webapp/pom.xml index 71dc808a29..b71d26395d 100644 --- a/modules/webapp/pom.xml +++ b/modules/webapp/pom.xml @@ -159,12 +159,6 @@ ${project.groupId} axis2-transport-jms ${project.version} - - - org.apache.geronimo.specs - geronimo-jms_1.1_spec - - ${project.groupId} diff --git a/pom.xml b/pom.xml index 86468c515e..e4f9b781cc 100644 --- a/pom.xml +++ b/pom.xml @@ -472,9 +472,6 @@ 2.0.0-M4 1.3.5 2.1.1 - 1.1.1 - 1.1.3 - 1.2 2.13.1 5.0.1 5.3.4 @@ -746,21 +743,6 @@ angus-mail 2.0.4 - - org.apache.geronimo.specs - geronimo-annotation_1.0_spec - ${geronimo.spec.annotation.version} - - - org.apache.geronimo.specs - geronimo-ws-metadata_2.0_spec - ${geronimo.spec.metadata.version} - - - org.apache.geronimo.specs - geronimo-jaxws_2.2_spec - ${geronimo.spec.jaxws.version} - commons-io commons-io @@ -1037,6 +1019,11 @@ bcpkix-jdk18on 1.81 + + jakarta.annotation + jakarta.annotation-api + 3.0.0 +