diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 038b7b3e886..a1b57054a05 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -14,9 +14,9 @@ name: EclipseLink PR build
 
 on:
   push:
-    branches: [ main, master ]
+    branches: [ '4.0' ]
   pull_request:
-    branches: [ main, master ]
+    branches: [ '4.0' ]
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 jobs:
diff --git a/foundation/org.eclipse.persistence.corba/pom.xml b/foundation/org.eclipse.persistence.corba/pom.xml
index d458dd35dad..b1a4199f196 100644
--- a/foundation/org.eclipse.persistence.corba/pom.xml
+++ b/foundation/org.eclipse.persistence.corba/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2019, 2021 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2019, 2023 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0 which is available at
@@ -183,7 +183,7 @@
             <!-- see https://github.com/eclipse-ee4j/orb-gmbal/issues/22 -->
             <id>corba-tests</id>
             <activation>
-                <jdk>[8,14)</jdk>
+                <jdk>[8,25)</jdk>
             </activation>
             <build>
                 <plugins>
diff --git a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/corba/CorbaTestModel.java b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/corba/CorbaTestModel.java
index bbb14e1ed25..3a28a566970 100644
--- a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/corba/CorbaTestModel.java
+++ b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/corba/CorbaTestModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -20,10 +20,10 @@
 import org.eclipse.persistence.internal.helper.Helper;
 import org.eclipse.persistence.testing.framework.TestModel;
 import org.eclipse.persistence.testing.framework.TestSuite;
