Refactor jaxb_fat to xmlbinding.4.0_fat and other code review changes

dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml

@@ -2536,6 +2536,11 @@
       <artifactId>org.eclipse.persistence.core</artifactId>
       <version>3.0.2</version>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.persistence</groupId>
+      <artifactId>org.eclipse.persistence.core</artifactId>
+      <version>4.0.0-M3</version>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.persistence</groupId>
       <artifactId>org.eclipse.persistence.jpa.jpql</artifactId>
@@ -2566,6 +2571,11 @@
       <artifactId>org.eclipse.persistence.jpa</artifactId>
       <version>3.0.2</version>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.persistence</groupId>
+      <artifactId>org.eclipse.persistence.moxy</artifactId>
+      <version>4.0.0-M3</version>
+    </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>yasson</artifactId>

dev/cnf/oss_dependencies.maven

@@ -503,12 +503,14 @@ org.eclipse.persistence:org.eclipse.persistence.antlr:2.7.10
 org.eclipse.persistence:org.eclipse.persistence.asm:9.3.0
 org.eclipse.persistence:org.eclipse.persistence.core:2.7.10
 org.eclipse.persistence:org.eclipse.persistence.core:3.0.2
+org.eclipse.persistence:org.eclipse.persistence.core:4.0.0-M3
 org.eclipse.persistence:org.eclipse.persistence.jpa.jpql:2.7.10
 org.eclipse.persistence:org.eclipse.persistence.jpa.jpql:3.0.2
 org.eclipse.persistence:org.eclipse.persistence.jpa.modelgen.processor:2.7.10
 org.eclipse.persistence:org.eclipse.persistence.jpa.modelgen.processor:3.0.2
 org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.10
 org.eclipse.persistence:org.eclipse.persistence.jpa:3.0.2
+org.eclipse.persistence:org.eclipse.persistence.moxy:4.0.0-M3
 org.eclipse:yasson:2.0.1
 org.eclipse:yasson:3.0.0
 org.ehcache:ehcache:3.8.1

dev/com.ibm.ws.jaxb_fat/.classpath

@@ -3,9 +3,6 @@
 	<classpathentry kind="src" path="fat/src"/>
 	<classpathentry kind="src" path="test-applications/jaxbApp/src"/>
 	<classpathentry kind="src" path="test-applications/thirdPartyJaxbApp/src"/>
-	<classpathentry kind="src" path="test-applications/jaxbContextThidPartyApp/src"/>
-	<classpathentry kind="src" path="test-applications/thirdPartyImplJaxbContextApp/src"/>
-	<classpathentry kind="src" path="test-applications/thirdPartyJaxbImplContextApp/src"/>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="output" path="bin"/>

dev/com.ibm.ws.jaxb_fat/bnd.bnd

@@ -1,5 +1,5 @@
 #*******************************************************************************
-# Copyright (c) 2018,2022 IBM Corporation and others.
+# Copyright (c) 2018 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -14,29 +14,23 @@ bVersion=1.0
 src: \
 	fat/src,\
 	test-applications/jaxbApp/src,\
-	test-applications/thirdPartyJaxbApp/src, \
-	test-applications/thirdPartyJaxbImplContextApp/src
-
+	test-applications/thirdPartyJaxbApp/src
+
 fat.project: true
 
 # These features get added programmatically
 tested.features: \
   jaxrs-2.0,\
   jpa-2.1,\
   ldapregistry-3.0,\
-  jaxb-2.3, \
   servlet-5.0, \
   xmlBinding-3.0, \
   servlet-6.0, \
   xmlBinding-4.0
 
 -buildpath: \
-	javax.activation:activation;version='1.1',\
-	com.sun.activation:jakarta.activation;version='2.0.0',\
-	com.ibm.websphere.javaee.jaxb.2.2;version=latest,\
-	io.openliberty.jakarta.activation.2.0;version=latest,\
-	io.openliberty.jakarta.xmlBinding.4.0;version=latest,\
-	com.ibm.websphere.javaee.servlet.3.1;version=latest,\
-	com.ibm.ws.logging,\
-	com.ibm.websphere.javaee.jaxb.2.2,\
-	org.apache.santuario.xmlsec
+	javax.activation:activation;version=1.1,\
+	com.sun.activation:jakarta.activation;version=2.0.0,\
+    com.ibm.websphere.javaee.jaxb.2.2;version=latest,\
+    io.openliberty.jakarta.activation.2.0;version=latest,\
+	com.ibm.websphere.javaee.servlet.3.1;version=latest

dev/com.ibm.ws.jaxb_fat/fat/src/com/ibm/ws/jaxb/fat/LibertyJAXBTest.java

@@ -10,25 +10,20 @@
  *******************************************************************************/
 package com.ibm.ws.jaxb.fat;
 
-import java.util.Arrays;
-
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 
 import com.ibm.websphere.simplicity.ShrinkHelper;
 
-import componenttest.annotation.MinimumJavaLevel;
 import componenttest.annotation.Server;
 import componenttest.annotation.TestServlet;
 import componenttest.custom.junit.runner.FATRunner;
-import componenttest.rules.repeater.JakartaEE9Action;
 import componenttest.topology.impl.LibertyServer;
 import componenttest.topology.utils.FATServletClient;
 import jaxb.web.JAXBTestServlet;
 
 @RunWith(FATRunner.class)
-@MinimumJavaLevel(javaLevel = 11)
 public class LibertyJAXBTest extends FATServletClient {
 
     private static final String APP_NAME = "jaxbApp";
@@ -39,11 +34,7 @@ public class LibertyJAXBTest extends FATServletClient {
 
     @BeforeClass
     public static void setUp() throws Exception {
-        ShrinkHelper.defaultDropinApp(server, APP_NAME, "jaxb.web", "jaxb.web.dataobjects", "jaxb.web.utils");
-
-        if (JakartaEE9Action.isActive()) {
-            server.changeFeatures(Arrays.asList("xmlBinding-3.0", "servlet-5.0", "componenttest-2.0"));
-        }
+        ShrinkHelper.defaultDropinApp(server, APP_NAME, "jaxb.web");
 
         server.startServer();
     }

dev/com.ibm.ws.jaxb_fat/publish/servers/jaxb_fat/bootstrap.properties

@@ -12,4 +12,3 @@ bootstrap.include=../testports.properties
 # This server is exempt from j2sec because it only tests third-party/JDK usage of JAX-B
 # The only Liberty code involved is trivial server start and servlet GET logic
 websphere.java.security.exempt=true
-com.ibm.ws.logging.trace.specification=io.openliberty.xmlbinding.*=all:jakarta.xml.bind.*=all:Jaxb=all