fix: remove old geronimo javax APIs
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 4975b64..b20c05f 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml
@@ -225,12 +225,6 @@ <groupId>${project.groupId}</groupId> <artifactId>axis2-transport-jms</artifactId> <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jms_1.1_spec</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>${project.groupId}</groupId>
diff --git a/modules/jaxws-integration/pom.xml b/modules/jaxws-integration/pom.xml index 6b2b9b7..78db0da 100644 --- a/modules/jaxws-integration/pom.xml +++ b/modules/jaxws-integration/pom.xml
@@ -44,14 +44,6 @@ <dependencies> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jaxws_2.2_spec</artifactId> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-annotation_1.0_spec</artifactId> - </dependency> - <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-kernel</artifactId> <version>${project.version}</version> @@ -140,6 +132,10 @@ <artifactId>log4j-jcl</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>xml-resolver</groupId> + <artifactId>xml-resolver</artifactId> + </dependency> </dependencies> <build>
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 9ed86b2..f78fe83 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 @@ } } } -} +}
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 44bc8da..c0f46cb 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 533f66a..8830171 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 278d638..2f9f709 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 60cac19..de6e416 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 0c619fd..96d4063 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 803a029..025e788 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 b30cb4d..49a2f80 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 02ebbf0..ebe85e8 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 e677708..5ffc5ac 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 25206ab..e27b251 100644 --- a/modules/jaxws/pom.xml +++ b/modules/jaxws/pom.xml
@@ -43,14 +43,6 @@ <dependencies> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-annotation_1.0_spec</artifactId> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jaxws_2.2_spec</artifactId> - </dependency> - <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-kernel</artifactId> <version>${project.version}</version>
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 2eefb01..ae50b57 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 d750044..9ef03e5 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 d76f615..556370d 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 5112377..160553b 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 762eb39..6dca39b 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 5c9789a..fb1b2f1 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 193cee9..83f3b11 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 0f8194a..d84ab68 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 22c833c..26d5dfe 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 4166217..d7fd8a4 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 be2ebf4..e92f43b 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 ebb0d7c..3ce67e9 100644 --- a/modules/json/pom.xml +++ b/modules/json/pom.xml
@@ -119,6 +119,10 @@ <artifactId>axiom-truth</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> + </dependency> </dependencies> <build>
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 84e7fc5..ca3d94c 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 335c8a1..eaccc74 100644 --- a/modules/kernel/pom.xml +++ b/modules/kernel/pom.xml
@@ -58,10 +58,6 @@ <artifactId>axiom-legacy-attachments</artifactId> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-ws-metadata_2.0_spec</artifactId> - </dependency> - <dependency> <groupId>jakarta.transaction</groupId> <artifactId>jakarta.transaction-api</artifactId> </dependency>
diff --git a/modules/metadata/pom.xml b/modules/metadata/pom.xml index ad2b09b..462a96e 100755 --- a/modules/metadata/pom.xml +++ b/modules/metadata/pom.xml
@@ -55,10 +55,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jaxws_2.2_spec</artifactId> - </dependency> - <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-saaj</artifactId> <version>${project.version}</version>
diff --git a/modules/samples/book/pom.xml b/modules/samples/book/pom.xml index 27a439c..fd868df 100644 --- a/modules/samples/book/pom.xml +++ b/modules/samples/book/pom.xml
@@ -94,16 +94,6 @@ <artifactId>wsdl4j</artifactId> <version>1.6.3</version> </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-javamail_1.4_spec</artifactId> - <version>1.2</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-activation_1.1_spec</artifactId> - <version>1.0.1</version> - </dependency> <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-transport-http</artifactId>
diff --git a/modules/samples/jaxws-addressbook/pom.xml b/modules/samples/jaxws-addressbook/pom.xml index a9a9f10..44849cd 100644 --- a/modules/samples/jaxws-addressbook/pom.xml +++ b/modules/samples/jaxws-addressbook/pom.xml
@@ -45,9 +45,13 @@ <artifactId>jakarta.xml.bind-api</artifactId> </dependency> <dependency> + <groupId>jakarta.xml.ws</groupId> + <artifactId>jakarta.xml.ws-api</artifactId> + </dependency> + <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-jaxws</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies>
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 490cf7a..99028ae 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 3354fd5..3142a2e 100644 --- a/modules/samples/jaxws-calculator/pom.xml +++ b/modules/samples/jaxws-calculator/pom.xml
@@ -45,9 +45,18 @@ <artifactId>jakarta.xml.bind-api</artifactId> </dependency> <dependency> + <groupId>jakarta.xml.ws</groupId> + <artifactId>jakarta.xml.ws-api</artifactId> + </dependency> + <dependency> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> + <version>3.0.0</version> + </dependency> + <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-jaxws</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies>
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 cbc953d..f3bcd23 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 f2e29b3..2f08013 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 2195ead..76e5862 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 66f9950..5b9ebc7 100644 --- a/modules/samples/jaxws-interop/pom.xml +++ b/modules/samples/jaxws-interop/pom.xml
@@ -51,7 +51,12 @@ <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-jaxws</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-metadata</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>junit</groupId> @@ -66,13 +71,13 @@ <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-testutils</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-transport-http</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>${project.version}</version> <scope>test</scope> </dependency> </dependencies>
diff --git a/modules/samples/userguide/src/userguide/springbootdemo/pom.xml b/modules/samples/userguide/src/userguide/springbootdemo/pom.xml index 6916b3e..cf9eadc 100644 --- a/modules/samples/userguide/src/userguide/springbootdemo/pom.xml +++ b/modules/samples/userguide/src/userguide/springbootdemo/pom.xml
@@ -168,16 +168,6 @@ <artifactId>commons-fileupload2-jakarta-servlet6</artifactId> <version>2.0.0-M2</version> </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-ws-metadata_2.0_spec</artifactId> - <version>1.1.3</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jaxws_2.2_spec</artifactId> - <version>1.2</version> - </dependency> <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-kernel</artifactId>
diff --git a/modules/tool/axis2-idea-plugin/idea-plugin-aseembly.xml b/modules/tool/axis2-idea-plugin/idea-plugin-aseembly.xml index c5aae7b..b900ed2 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 @@ <include>org.apache.axis2:axis2-adb:jar</include> <include>org.apache.axis2:axis2-adb-codegen:jar</include> <include>org.apache.axis2:axis2-java2wsdl:jar</include> - <include>org.apache.geronimo.specs:geronimo-javamail_1.4_spec:jar</include> - <include>org.apache.geronimo.specs:geronimo-activation_1.1_spec:jar</include> <include>wsdl4j:wsdl4j:jar</include> </includes> </dependencySet>
diff --git a/modules/webapp/pom.xml b/modules/webapp/pom.xml index 71dc808..b71d263 100644 --- a/modules/webapp/pom.xml +++ b/modules/webapp/pom.xml
@@ -159,12 +159,6 @@ <groupId>${project.groupId}</groupId> <artifactId>axis2-transport-jms</artifactId> <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jms_1.1_spec</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>${project.groupId}</groupId>
diff --git a/pom.xml b/pom.xml index 86468c5..e4f9b78 100644 --- a/pom.xml +++ b/pom.xml
@@ -472,9 +472,6 @@ <commons.fileupload.version>2.0.0-M4</commons.fileupload.version> <commons.logging.version>1.3.5</commons.logging.version> <fi.version>2.1.1</fi.version> - <geronimo.spec.annotation.version>1.1.1</geronimo.spec.annotation.version> - <geronimo.spec.metadata.version>1.1.3</geronimo.spec.metadata.version> - <geronimo.spec.jaxws.version>1.2</geronimo.spec.jaxws.version> <google.gson.version>2.13.1</google.gson.version> <groovy.version>5.0.1</groovy.version> <httpcore.version>5.3.4</httpcore.version> @@ -747,21 +744,6 @@ <version>2.0.4</version> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-annotation_1.0_spec</artifactId> - <version>${geronimo.spec.annotation.version}</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-ws-metadata_2.0_spec</artifactId> - <version>${geronimo.spec.metadata.version}</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jaxws_2.2_spec</artifactId> - <version>${geronimo.spec.jaxws.version}</version> - </dependency> - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> <version>2.20.0</version> @@ -1037,6 +1019,11 @@ <artifactId>bcpkix-jdk18on</artifactId> <version>1.81</version> </dependency> + <dependency> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> + <version>3.0.0</version> + </dependency> </dependencies> </dependencyManagement>