You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2024/07/09 12:05:25 UTC

(tomee) branch main updated: TOMEE-4365 - EclipseLink 4.0.3

This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git


The following commit(s) were added to refs/heads/main by this push:
     new f377ffd4db TOMEE-4365 - EclipseLink 4.0.3
f377ffd4db is described below

commit f377ffd4db90dea5d6b21d933d64f571ff55ab68
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Tue Jul 9 14:05:21 2024 +0200

    TOMEE-4365 - EclipseLink 4.0.3
    
    * Bump org.eclipse.persistence:eclipselink from 3.0.3 to 4.0.3
    
    Bumps org.eclipse.persistence:eclipselink from 3.0.3 to 4.0.3.
    
    ---
    updated-dependencies:
    - dependency-name: org.eclipse.persistence:eclipselink
      dependency-type: direct:development
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <su...@github.com>
    
    * Fix compile issue for EclipseLink 4.0.3 upgrade
    
    ---------
    
    Signed-off-by: dependabot[bot] <su...@github.com>
    Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
    Co-authored-by: Richard Zowalla <rz...@apache.org>
---
 boms/tomee-plume/pom.xml                                               | 2 +-
 .../openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java     | 3 ++-
 examples/jpa-eclipselink/pom.xml                                       | 2 +-
 pom.xml                                                                | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
index 396038e705..f210e2222f 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -2160,7 +2160,7 @@
     <dependency>
       <groupId>org.eclipse.persistence</groupId>
       <artifactId>eclipselink</artifactId>
-      <version>3.0.4</version>
+      <version>4.0.3</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
diff --git a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java
index bfff6c418c..5723af75f8 100644
--- a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java
+++ b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java
@@ -20,6 +20,7 @@ import org.apache.geronimo.transaction.manager.TransactionImpl;
 import org.eclipse.persistence.platform.server.JMXEnabledPlatform;
 import org.eclipse.persistence.platform.server.JMXServerPlatformBase;
 import org.eclipse.persistence.sessions.DatabaseSession;
+import org.eclipse.persistence.sessions.ExternalTransactionController;
 import org.eclipse.persistence.transaction.AbstractSynchronizationListener;
 import org.eclipse.persistence.transaction.JTATransactionController;
 
@@ -46,7 +47,7 @@ public class OpenEJBServerPlatform extends JMXServerPlatformBase implements JMXE
     }
 
     @Override
-    public Class<?> getExternalTransactionControllerClass() {
+    public Class<? extends ExternalTransactionController> getExternalTransactionControllerClass() {
         return OpenEJBJTATransactionController.class;
     }
     
diff --git a/examples/jpa-eclipselink/pom.xml b/examples/jpa-eclipselink/pom.xml
index b4785cc831..7c590d135b 100644
--- a/examples/jpa-eclipselink/pom.xml
+++ b/examples/jpa-eclipselink/pom.xml
@@ -27,7 +27,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <surefire.argline />
-    <version.eclipselink>3.0.3</version.eclipselink>
+    <version.eclipselink>4.0.3</version.eclipselink>
   </properties>
   <build>
     <defaultGoal>install</defaultGoal>
diff --git a/pom.xml b/pom.xml
index 9660ea2510..e6f38e17f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -223,7 +223,7 @@
     <version.openjpa>4.0.0</version.openjpa>
     <version.openwebbeans>4.0.2</version.openwebbeans>
     <!-- org.eclipse -->
-    <version.eclipselink>3.0.4</version.eclipselink>
+    <version.eclipselink>4.0.3</version.eclipselink>
     <!-- org.glassfish -->
     <version.mojarra>4.0.0</version.mojarra> <!-- Downgrade on purpose, see TOMEE-4355: https://github.com/eclipse-ee4j/mojarra/issues/5457 -->
     <!-- org.hibernate -->