Merge pull request #1027 from apache/bugfix/remove-geronimo-api

robertlazarski · web-flow · commit 0f4d12d2c563 · 2025-11-15T08:01:24.000-10:00
fix: remove old geronimo javax APIs
diff --git 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
@@ -43,14 +43,6 @@
     </scm>
 
     <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>
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -42,14 +42,6 @@
     </scm>
 
     <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>
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -26,19 +26,17 @@
 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;
 import java.lang.annotation.Annotation;
 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
@@ -57,10 +57,6 @@
             <groupId>org.apache.ws.commons.axiom</groupId>
             <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>
diff --git a/modules/metadata/pom.xml b/modules/metadata/pom.xml
@@ -54,10 +54,6 @@
             <version>${project.version}</version>
             <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>
diff --git 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
@@ -44,10 +44,14 @@
             <groupId>jakarta.xml.bind</groupId>
             <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
@@ -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
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
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
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
diff --git a/modules/samples/jaxws-interop/pom.xml b/modules/samples/jaxws-interop/pom.xml
diff --git a/modules/samples/userguide/src/userguide/springbootdemo/pom.xml b/modules/samples/userguide/src/userguide/springbootdemo/pom.xml
diff --git a/modules/tool/axis2-idea-plugin/idea-plugin-aseembly.xml b/modules/tool/axis2-idea-plugin/idea-plugin-aseembly.xml
diff --git a/modules/webapp/pom.xml b/modules/webapp/pom.xml
diff --git a/pom.xml b/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`
`22`	`22`	`import org.apache.axis2.jaxws.context.sei.MessageContext;`
`23`	`23`
`24`		`-import javax.annotation.Resource;`
	`24`	`+import jakarta.annotation.Resource;`
`25`	`25`	`import jakarta.jws.WebService;`
`26`	`26`	`import jakarta.xml.ws.Holder;`
`27`	`27`	`import jakarta.xml.ws.WebServiceContext;`
`@@ -61,4 +61,4 @@ public void isPropertyPresent(`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`	`}`
`64`		`-}`
	`64`	`+}`