Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[4.0] Maven plugins and dependencies update #1892

Merged
merged 3 commits into from
Jun 8, 2023
Merged

[4.0] Maven plugins and dependencies update #1892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c27284
Maven plugins and dependencies update
rfelcman Jun 7, 2023
620a1c0
GitHub Actions branch fix
rfelcman Jun 8, 2023
b62580b
download-maven-plugin revert back to 1.6.8 due MD5 checksum issue
rfelcman Jun 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions foundation/org.eclipse.persistence.corba/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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>
Expand Down
10 changes: 5 additions & 5 deletions ...istence.corba/src/it/java/org/eclipse/persistence/testing/tests/corba/CorbaTestModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions ...rmi/IIOP/RMIConnectionExceptionsTest.java → ...rmi/IIOP/RMIConnectionExceptionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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;
Expand Down Expand Up @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions ...s/remote/rmi/IIOP/RMIIIOPRemoteModel.java → ...otecorba/rmi/IIOP/RMIIIOPRemoteModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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.*;

Expand Down
4 changes: 2 additions & 2 deletions ...rollerDispatcherForTestingExceptions.java → ...rollerDispatcherForTestingExceptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...sts/remote/rmi/IIOP/RMIServerManager.java → ...emotecorba/rmi/IIOP/RMIServerManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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.*;
Expand Down
4 changes: 2 additions & 2 deletions .../rmi/IIOP/RMIServerManagerController.java → .../rmi/IIOP/RMIServerManagerController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...IIOP/_RMIServerManagerController_Tie.java → ...IIOP/_RMIServerManagerController_Tie.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions ...mote/rmi/IIOP/_RMIServerManager_Stub.java → ...orba/rmi/IIOP/_RMIServerManager_Stub.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions ...ncorba/CORBAConnectionExceptionsTest.java → ...ncorba/CORBAConnectionExceptionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions ...rollerDispatcherForTestingExceptions.java → ...rollerDispatcherForTestingExceptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...s/remote/suncorba/CORBAServerManager.java → ...otecorba/suncorba/CORBAServerManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...uncorba/CORBAServerManagerController.java → ...uncorba/CORBAServerManagerController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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;
Expand Down
22 changes: 11 additions & 11 deletions ...te/suncorba/CORBAServerManagerHelper.java → ...ba/suncorba/CORBAServerManagerHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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);
}
Expand Down
14 changes: 7 additions & 7 deletions ...te/suncorba/CORBAServerManagerHolder.java → ...ba/suncorba/CORBAServerManagerHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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);
}
}
4 changes: 2 additions & 2 deletions ...uncorba/CORBAServerManagerOperations.java → ...uncorba/CORBAServerManagerOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...ts/remote/suncorba/CORBAServerRunner.java → ...motecorba/suncorba/CORBAServerRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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.*;

Expand Down
Loading
Loading