CXF-8671: Support Jakarta EE 10

BUILDING.txt

@@ -29,7 +29,7 @@ Building
 	$> mvn
    This will compile Apache CXF and run all of the tests in the Apache CXF source
    distribution. Alternatively, you can run
-    $> mvn -Pfastinstall.
+    $> mvn -Pfastinstall
    This will compile Apache CXF without running the tests and takes less
    time to build.
    Depending on the load of remote Maven repositories, you may have 

core/src/test/java/com/ibm/xml/mock/marshaller/MockMarshaller.java

@@ -121,23 +121,20 @@ public ValidationEventHandler getEventHandler() throws JAXBException {
         return null;
     }
 
-    @SuppressWarnings("rawtypes")
     @Override
-    public void setAdapter(XmlAdapter adapter) {
+    public <A extends XmlAdapter<?, ?>> void setAdapter(A adapter) {
         // TODO Auto-generated method stub
 
     }
 
-    @SuppressWarnings("rawtypes")
     @Override
-    public <A extends XmlAdapter> void setAdapter(Class<A> type, A adapter) {
+    public <A extends XmlAdapter<?, ?>> void setAdapter(Class<A> type, A adapter) {
         // TODO Auto-generated method stub
 
     }
 
-    @SuppressWarnings("rawtypes")
     @Override
-    public <A extends XmlAdapter> A getAdapter(Class<A> type) {
+    public <A extends XmlAdapter<?, ?>> A getAdapter(Class<A> type) {
         // TODO Auto-generated method stub
         return null;
     }

distribution/javadoc/pom.xml

@@ -420,7 +420,7 @@
         </dependency>
         <dependency>
              <groupId>io.undertow</groupId>
-             <artifactId>undertow-servlet-jakarta</artifactId>
+             <artifactId>undertow-servlet</artifactId>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>

distribution/src/main/release/samples/jax_rs/description_openapi_microprofile_spring/pom.xml

@@ -78,9 +78,12 @@
             <artifactId>cxf-rt-rs-service-description-microprofile-openapi</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.johnzon</groupId>
-            <artifactId>johnzon-jsonb</artifactId>
-            <classifier>jakarta</classifier>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-rs-extension-providers</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse</groupId>
+            <artifactId>yasson</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

distribution/src/main/release/samples/jax_rs/description_openapi_microprofile_spring/src/main/java/demo/jaxrs/openapi/server/AppConfig.java

@@ -4,7 +4,7 @@
 
 import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
 import org.apache.cxf.jaxrs.microprofile.openapi.OpenApiFeature;
-import org.apache.johnzon.jaxrs.jsonb.jaxrs.JsonbJaxrsProvider;
+import org.apache.cxf.jaxrs.provider.jsrjsonb.JsrJsonbProvider;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -29,7 +29,7 @@ org.apache.cxf.endpoint.Server server() {
         factory.setFeatures(Arrays.asList(openApiFeature()));
         factory.setServiceBean(sampleResource());
         factory.setAddress("http://localhost:9000/");
-        factory.setProvider(new JsonbJaxrsProvider<>());
+        factory.setProvider(new JsrJsonbProvider());
         return factory.create();
     }
 }

distribution/src/main/release/samples/jax_rs/sse_client/pom.xml

@@ -44,11 +44,11 @@
             <groupId>io.undertow</groupId>
             <artifactId>undertow-core</artifactId>
         </dependency>
-
+	
         <dependency>
             <groupId>io.undertow</groupId>
-            <artifactId>undertow-servlet-jakarta</artifactId>
-        </dependency>
+	    <artifactId>undertow-servlet</artifactId>
+	</dependency>
     </dependencies>
 
     <profiles>

distribution/src/main/release/samples/pom.xml

@@ -31,7 +31,7 @@
         <!-- don't deploy the samples, kind of pointless -->
         <maven.deploy.skip>true</maven.deploy.skip>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <cxf.spring.boot.version>3.0.12</cxf.spring.boot.version>
+        <cxf.spring.boot.version>3.1.4</cxf.spring.boot.version>
         <cxf.spring.cloud.eureka.version>4.0.3</cxf.spring.cloud.eureka.version>
         <cxf.jetty11.version>11.0.17</cxf.jetty11.version>
         <cxf.netty.version>4.1.100.Final</cxf.netty.version>

integration/cdi/src/main/java/org/apache/cxf/cdi/AbstractCXFBean.java

@@ -60,11 +60,6 @@ public boolean isAlternative() {
         return false;
     }
 
-    @Override
-    public boolean isNullable() {
-        return false;
-    }
-
     @Override
     public Set<InjectionPoint> getInjectionPoints() {
         return Collections.emptySet();

integration/cdi/src/main/java/org/apache/cxf/cdi/CdiBusBean.java

@@ -24,6 +24,7 @@
 import jakarta.enterprise.context.spi.CreationalContext;
 import jakarta.enterprise.inject.spi.InjectionPoint;
 import jakarta.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.inject.spi.InjectionTargetFactory;
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.extension.ExtensionManagerBus;
@@ -35,8 +36,8 @@ final class CdiBusBean extends AbstractCXFBean< ExtensionManagerBus > {
 
     private final InjectionTarget<ExtensionManagerBus> injectionTarget;
 
-    CdiBusBean(final InjectionTarget<ExtensionManagerBus> injectionTarget) {
-        this.injectionTarget = injectionTarget;
+    CdiBusBean(final InjectionTargetFactory<ExtensionManagerBus> injectionTargetFactory) {
+        this.injectionTarget = injectionTargetFactory.createInjectionTarget(this);
     }
 
     @Override

integration/cdi/src/main/java/org/apache/cxf/cdi/CdiServerConfigurableFactory.java

@@ -67,7 +67,7 @@ public <T> Object create(Class<T> cls) {
                 final CreationalContext<?> context = beanManager.createCreationalContext(bean);
 
                 if (!beanManager.isNormalScope(bean.getScope())) {
-                    beanManager.fireEvent(new DisposableCreationalContext(context));
+                    beanManager.getEvent().fire(new DisposableCreationalContext(context));
                 }
 
                 return beanManager.getReference(bean, cls, context);

integration/cdi/src/main/java/org/apache/cxf/cdi/ContextProducerBean.java

@@ -64,11 +64,6 @@ public Object create(CreationalContext<Object> creationalContext) {
         return createContextValue();
     }
 
-    @Override
-    public boolean isNullable() {
-        return true;
-    }
-
     @Override
     public Set<Type> getTypes() {
         Set<Type> types = super.getTypes();

integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java

@@ -43,7 +43,6 @@
 import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
 import jakarta.enterprise.inject.spi.BeforeShutdown;
 import jakarta.enterprise.inject.spi.Extension;
-import jakarta.enterprise.inject.spi.InjectionTarget;
 import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
 import jakarta.enterprise.inject.spi.ProcessBean;
 import jakarta.enterprise.inject.spi.ProcessProducerField;
@@ -164,7 +163,7 @@ void onStartup(@Observes final BeforeBeanDiscovery beforeBeanDiscovery, final Be
                 "jakarta.servlet.http.HttpServletRequest",
                 "jakarta.servlet.ServletContext"));
         }
-        beanManager.fireEvent(this);
+        beanManager.getEvent().fire(this);
     }
 
     /**
@@ -268,9 +267,7 @@ public void injectBus(@Observes final AfterBeanDiscovery event, final BeanManage
             final AnnotatedType< ExtensionManagerBus > busAnnotatedType =
                 beanManager.createAnnotatedType(ExtensionManagerBus.class);
 
-            final InjectionTarget<ExtensionManagerBus> busInjectionTarget =
-                beanManager.createInjectionTarget(busAnnotatedType);
-            event.addBean(new CdiBusBean(busInjectionTarget));
+            event.addBean(new CdiBusBean(beanManager.getInjectionTargetFactory(busAnnotatedType)));
         }
 
         if (applicationBeans.isEmpty() && !serviceBeans.isEmpty()) {

integration/cdi/src/test/java/org/apache/cxf/cdi/JAXRSCdiResourceExtensionTest.java

@@ -22,6 +22,7 @@
 import jakarta.enterprise.inject.spi.Annotated;
 import jakarta.enterprise.inject.spi.Bean;
 import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.InjectionTargetFactory;
 import jakarta.enterprise.inject.spi.ProcessBean;
 import jakarta.ws.rs.Path;
 import org.apache.cxf.Bus;
@@ -49,9 +50,12 @@ public class JAXRSCdiResourceExtensionTest {
     private ProcessBean<Bus> processBean;
     @Mock
     private Annotated annotated;
-
+    @Mock
+    private InjectionTargetFactory<Object> factory;
+
     @Test
     public void shouldNotAddDefaultApplicationWhenNoResourcesDefined() {
+        when(beanManager.getInjectionTargetFactory(any())).thenReturn(factory);
         extension.injectBus(event, beanManager);
 
         verify(event).addBean(any(CdiBusBean.class));
@@ -80,6 +84,7 @@ public void shouldAddApplicationBeanWhenResourcesProvided() {
         when(annotated.isAnnotationPresent(Path.class)).thenReturn(true);
         extension.collect(processBean, beanManager);
 
+        when(beanManager.getInjectionTargetFactory(any())).thenReturn(factory);
         extension.injectBus(event, beanManager);
 
         verify(event).addBean(any(DefaultApplicationBean.class));

integration/spring-boot/autoconfigure/pom.xml

@@ -115,14 +115,14 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>${cxf.servlet-api.group}</groupId>
-            <artifactId>${cxf.servlet-api.artifact}</artifactId>
-            <version>${cxf.servlet-api.version}</version>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>jakarta.validation</groupId>
-            <artifactId>jakarta.validation-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${cxf.servlet-api.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>

maven-plugins/codegen-plugin/pom.xml

@@ -196,10 +196,10 @@
                     </execution>
                 </executions>
                 <dependencies>
-                   <dependency>
-                       <groupId>jakarta.xml.bind</groupId>
-                       <artifactId>jakarta.xml.bind-api</artifactId>
-                       <version>${cxf.jaxb.version}</version>
+                    <dependency>
+                        <groupId>jakarta.xml.bind</groupId>
+                        <artifactId>jakarta.xml.bind-api</artifactId>
+                        <version>${cxf.jaxb.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>

maven-plugins/codegen-plugin/src/it/jaxb-xjc-runtime-sources/pom.xml

@@ -77,9 +77,9 @@
     </build>
   <profiles>
     <profile>
-      <id>java9</id>
+      <id>java11</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[11,)</jdk>
       </activation>
       <dependencies>
           <dependency>
@@ -90,7 +90,7 @@
           <dependency>
             <groupId>jakarta.xml.ws</groupId>
             <artifactId>jakarta.xml.ws-api</artifactId>
-            <version>3.0.0</version>
+            <version>4.0.0</version>
           </dependency>
           <dependency>
             <groupId>jakarta.jws</groupId>
@@ -100,7 +100,7 @@
           <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>3.0.1</version>
+            <version>4.0.0</version>
           </dependency>
       </dependencies>
     </profile>

maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml

@@ -112,9 +112,9 @@
       </build>
     </profile>
     <profile>
-      <id>java9</id>
+      <id>java11</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[11,)</jdk>
       </activation>
       <dependencies>
           <dependency>
@@ -125,7 +125,7 @@
           <dependency>
             <groupId>jakarta.xml.ws</groupId>
             <artifactId>jakarta.xml.ws-api</artifactId>
-            <version>3.0.0</version>
+            <version>4.0.0</version>
           </dependency>
           <dependency>
             <groupId>jakarta.jws</groupId>
@@ -135,7 +135,7 @@
           <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>3.0.1</version>
+            <version>4.0.0</version>
           </dependency>
       </dependencies>
     </profile>

maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml

@@ -75,9 +75,9 @@
     </build>
   <profiles>
     <profile>
-      <id>java9</id>
+      <id>java11</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[11,)</jdk>
       </activation>
       <dependencies>
           <dependency>
@@ -88,7 +88,7 @@
           <dependency>
             <groupId>jakarta.xml.ws</groupId>
             <artifactId>jakarta.xml.ws-api</artifactId>
-            <version>3.0.0</version>
+            <version>4.0.0</version>
           </dependency>
           <dependency>
             <groupId>jakarta.jws</groupId>
@@ -98,7 +98,7 @@
           <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>3.0.1</version>
+            <version>4.0.0</version>
           </dependency>
       </dependencies>
     </profile>

maven-plugins/codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml

@@ -77,9 +77,9 @@
     </build>
   <profiles>
     <profile>
-      <id>java9</id>
+      <id>java11</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[11,)</jdk>
       </activation>
       <dependencies>
           <dependency>
@@ -90,7 +90,7 @@
           <dependency>
             <groupId>jakarta.xml.ws</groupId>
             <artifactId>jakarta.xml.ws-api</artifactId>
-            <version>3.0.0</version>
+            <version>4.0.0</version>
           </dependency>
           <dependency>
             <groupId>jakarta.jws</groupId>
@@ -100,7 +100,7 @@
           <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>3.0.1</version>
+            <version>4.0.0</version>
           </dependency>
       </dependencies>
     </profile>