Maven plugins and dependencies update (#1892)

* Maven plugins and dependencies update It leads into two code/build changes: - package refactoring to avoid naming collisions across modules - jar-test-sources execution removal to avoid duplicity calls Signed-off-by: Radek Felcman <radek.felcman@oracle.com>
eclipse-ee4j · Jun 8, 2023 · 024be0e · 024be0e
1 parent abd7a4c
commit 024be0e
Show file tree

Hide file tree

Showing 27 changed files with 108 additions and 134 deletions.
diff --git 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
@@ -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/...istence.corba/src/it/java/org/eclipse/persistence/testing/tests/corba/CorbaTestModel.java b/...istence.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/...rmi/IIOP/RMIConnectionExceptionsTest.java → ...rmi/IIOP/RMIConnectionExceptionsTest.java b/...rmi/IIOP/RMIConnectionExceptionsTest.java → ...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/...s/remote/rmi/IIOP/RMIIIOPRemoteModel.java → ...otecorba/rmi/IIOP/RMIIIOPRemoteModel.java b/...s/remote/rmi/IIOP/RMIIIOPRemoteModel.java → ...otecorba/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/...rollerDispatcherForTestingExceptions.java → ...rollerDispatcherForTestingExceptions.java b/...rollerDispatcherForTestingExceptions.java → ...rollerDispatcherForTestingExceptions.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/...sts/remote/rmi/IIOP/RMIServerManager.java → ...emotecorba/rmi/IIOP/RMIServerManager.java b/...sts/remote/rmi/IIOP/RMIServerManager.java → ...emotecorba/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/.../rmi/IIOP/RMIServerManagerController.java → .../rmi/IIOP/RMIServerManagerController.java b/.../rmi/IIOP/RMIServerManagerController.java → .../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/...IIOP/_RMIServerManagerController_Tie.java → ...IIOP/_RMIServerManagerController_Tie.java b/...IIOP/_RMIServerManagerController_Tie.java → ...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/...mote/rmi/IIOP/_RMIServerManager_Stub.java → ...orba/rmi/IIOP/_RMIServerManager_Stub.java b/...mote/rmi/IIOP/_RMIServerManager_Stub.java → ...orba/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/...ncorba/CORBAConnectionExceptionsTest.java → ...ncorba/CORBAConnectionExceptionsTest.java b/...ncorba/CORBAConnectionExceptionsTest.java → ...ncorba/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/...rollerDispatcherForTestingExceptions.java → ...rollerDispatcherForTestingExceptions.java b/...rollerDispatcherForTestingExceptions.java → ...rollerDispatcherForTestingExceptions.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/...s/remote/suncorba/CORBAServerManager.java → ...otecorba/suncorba/CORBAServerManager.java b/...s/remote/suncorba/CORBAServerManager.java → ...otecorba/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/...uncorba/CORBAServerManagerController.java → ...uncorba/CORBAServerManagerController.java b/...uncorba/CORBAServerManagerController.java → ...uncorba/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/...te/suncorba/CORBAServerManagerHelper.java → ...ba/suncorba/CORBAServerManagerHelper.java b/...te/suncorba/CORBAServerManagerHelper.java → ...ba/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,48 +26,48 @@ 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 ());
   }
   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));
   }
   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/...te/suncorba/CORBAServerManagerHolder.java → ...ba/suncorba/CORBAServerManagerHolder.java b/...te/suncorba/CORBAServerManagerHolder.java → ...ba/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/...uncorba/CORBAServerManagerOperations.java → ...uncorba/CORBAServerManagerOperations.java b/...uncorba/CORBAServerManagerOperations.java → ...uncorba/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/...ts/remote/suncorba/CORBAServerRunner.java → ...motecorba/suncorba/CORBAServerRunner.java b/...ts/remote/suncorba/CORBAServerRunner.java → ...motecorba/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.*;