Draft: Jakarta EE 9

benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkImpl.java

@@ -39,7 +39,7 @@
 
 
 
-@javax.jws.WebService(name = "Benchmark", serviceName = "Benchmark",
+@jakarta.jws.WebService(name = "Benchmark", serviceName = "Benchmark",
                       portName = "Benchmark",
                       targetNamespace = "http://www.extreme.indiana.edu/wsdl/Benchmark1",
                       endpointInterface = "edu.indiana.extreme.wsdl.benchmark1.Benchmark")

benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkServer.java

@@ -19,7 +19,7 @@
 /* Generated by WSDLToJava Compiler. */
 package org.apache.cxf.performance.server;
 
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
 
 
 /**

benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/client/Client.java

@@ -24,7 +24,7 @@
 import java.util.List;
 
 import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
+import jakarta.xml.ws.BindingProvider;
 
 import org.apache.cxf.pat.internal.TestCaseBase;
 import org.apache.cxf.pat.internal.TestResult;

benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/Server.java

@@ -18,7 +18,7 @@
  */
 package org.apache.cxf.performance.basic_type.server;
 
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
 
 
 public class Server implements Runnable {

benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/ServerImpl.java

@@ -21,7 +21,7 @@
 import java.util.logging.Logger;
 
 import org.apache.cxf.performance.basic_type.BasicPortType;
-@javax.jws.WebService(portName = "SoapHttpPort", serviceName = "BasicService",
+@jakarta.jws.WebService(portName = "SoapHttpPort", serviceName = "BasicService",
                       targetNamespace = "http://cxf.apache.org/performance/basic_type",
                       endpointInterface = "org.apache.cxf.performance.basic_type.BasicPortType",
                       wsdlLocation = "wsdl/basic_type.wsdl"

benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/server/Server.java

@@ -18,7 +18,7 @@
  */
 package org.apache.cxf.performance.complex_type.server;
 
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
 
 
 

benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/server/ServerImpl.java

@@ -23,7 +23,7 @@
 import org.apache.cxf.performance.complex_type.ComplexPortType;
 import org.apache.cxf.performance.complex_type.types.NestedComplexTypeSeq;
 
-@javax.jws.WebService(portName = "SoapPort", serviceName = "ComplexService",
+@jakarta.jws.WebService(portName = "SoapPort", serviceName = "ComplexService",
                       targetNamespace = "http://cxf.apache.org/performance/complex_type",
                       endpointInterface = "org.apache.cxf.performance.complex_type.ComplexPortType")
 

benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/client/Client.java

@@ -32,7 +32,7 @@
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.namespace.QName;
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.Holder;
 
 
 import org.apache.cxf.frontend.ClientProxy;

benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/common/KeystorePasswordCallback.java

@@ -22,9 +22,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.UnsupportedCallbackException;
+import jakarta.security.auth.callback.Callback;
+import jakarta.security.auth.callback.CallbackHandler;
+import jakarta.security.auth.callback.UnsupportedCallbackException;
 
 import org.apache.ws.security.WSPasswordCallback;
 

benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/Server.java

@@ -18,7 +18,7 @@
  */
 package org.apache.cxf.performance.complex_type.server;
 
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
 
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;

benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/ServerImpl.java

@@ -29,7 +29,7 @@
 import org.apache.cxf.cxf.performance.types.NestedComplexTypeSeq;
 
 
-@javax.jws.WebService(portName = "SoapHttpDocLitPort", serviceName = "PerfService",
+@jakarta.jws.WebService(portName = "SoapHttpDocLitPort", serviceName = "PerfService",
                       targetNamespace = "http://cxf.apache.org/cxf/performance",
                       endpointInterface = "org.apache.cxf.cxf.performance.DocPortType",
                       wsdlLocation="/wsdl/perf.wsdl")
@@ -39,7 +39,7 @@ public class ServerImpl implements DocPortType {
         Logger.getLogger("org.apache.xml.security.signature.Reference").setLevel(Level.WARNING);
     }
 
-    public NestedComplexTypeSeq echoComplexTypeDoc(NestedComplexTypeSeq request, int id, javax.xml.ws.Holder<Integer> i) {
+    public NestedComplexTypeSeq echoComplexTypeDoc(NestedComplexTypeSeq request, int id, jakarta.xml.ws.Holder<Integer> i) {
         //System.out.println("Executing operation echoComplexTypeDoc\n");
         //System.out.println("Message received: " + request + "\n");
         i.value = id;

core/pom.xml

@@ -54,12 +54,12 @@
             org.springframework.core*;resolution:=optional;version="${cxf.osgi.spring.version}",
             org.springframework.util*;resolution:=optional;version="${cxf.osgi.spring.version}",
             org.objectweb.asm*;resolution:=optional;version="${cxf.osgi.asm.version}",
-            javax.activation;version="${cxf.osgi.javax.activation.version}",
-            javax.annotation;version="${cxf.osgi.javax.annotation.version}",
-            javax.xml.ws*;version="${cxf.osgi.javax.xml.ws.version}",
-            javax.xml.bind*;version="${cxf.osgi.javax.bind.version}",
+            jakarta.activation;version="${cxf.osgi.jakarta.activation.version}",
+            jakarta.annotation;version="${cxf.osgi.jakarta.annotation.version}",
+            jakarta.xml.ws*;version="${cxf.osgi.jakarta.xml.ws.version}",
+            jakarta.xml.bind*;version="${cxf.osgi.jakarta.bind.version}",
             javax.xml.stream*;version="${cxf.osgi.javax.stream.version}",
-            javax.validation*;resolution:=optional;version="${cxf.validation.api.package.version}", 
+            jakarta.validation*;resolution:=optional;version="${cxf.validation.api.package.version}", 
             org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional,
             org.apache.karaf.jaas.boot.principal;resolution:=optional,
             org.apache.commons.logging;resolution:=optional,

core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java

@@ -23,7 +23,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import javax.activation.DataSource;
+import jakarta.activation.DataSource;
 
 import org.apache.cxf.helpers.IOUtils;
 import org.apache.cxf.io.CacheSizeExceededException;

core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java

@@ -34,7 +34,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.activation.DataSource;
+import jakarta.activation.DataSource;
 
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.StringUtils;

core/src/main/java/org/apache/cxf/attachment/AttachmentImpl.java

@@ -23,7 +23,7 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import javax.activation.DataHandler;
+import jakarta.activation.DataHandler;
 
 import org.apache.cxf.message.Attachment;
 

core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java

@@ -32,7 +32,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.activation.DataHandler;
+import jakarta.activation.DataHandler;
 
 import org.apache.cxf.common.util.Base64Utility;
 import org.apache.cxf.helpers.IOUtils;

core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java

@@ -46,14 +46,14 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Logger;
 
-import javax.activation.CommandInfo;
-import javax.activation.CommandMap;
-import javax.activation.DataContentHandler;
-import javax.activation.DataHandler;
-import javax.activation.DataSource;
-import javax.activation.FileDataSource;
-import javax.activation.MailcapCommandMap;
-import javax.activation.URLDataSource;
+import jakarta.activation.CommandInfo;
+import jakarta.activation.CommandMap;
+import jakarta.activation.DataContentHandler;
+import jakarta.activation.DataHandler;
+import jakarta.activation.DataSource;
+import jakarta.activation.FileDataSource;
+import jakarta.activation.MailcapCommandMap;
+import jakarta.activation.URLDataSource;
 
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.StringUtils;

core/src/main/java/org/apache/cxf/attachment/ByteDataSource.java

@@ -24,7 +24,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import javax.activation.DataSource;
+import jakarta.activation.DataSource;
 
 public class ByteDataSource implements DataSource {
     private String contentType;

core/src/main/java/org/apache/cxf/attachment/ImageDataContentHandler.java

@@ -33,9 +33,9 @@
 import java.nio.file.Files;
 import java.util.Iterator;
 
-import javax.activation.ActivationDataFlavor;
-import javax.activation.DataContentHandler;
-import javax.activation.DataSource;
+import jakarta.activation.ActivationDataFlavor;
+import jakarta.activation.DataContentHandler;
+import jakarta.activation.DataSource;
 import javax.imageio.ImageIO;
 import javax.imageio.ImageWriter;
 import javax.imageio.stream.ImageOutputStream;

core/src/main/java/org/apache/cxf/attachment/LazyAttachmentCollection.java

@@ -28,7 +28,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.activation.DataHandler;
+import jakarta.activation.DataHandler;
 
 import org.apache.cxf.message.Attachment;
 

core/src/main/java/org/apache/cxf/attachment/LazyDataSource.java

@@ -25,7 +25,7 @@
 import java.util.Collection;
 import java.util.stream.Collectors;
 
-import javax.activation.DataSource;
+import jakarta.activation.DataSource;
 
 import org.apache.cxf.message.Attachment;
 

core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java

@@ -21,7 +21,7 @@
 
 import java.util.Collection;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import javax.xml.namespace.QName;
 
 import org.apache.cxf.Bus;

core/src/main/java/org/apache/cxf/bus/managers/BindingFactoryManagerImpl.java

@@ -28,7 +28,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArraySet;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusException;

core/src/main/java/org/apache/cxf/bus/managers/CXFBusLifeCycleManager.java

@@ -22,7 +22,7 @@
 import java.util.ListIterator;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.buslifecycle.BusLifeCycleListener;

core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java

@@ -25,8 +25,8 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArraySet;
 
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
+import jakarta.annotation.PreDestroy;
+import jakarta.annotation.Resource;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusException;

core/src/main/java/org/apache/cxf/bus/managers/DestinationFactoryManagerImpl.java

@@ -27,7 +27,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArraySet;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusException;

core/src/main/java/org/apache/cxf/bus/managers/HeaderManagerImpl.java

@@ -21,7 +21,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.common.injection.NoJSR250Annotations;

core/src/main/java/org/apache/cxf/bus/managers/ServerRegistryImpl.java

@@ -22,8 +22,8 @@
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
+import jakarta.annotation.PreDestroy;
+import jakarta.annotation.Resource;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.buslifecycle.BusLifeCycleListener;

core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImpl.java

@@ -25,7 +25,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import javax.management.JMException;
 
 import org.apache.cxf.Bus;

core/src/main/java/org/apache/cxf/bus/resource/ResourceManagerImpl.java

@@ -21,7 +21,7 @@
 
 import java.util.List;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.common.injection.NoJSR250Annotations;

core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java

@@ -34,7 +34,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import org.xml.sax.EntityResolver;
 

core/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java

@@ -31,10 +31,10 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-import javax.annotation.Resources;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.annotation.Resource;
+import jakarta.annotation.Resources;
 
 
 import org.apache.cxf.common.annotation.AbstractAnnotationVisitor;

core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java

@@ -36,9 +36,9 @@
 import java.util.Set;
 import java.util.regex.Pattern;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.annotation.XmlElementDecl;
 import javax.xml.transform.dom.DOMSource;
 
 import org.apache.cxf.common.classloader.ClassLoaderUtils;