-import org.eclipse.persistence.testing.tests.security.corba.SecurityWhileConvertingToMethodTest;
-import org.eclipse.persistence.testing.tests.security.corba.SecurityWhileConvertingToMethodTest.ConvertMethodAbstractSession;
-import org.eclipse.persistence.testing.tests.security.corba.SecurityWhileConvertingToMethodTest.ConvertMethodNoArg;
-import org.eclipse.persistence.testing.tests.security.corba.SecurityWhileConvertingToMethodTest.ConvertMethodSession;
+import org.eclipse.persistence.testing.tests.securitycorba.SecurityWhileConvertingToMethodTest;
+import org.eclipse.persistence.testing.tests.securitycorba.SecurityWhileConvertingToMethodTest.ConvertMethodAbstractSession;
+import org.eclipse.persistence.testing.tests.securitycorba.SecurityWhileConvertingToMethodTest.ConvertMethodNoArg;
+import org.eclipse.persistence.testing.tests.securitycorba.SecurityWhileConvertingToMethodTest.ConvertMethodSession;
 import org.eclipse.persistence.testing.tests.sessionsxml.corba.SessionsXMLSchemaSunCORBATransportConfigTest;
 
 public class CorbaTestModel extends TestModel {
diff --git a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/RMIConnectionExceptionsTest.java b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/rmi/IIOP/RMIConnectionExceptionsTest.java
similarity index 88%
rename from foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/RMIConnectionExceptionsTest.java
rename to foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/rmi/IIOP/RMIConnectionExceptionsTest.java
index 900ba2d1cfc..517c65777c2 100644
--- a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/RMIConnectionExceptionsTest.java
+++ b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/rmi/IIOP/RMIConnectionExceptionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -12,7 +12,7 @@
 
 // Contributors:
 //     Oracle - initial API and implementation from Oracle TopLink
-package org.eclipse.persistence.testing.tests.remote.rmi.IIOP;
+package org.eclipse.persistence.testing.tests.remotecorba.rmi.IIOP;
 
 import javax.naming.InitialContext;
 import java.lang.reflect.Method;
@@ -50,7 +50,7 @@ public void setup() throws Exception {
     session.setProperty("TransporterGenerator", generator);
     RMIServerManagerController.start(session, getNameToBind(), "org.eclipse.persistence.testing.tests.remote.rmi.IIOP.RMIRemoteSessionControllerDispatcherForTestingExceptions");
     InitialContext initialNamingContext = new InitialContext();
-    RMIServerManager serverManager = (RMIServerManager) initialNamingContext.lookup(getNameToBind());
+    org.eclipse.persistence.testing.tests.remotecorba.rmi.IIOP.RMIServerManager serverManager = (RMIServerManager) initialNamingContext.lookup(getNameToBind());
     RMIConnection rmiConnection = new RMIConnection(serverManager.createRemoteSessionController());
     setRemoteConnection(rmiConnection);
 }
diff --git a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/RMIIIOPRemoteModel.java b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/rmi/IIOP/RMIIIOPRemoteModel.java
similarity index 96%
rename from foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/RMIIIOPRemoteModel.java
rename to foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/rmi/IIOP/RMIIIOPRemoteModel.java
index 8e1d0ac82d8..5a17becf41f 100644
--- a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/RMIIIOPRemoteModel.java
+++ b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/rmi/IIOP/RMIIIOPRemoteModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -12,7 +12,7 @@
 
 // Contributors:
 //     Oracle - initial API and implementation from Oracle TopLink
-package org.eclipse.persistence.testing.tests.remote.rmi.IIOP;
+package org.eclipse.persistence.testing.tests.remotecorba.rmi.IIOP;
 
 import java.rmi.*;
 
diff --git a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/RMIRemoteSessionControllerDispatcherForTestingExceptions.java b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/rmi/IIOP/RMIRemoteSessionControllerDispatcherForTestingExceptions.java
similarity index 99%
rename from foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/RMIRemoteSessionControllerDispatcherForTestingExceptions.java
rename to foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/rmi/IIOP/RMIRemoteSessionControllerDispatcherForTestingExceptions.java
index a4ed3fd2360..7073a8ac32e 100644
--- a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/RMIRemoteSessionControllerDispatcherForTestingExceptions.java
+++ b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/rmi/IIOP/RMIRemoteSessionControllerDispatcherForTestingExceptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -12,7 +12,7 @@
 
 // Contributors:
 //     Oracle - initial API and implementation from Oracle TopLink
-package org.eclipse.persistence.testing.tests.remote.rmi.IIOP;
+package org.eclipse.persistence.testing.tests.remotecorba.rmi.IIOP;
 
 import org.eclipse.persistence.internal.sessions.remote.Transporter;
 import org.eclipse.persistence.sessions.Session;
diff --git a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/RMIServerManager.java b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/rmi/IIOP/RMIServerManager.java
similarity index 83%
rename from foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/RMIServerManager.java
rename to foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/rmi/IIOP/RMIServerManager.java
index 199e1c7bcdf..22566b943ab 100644
--- a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/RMIServerManager.java
+++ b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/rmi/IIOP/RMIServerManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -12,7 +12,7 @@
 
 // Contributors:
 //     Oracle - initial API and implementation from Oracle TopLink
-package org.eclipse.persistence.testing.tests.remote.rmi.IIOP;
+package org.eclipse.persistence.testing.tests.remotecorba.rmi.IIOP;
 
 import java.rmi.*;
 import org.eclipse.persistence.sessions.remote.rmi.iiop.*;
diff --git a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/RMIServerManagerController.java b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/rmi/IIOP/RMIServerManagerController.java
similarity index 97%
rename from foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/RMIServerManagerController.java
rename to foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/rmi/IIOP/RMIServerManagerController.java
index 0692d9d3878..d3611da8e29 100644
--- a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/RMIServerManagerController.java
+++ b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/rmi/IIOP/RMIServerManagerController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -12,7 +12,7 @@
 
 // Contributors:
 //     Oracle - initial API and implementation from Oracle TopLink
-package org.eclipse.persistence.testing.tests.remote.rmi.IIOP;
+package org.eclipse.persistence.testing.tests.remotecorba.rmi.IIOP;
 
 import java.lang.reflect.Constructor;
 import java.rmi.RMISecurityManager;
diff --git a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/_RMIServerManagerController_Tie.java b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/rmi/IIOP/_RMIServerManagerController_Tie.java
similarity index 95%
rename from foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/_RMIServerManagerController_Tie.java
rename to foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/rmi/IIOP/_RMIServerManagerController_Tie.java
index e87b5b523d9..84e4a004104 100644
--- a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/_RMIServerManagerController_Tie.java
+++ b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/rmi/IIOP/_RMIServerManagerController_Tie.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -12,7 +12,7 @@
 
 // Contributors:
 //     Oracle - initial API and implementation from Oracle TopLink
-package org.eclipse.persistence.testing.tests.remote.rmi.IIOP;
+package org.eclipse.persistence.testing.tests.remotecorba.rmi.IIOP;
 
 // Tie class generated by rmic, do not edit.
 // Contents subject to change without notice.
diff --git a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/_RMIServerManager_Stub.java b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/rmi/IIOP/_RMIServerManager_Stub.java
similarity index 95%
rename from foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/_RMIServerManager_Stub.java
rename to foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/rmi/IIOP/_RMIServerManager_Stub.java
index 23e919a87b0..b26b7b759f5 100644
--- a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/_RMIServerManager_Stub.java
+++ b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/rmi/IIOP/_RMIServerManager_Stub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -12,7 +12,7 @@
 
 // Contributors:
 //     Oracle - initial API and implementation from Oracle TopLink
-package org.eclipse.persistence.testing.tests.remote.rmi.IIOP;
+package org.eclipse.persistence.testing.tests.remotecorba.rmi.IIOP;
 
 // Stub class generated by rmic, do not edit.
 // Contents subject to change without notice.
diff --git a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/CORBAConnectionExceptionsTest.java b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/suncorba/CORBAConnectionExceptionsTest.java
similarity index 94%
rename from foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/CORBAConnectionExceptionsTest.java
rename to foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/suncorba/CORBAConnectionExceptionsTest.java
index 26f74214c9f..aef5f36c736 100644
--- a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/CORBAConnectionExceptionsTest.java
+++ b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/suncorba/CORBAConnectionExceptionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -12,7 +12,7 @@
 
 // Contributors:
 //     Oracle - initial API and implementation from Oracle TopLink
-package org.eclipse.persistence.testing.tests.remote.suncorba;
+package org.eclipse.persistence.testing.tests.remotecorba.suncorba;
 
 import java.util.Properties;
 
diff --git a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/CORBARemoteSessionControllerDispatcherForTestingExceptions.java b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/suncorba/CORBARemoteSessionControllerDispatcherForTestingExceptions.java
similarity index 99%
rename from foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/CORBARemoteSessionControllerDispatcherForTestingExceptions.java
rename to foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/suncorba/CORBARemoteSessionControllerDispatcherForTestingExceptions.java
index 27c66f78c58..1fcb9af5c2b 100644
--- a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/CORBARemoteSessionControllerDispatcherForTestingExceptions.java
+++ b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/suncorba/CORBARemoteSessionControllerDispatcherForTestingExceptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -12,7 +12,7 @@
 
 // Contributors:
 //     Oracle - initial API and implementation from Oracle TopLink
-package org.eclipse.persistence.testing.tests.remote.suncorba;
+package org.eclipse.persistence.testing.tests.remotecorba.suncorba;
 
 import org.eclipse.persistence.internal.sessions.remote.Transporter;
 import org.eclipse.persistence.sessions.Session;
diff --git a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/CORBAServerManager.java b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/suncorba/CORBAServerManager.java
similarity index 86%
rename from foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/CORBAServerManager.java
rename to foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/suncorba/CORBAServerManager.java
index b97f0029085..49037da390a 100644
--- a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/CORBAServerManager.java
+++ b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/suncorba/CORBAServerManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -12,7 +12,7 @@
 
 // Contributors:
 //     Oracle - initial API and implementation from Oracle TopLink
-package org.eclipse.persistence.testing.tests.remote.suncorba;
+package org.eclipse.persistence.testing.tests.remotecorba.suncorba;
 
 /**
 * org.eclipse.persistence.testing/Remote/SunCORBA/CORBAServerManager.java
diff --git a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/CORBAServerManagerController.java b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/suncorba/CORBAServerManagerController.java
similarity index 96%
rename from foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/CORBAServerManagerController.java
rename to foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/suncorba/CORBAServerManagerController.java
index 002b235204a..3edc7aca1d9 100644
--- a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/CORBAServerManagerController.java
+++ b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/suncorba/CORBAServerManagerController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -12,7 +12,7 @@
 
 // Contributors:
 //     Oracle - initial API and implementation from Oracle TopLink
-package org.eclipse.persistence.testing.tests.remote.suncorba;
+package org.eclipse.persistence.testing.tests.remotecorba.suncorba;
 
 import java.lang.reflect.Constructor;
 import java.util.Properties;
diff --git a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/CORBAServerManagerHelper.java b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/suncorba/CORBAServerManagerHelper.java
similarity index 61%
rename from foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/CORBAServerManagerHelper.java
rename to foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/suncorba/CORBAServerManagerHelper.java
index 3498937d7a3..dbf68197285 100644
--- a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/CORBAServerManagerHelper.java
+++ b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/suncorba/CORBAServerManagerHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -12,7 +12,7 @@
 
 // Contributors:
 //     Oracle - initial API and implementation from Oracle TopLink
-package org.eclipse.persistence.testing.tests.remote.suncorba;
+package org.eclipse.persistence.testing.tests.remotecorba.suncorba;
 
 /**
 * org/eclipse/persistence/testing/Remote/SunCORBA/CORBAServerManagerHelper.java
@@ -26,7 +26,7 @@ abstract public class CORBAServerManagerHelper
   private static String  _id = "IDL:org/eclipse/persistence/testing/Remote/SunCORBA/CORBAServerManager:1.0";
 
   private static org.omg.CORBA.TypeCode __typeCode = null;
-  public static org.eclipse.persistence.testing.tests.remote.suncorba.CORBAServerManager extract (org.omg.CORBA.Any a)
+  public static CORBAServerManager extract (org.omg.CORBA.Any a)
   {
     return read (a.create_input_stream ());
   }
@@ -34,28 +34,28 @@ public static String id ()
   {
     return _id;
   }
-  public static void insert (org.omg.CORBA.Any a, org.eclipse.persistence.testing.tests.remote.suncorba.CORBAServerManager that)
+  public static void insert (org.omg.CORBA.Any a, CORBAServerManager that)
   {
     org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
     a.type (type ());
     write (out, that);
     a.read_value (out.create_input_stream (), type ());
   }
-  public static org.eclipse.persistence.testing.tests.remote.suncorba.CORBAServerManager narrow (org.omg.CORBA.Object obj)
+  public static CORBAServerManager narrow (org.omg.CORBA.Object obj)
   {
     if (obj == null)
       return null;
-    else if (obj instanceof org.eclipse.persistence.testing.tests.remote.suncorba.CORBAServerManager)
-      return (org.eclipse.persistence.testing.tests.remote.suncorba.CORBAServerManager)obj;
+    else if (obj instanceof CORBAServerManager)
+      return (CORBAServerManager)obj;
     else if (!obj._is_a (id ()))
       throw new org.omg.CORBA.BAD_PARAM ();
     else
     {
       org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate ();
-      return new org.eclipse.persistence.testing.tests.remote.suncorba._CORBAServerManagerStub (delegate);
+      return new _CORBAServerManagerStub(delegate);
     }
   }
-  public static org.eclipse.persistence.testing.tests.remote.suncorba.CORBAServerManager read (org.omg.CORBA.portable.InputStream istream)
+  public static CORBAServerManager read (org.omg.CORBA.portable.InputStream istream)
   {
     return narrow (istream.read_Object (_CORBAServerManagerStub.class));
   }
@@ -63,11 +63,11 @@ synchronized public static org.omg.CORBA.TypeCode type ()
   {
     if (__typeCode == null)
     {
-      __typeCode = org.omg.CORBA.ORB.init ().create_interface_tc (org.eclipse.persistence.testing.tests.remote.suncorba.CORBAServerManagerHelper.id (), "CORBAServerManager");
+      __typeCode = org.omg.CORBA.ORB.init ().create_interface_tc (CORBAServerManagerHelper.id (), "CORBAServerManager");
     }
     return __typeCode;
   }
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.eclipse.persistence.testing.tests.remote.suncorba.CORBAServerManager value)
+  public static void write (org.omg.CORBA.portable.OutputStream ostream, CORBAServerManager value)
   {
     ostream.write_Object (value);
   }
diff --git a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/CORBAServerManagerHolder.java b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/suncorba/CORBAServerManagerHolder.java
similarity index 62%
rename from foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/CORBAServerManagerHolder.java
rename to foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/suncorba/CORBAServerManagerHolder.java
index a7742f8c4c9..e610ae5909a 100644
--- a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/CORBAServerManagerHolder.java
+++ b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/suncorba/CORBAServerManagerHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -12,7 +12,7 @@
 
 // Contributors:
 //     Oracle - initial API and implementation from Oracle TopLink
-package org.eclipse.persistence.testing.tests.remote.suncorba;
+package org.eclipse.persistence.testing.tests.remotecorba.suncorba;
 
 /**
 * org.eclipse.persistence.testing/Remote/SunCORBA/CORBAServerManagerHolder.java
@@ -23,28 +23,28 @@
 
 public final class CORBAServerManagerHolder implements org.omg.CORBA.portable.Streamable
 {
-  public org.eclipse.persistence.testing.tests.remote.suncorba.CORBAServerManager value = null;
+  public CORBAServerManager value = null;
 
   public CORBAServerManagerHolder ()
   {
   }
-  public CORBAServerManagerHolder (org.eclipse.persistence.testing.tests.remote.suncorba.CORBAServerManager initialValue)
+  public CORBAServerManagerHolder (CORBAServerManager initialValue)
   {
     value = initialValue;
   }
   @Override
   public void _read (org.omg.CORBA.portable.InputStream i)
   {
-    value = org.eclipse.persistence.testing.tests.remote.suncorba.CORBAServerManagerHelper.read (i);
+    value = CORBAServerManagerHelper.read (i);
   }
   @Override
   public org.omg.CORBA.TypeCode _type ()
   {
-    return org.eclipse.persistence.testing.tests.remote.suncorba.CORBAServerManagerHelper.type ();
+    return CORBAServerManagerHelper.type ();
   }
   @Override
   public void _write (org.omg.CORBA.portable.OutputStream o)
   {
-    org.eclipse.persistence.testing.tests.remote.suncorba.CORBAServerManagerHelper.write (o, value);
+    CORBAServerManagerHelper.write (o, value);
   }
 }
diff --git a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/CORBAServerManagerOperations.java b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/suncorba/CORBAServerManagerOperations.java
similarity index 87%
rename from foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/CORBAServerManagerOperations.java
rename to foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/suncorba/CORBAServerManagerOperations.java
index 0f3da1ca63f..5504ce20d52 100644
--- a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/CORBAServerManagerOperations.java
+++ b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/suncorba/CORBAServerManagerOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -12,7 +12,7 @@
 
 // Contributors:
 //     Oracle - initial API and implementation from Oracle TopLink
-package org.eclipse.persistence.testing.tests.remote.suncorba;
+package org.eclipse.persistence.testing.tests.remotecorba.suncorba;
 
 /**
 * org.eclipse.persistence.testing/Remote/SunCORBA/CORBAServerManagerOperations.java
diff --git a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/CORBAServerRunner.java b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/suncorba/CORBAServerRunner.java
similarity index 85%
rename from foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/CORBAServerRunner.java
rename to foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/suncorba/CORBAServerRunner.java
index 904d07eb17f..c1d3e98bcdf 100644
--- a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/CORBAServerRunner.java
+++ b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/suncorba/CORBAServerRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -12,7 +12,7 @@
 
 // Contributors:
 //     Oracle - initial API and implementation from Oracle TopLink
-package org.eclipse.persistence.testing.tests.remote.suncorba;
+package org.eclipse.persistence.testing.tests.remotecorba.suncorba;
 
 import org.eclipse.persistence.sessions.*;
 
diff --git a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/SunCORBARemoteModel.java b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/suncorba/SunCORBARemoteModel.java
similarity index 96%
rename from foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/SunCORBARemoteModel.java
rename to foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/suncorba/SunCORBARemoteModel.java
index 113052dc548..013840bf76b 100644
--- a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/SunCORBARemoteModel.java
+++ b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/suncorba/SunCORBARemoteModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -12,7 +12,7 @@
 
 // Contributors:
 //     Oracle - initial API and implementation from Oracle TopLink
-package org.eclipse.persistence.testing.tests.remote.suncorba;
+package org.eclipse.persistence.testing.tests.remotecorba.suncorba;
 
 import java.util.Properties;
 
diff --git a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/_CORBAServerManagerImplBase.java b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/suncorba/_CORBAServerManagerImplBase.java
similarity index 90%
rename from foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/_CORBAServerManagerImplBase.java
rename to foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/suncorba/_CORBAServerManagerImplBase.java
index 552578e0fc1..c361bbbad95 100644
--- a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/_CORBAServerManagerImplBase.java
+++ b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/suncorba/_CORBAServerManagerImplBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -12,7 +12,7 @@
 
 // Contributors:
 //     Oracle - initial API and implementation from Oracle TopLink
-package org.eclipse.persistence.testing.tests.remote.suncorba;
+package org.eclipse.persistence.testing.tests.remotecorba.suncorba;
 
 /**
 * org/eclipse/persistence/testing/Remote/SunCORBA/_CORBAServerManagerImplBase.java
@@ -22,7 +22,7 @@
 */
 
 public abstract class _CORBAServerManagerImplBase extends org.omg.CORBA.portable.ObjectImpl
-                implements org.eclipse.persistence.testing.tests.remote.suncorba.CORBAServerManager, org.omg.CORBA.portable.InvokeHandler
+                implements CORBAServerManager, org.omg.CORBA.portable.InvokeHandler
 {
 
   private static java.util.Hashtable _methods = new java.util.Hashtable ();
diff --git a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/_CORBAServerManagerStub.java b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/suncorba/_CORBAServerManagerStub.java
similarity index 92%
rename from foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/_CORBAServerManagerStub.java
rename to foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/suncorba/_CORBAServerManagerStub.java
index 3dc75106c49..6a50eecf132 100644
--- a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/_CORBAServerManagerStub.java
+++ b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remotecorba/suncorba/_CORBAServerManagerStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -12,7 +12,7 @@
 
 // Contributors:
 //     Oracle - initial API and implementation from Oracle TopLink
-package org.eclipse.persistence.testing.tests.remote.suncorba;
+package org.eclipse.persistence.testing.tests.remotecorba.suncorba;
 
 /**
 * org/eclipse/persistence/testing/Remote/SunCORBA/_CORBAServerManagerStub.java
@@ -21,7 +21,7 @@
 * Wednesday, August 23, 2000 1:20:43 PM EDT
 */
 
-public class _CORBAServerManagerStub extends org.omg.CORBA.portable.ObjectImpl implements org.eclipse.persistence.testing.tests.remote.suncorba.CORBAServerManager
+public class _CORBAServerManagerStub extends org.omg.CORBA.portable.ObjectImpl implements CORBAServerManager
 {
   // Type-specific CORBA::Object operations
   private static String[] __ids = {
diff --git a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/security/corba/SecurityWhileConvertingToMethodTest.java b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/securitycorba/SecurityWhileConvertingToMethodTest.java
similarity index 97%
rename from foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/security/corba/SecurityWhileConvertingToMethodTest.java
rename to foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/securitycorba/SecurityWhileConvertingToMethodTest.java
index 607ebf01f35..65c313209c3 100644
--- a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/security/corba/SecurityWhileConvertingToMethodTest.java
+++ b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/securitycorba/SecurityWhileConvertingToMethodTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -12,7 +12,7 @@
 
 // Contributors:
 //     Oracle - initial API and implementation from Oracle TopLink
-package org.eclipse.persistence.testing.tests.security.corba;
+package org.eclipse.persistence.testing.tests.securitycorba;
 
 import org.eclipse.persistence.exceptions.DescriptorException;
 import org.eclipse.persistence.exceptions.EclipseLinkException;
diff --git a/foundation/org.eclipse.persistence.oracle.nosql/pom.xml b/foundation/org.eclipse.persistence.oracle.nosql/pom.xml
index 27ae97e206a..9b2e2fdf7d5 100644
--- a/foundation/org.eclipse.persistence.oracle.nosql/pom.xml
+++ b/foundation/org.eclipse.persistence.oracle.nosql/pom.xml
@@ -166,19 +166,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>jar-test-sources</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>test-jar-no-fork</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/foundation/org.eclipse.persistence.oracle.nosql/src/it/java/org/eclipse/persistence/testing/models/order/eis/aq/OrderAmendments.java b/foundation/org.eclipse.persistence.oracle.nosql/src/it/java/org/eclipse/persistence/testing/models/eis/aq/OrderAmendments.java
similarity index 94%
rename from foundation/org.eclipse.persistence.oracle.nosql/src/it/java/org/eclipse/persistence/testing/models/order/eis/aq/OrderAmendments.java
rename to foundation/org.eclipse.persistence.oracle.nosql/src/it/java/org/eclipse/persistence/testing/models/eis/aq/OrderAmendments.java
index 64bad470e4c..5bc11a215a5 100644
--- a/foundation/org.eclipse.persistence.oracle.nosql/src/it/java/org/eclipse/persistence/testing/models/order/eis/aq/OrderAmendments.java
+++ b/foundation/org.eclipse.persistence.oracle.nosql/src/it/java/org/eclipse/persistence/testing/models/eis/aq/OrderAmendments.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,7 +14,7 @@
 //     Oracle - initial API and implementation from Oracle TopLink
 //     04/01/2016-2.7 Tomas Kraus
 //       - 490677: Database connection properties made configurable in test.properties
-package org.eclipse.persistence.testing.models.order.eis.aq;
+package org.eclipse.persistence.testing.models.eis.aq;
 
 import org.eclipse.persistence.descriptors.ClassDescriptor;
 import org.eclipse.persistence.eis.adapters.aq.AQPlatform;
diff --git a/foundation/org.eclipse.persistence.oracle.nosql/src/it/resources/org/eclipse/persistence/testing/models/order/eis/nosql/order-project.xml b/foundation/org.eclipse.persistence.oracle.nosql/src/it/resources/org/eclipse/persistence/testing/models/order/eis/nosql/order-project.xml
index 4a8e19bc0c5..48120516901 100644
--- a/foundation/org.eclipse.persistence.oracle.nosql/src/it/resources/org/eclipse/persistence/testing/models/order/eis/nosql/order-project.xml
+++ b/foundation/org.eclipse.persistence.oracle.nosql/src/it/resources/org/eclipse/persistence/testing/models/order/eis/nosql/order-project.xml
@@ -172,7 +172,7 @@
          </attribute-mappings>
          <descriptor-type>independent</descriptor-type>
          <amendment>
-            <amendment-class>org.eclipse.persistence.testing.models.order.eis.aq.OrderAmendments</amendment-class>
+            <amendment-class>org.eclipse.persistence.testing.models.eis.aq.OrderAmendments</amendment-class>
             <amendment-method>addToOrderDescriptor</amendment-method>
          </amendment>
          <instantiation/>
diff --git a/foundation/org.eclipse.persistence.oracle.test/pom.xml b/foundation/org.eclipse.persistence.oracle.test/pom.xml
index cf189b25595..fc8631d53c0 100644
--- a/foundation/org.eclipse.persistence.oracle.test/pom.xml
+++ b/foundation/org.eclipse.persistence.oracle.test/pom.xml
@@ -159,19 +159,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>jar-test-sources</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>test-jar-no-fork</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 9b592decc47..3d11bfd3587 100644
--- a/pom.xml
+++ b/pom.xml
@@ -186,27 +186,27 @@
         <!--Eclipse Dependencies version-->
         <eclipselink.asm.version>9.5.0</eclipselink.asm.version>
         <asm.version>9.5</asm.version>
-        <activation-api.version>2.1.1</activation-api.version>
-        <angus-activation.version>2.0.0</angus-activation.version>
+        <activation-api.version>2.1.2</activation-api.version>
+        <angus-activation.version>2.0.1</angus-activation.version>
         <annotation.version>2.1.1</annotation.version>
         <cdi.version>4.0.1</cdi.version>
         <ejb.version>4.0.1</ejb.version>
         <el-api.version>5.0.1</el-api.version>
         <el.version>5.0.0-M1</el.version>
-        <glassfish.version>7.0.1</glassfish.version>
+        <glassfish.version>7.0.5</glassfish.version>
         <jaxwsrt.version>4.0.1</jaxwsrt.version>
-        <jaxb.version>4.0.2</jaxb.version>
+        <jaxb.version>4.0.3</jaxb.version>
         <jaxb.api.version>4.0.0</jaxb.api.version>
         <soap.api.version>3.0.0</soap.api.version>
-        <jersey.version>3.1.1</jersey.version>
+        <jersey.version>3.1.2</jersey.version>
         <jms.version>3.1.0</jms.version>
-        <json.version>2.1.1</json.version>
+        <json.version>2.1.2</json.version>
         <jpa.api.version>3.1.0</jpa.api.version>
-        <mail-api.version>2.1.1</mail-api.version>
-        <angus-mail.version>2.0.1</angus-mail.version>
+        <mail-api.version>2.1.2</mail-api.version>
+        <angus-mail.version>2.0.2</angus-mail.version>
         <oracle.ddlparser.version>3.0.1</oracle.ddlparser.version>
         <org.glassfish.corba.version>4.2.4</org.glassfish.corba.version>
-        <parsson.version>1.1.1</parsson.version>
+        <parsson.version>1.1.2</parsson.version>
         <resource.version>2.1.0</resource.version>
         <servlet.version>6.0.0</servlet.version>
         <transaction.version>2.0.1</transaction.version>
@@ -228,19 +228,19 @@
         <hamcrest.version>1.3</hamcrest.version>
         <!-- CQ #23048 -->
         <hibernate.version>8.0.0.Final</hibernate.version>
-        <checkstyle.version>10.7.0</checkstyle.version>
+        <checkstyle.version>10.12.0</checkstyle.version>
         <!-- CQ #23049 -->
-        <jgroups.version>5.2.12.Final</jgroups.version>
+        <jgroups.version>5.2.14.Final</jgroups.version>
         <jmh.version>1.36</jmh.version>
         <junit.version>4.13.2</junit.version>
         <!-- CQ #24079 -->
-        <mongodb.version>3.12.11</mongodb.version>
-        <mysql.version>8.0.32</mysql.version>
-        <mariadb.version>3.1.2</mariadb.version>
+        <mongodb.version>3.12.14</mongodb.version>
+        <mysql.version>8.0.33</mysql.version>
+        <mariadb.version>3.1.4</mariadb.version>
         <mssql.version>12.2.0.jre11</mssql.version>
-        <pgsql.version>42.5.3</pgsql.version>
+        <pgsql.version>42.6.0</pgsql.version>
         <!-- CQ #21139, 21140 -->
-        <logback.version>1.4.5</logback.version>
+        <logback.version>1.4.7</logback.version>
         <oracle.jdbc.version>23.2.0.0</oracle.jdbc.version>
         <!-- CQ #2437 -->
         <oracle.aqapi.version>23.2.0.0</oracle.aqapi.version>
@@ -248,11 +248,11 @@
         <!-- CQ #21141 -->
         <oracle.nosql.version>18.3.10</oracle.nosql.version>
         <!-- CQ #24195 -->
-        <oracle.nosql.sdk.version>5.4.8</oracle.nosql.sdk.version>
+        <oracle.nosql.sdk.version>5.4.10</oracle.nosql.sdk.version>
         <!-- CQ #21142 -->
         <osgi.version>6.0.0</osgi.version>
         <!-- CQ #21143 -->
-        <slf4j.version>2.0.6</slf4j.version>
+        <slf4j.version>2.0.7</slf4j.version>
         <!-- CQ #23051, 23052, 23053, 53054, 53055 -->
         <springframework.version>5.3.25</springframework.version>
         <!-- CQ #23233 -->
@@ -1081,7 +1081,7 @@
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>5.1.8</version>
+                    <version>5.1.9</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -1091,7 +1091,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>3.4.2</version>
+                    <version>3.6.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -1101,27 +1101,27 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.10.1</version>
+                    <version>3.11.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>3.5.0</version>
+                    <version>3.6.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-deploy-plugin</artifactId>
-                    <version>3.0.0</version>
+                    <version>3.1.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>3.2.1</version>
+                    <version>3.3.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>3.0.0-M8</version>
+                    <version>3.1.2</version>
                     <configuration>
                         <useModulePath>false</useModulePath>
                         <forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"/>
@@ -1130,7 +1130,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-install-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>3.1.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -1140,12 +1140,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.4.1</version>
+                    <version>3.5.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.3.1</version>
                     <configuration>
                         <nonFilteredFileExtensions>
                             <nonFilteredFileExtension>gar</nonFilteredFileExtension>
@@ -1155,17 +1155,17 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-site-plugin</artifactId>
-                    <version>4.0.0-M4</version>
+                    <version>4.0.0-M8</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-source-plugin</artifactId>
-                    <version>3.2.1</version>
+                    <version>3.3.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.0.0-M8</version>
+                    <version>3.1.2</version>
                     <configuration>
                         <useModulePath>false</useModulePath>
                         <forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"/>
@@ -1174,7 +1174,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-report-plugin</artifactId>
-                    <version>3.0.0-M8</version>
+                    <version>3.1.2</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -1184,7 +1184,7 @@
                 <plugin>
                     <groupId>org.codehaus.cargo</groupId>
                     <artifactId>cargo-maven3-plugin</artifactId>
-                    <version>1.10.4</version>
+                    <version>1.10.7</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.gmaven</groupId>
@@ -1211,12 +1211,12 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.4.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>buildnumber-maven-plugin</artifactId>
-                    <version>3.0.0</version>
+                    <version>3.2.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
@@ -1290,7 +1290,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>3.2.1</version>
+                    <version>3.3.0</version>
                     <dependencies>
                         <dependency>
                             <groupId>com.puppycrawl.tools</groupId>
@@ -1311,7 +1311,7 @@
                 <plugin>
                     <groupId>com.github.spotbugs</groupId>
                     <artifactId>spotbugs-maven-plugin</artifactId>
-                    <version>4.7.3.0</version>
+                    <version>4.7.3.4</version>
                     <dependencies>
                         <dependency>
                             <groupId>com.github.spotbugs</groupId>
@@ -1335,7 +1335,7 @@
                 <plugin>
                     <groupId>org.owasp</groupId>
                     <artifactId>dependency-check-maven</artifactId>
-                    <version>8.0.2</version>
+                    <version>8.2.1</version>
                     <configuration>
 <!--                        <failBuildOnCVSS>7</failBuildOnCVSS>-->
                         <assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
@@ -1349,7 +1349,7 @@
                 <plugin>
                     <groupId>org.asciidoctor</groupId>
                     <artifactId>asciidoctor-maven-plugin</artifactId>
-                    <version>2.2.2</version>
+                    <version>2.2.4</version>
                     <dependencies>
                         <dependency>
                             <groupId>org.jruby</groupId>
@@ -1376,7 +1376,7 @@
                 <plugin>
                     <groupId>org.wildfly.plugins</groupId>
                     <artifactId>wildfly-maven-plugin</artifactId>
-                    <version>4.0.0.Final</version>
+                    <version>4.1.0.Beta5</version>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -2066,7 +2066,7 @@
                         <plugin>
                             <groupId>org.jacoco</groupId>
                             <artifactId>jacoco-maven-plugin</artifactId>
-                            <version>0.8.8</version>
+                            <version>0.8.10</version>
                         </plugin>
                     </plugins>
                 </pluginManagement>