Update jakarta persistence api 3.2.0-M1 OpenLiberty#2

ajaypaul-ibm · Dec 1, 2023 · 88e6d57 · 88e6d57
1 parent 382b7de
commit 88e6d57
Show file tree

Hide file tree

Showing 15 changed files with 22 additions and 22 deletions.
diff --git a/dev/com.ibm.ws.jpa.container.core/src/com/ibm/ws/jpa/JPAVersion.java b/dev/com.ibm.ws.jpa.container.core/src/com/ibm/ws/jpa/JPAVersion.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015, 2023 IBM Corporation and others.
+ * Copyright (c) 2023 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at

diff --git a/dev/com.ibm.ws.jpa.container.v32/.classpath b/dev/com.ibm.ws.jpa.container.v32/.classpath
@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/dev/com.ibm.ws.jpa.container.v32/bnd.bnd b/dev/com.ibm.ws.jpa.container.v32/bnd.bnd
@@ -1,5 +1,5 @@
 #*******************************************************************************
-# Copyright (c) 2022 IBM Corporation and others.
+# Copyright (c) 2023 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at

diff --git a/dev/com.ibm.ws.jpa.container.v32/src/com/ibm/ws/jpa/container/v32/JPAEMFactoryV32.java b/dev/com.ibm.ws.jpa.container.v32/src/com/ibm/ws/jpa/container/v32/JPAEMFactoryV32.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2022 IBM Corporation and others.
+ * Copyright (c) 2023 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at

diff --git a/dev/com.ibm.ws.jpa.container.v32/src/com/ibm/ws/jpa/container/v32/JPAExEmInvocationV32.java b/dev/com.ibm.ws.jpa.container.v32/src/com/ibm/ws/jpa/container/v32/JPAExEmInvocationV32.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2022 IBM Corporation and others.
+ * Copyright (c) 2023 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at

diff --git a/dev/com.ibm.ws.jpa.container.v32/src/com/ibm/ws/jpa/container/v32/JPAExEntityManagerV32.java b/dev/com.ibm.ws.jpa.container.v32/src/com/ibm/ws/jpa/container/v32/JPAExEntityManagerV32.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2022 IBM Corporation and others.
+ * Copyright (c) 2023 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at

diff --git a/...com.ibm.ws.jpa.container.v32/src/com/ibm/ws/jpa/container/v32/JPANoTxEmInvocationV32.java b/...com.ibm.ws.jpa.container.v32/src/com/ibm/ws/jpa/container/v32/JPANoTxEmInvocationV32.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2022 IBM Corporation and others.
+ * Copyright (c) 2023 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -25,8 +25,8 @@
 import com.ibm.ws.jpa.management.JPAEntityManager;
 import com.ibm.ws.jpa.management.JPANoTxEmInvocation;
 
-public class JPANoTxEmInvocationV31 extends JPANoTxEmInvocation {
-    protected JPANoTxEmInvocationV31(UOWCoordinator uowCoord, EntityManager em, JPAEntityManager jpaEm, boolean txIsUnsynchronized) {
+public class JPANoTxEmInvocationV32 extends JPANoTxEmInvocation {
+    protected JPANoTxEmInvocationV32(UOWCoordinator uowCoord, EntityManager em, JPAEntityManager jpaEm, boolean txIsUnsynchronized) {
         super(uowCoord, em, jpaEm, txIsUnsynchronized);
         this.ivAllowPooling = false;
     }

diff --git a/...m.ws.jpa.container.v32/src/com/ibm/ws/jpa/container/v32/JPAPCtxtAttributeAccessorV32.java b/...m.ws.jpa.container.v32/src/com/ibm/ws/jpa/container/v32/JPAPCtxtAttributeAccessorV32.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 IBM Corporation and others.
+ * Copyright (c) 2023 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at

diff --git a/dev/com.ibm.ws.jpa.container.v32/src/com/ibm/ws/jpa/container/v32/JPATxEmInvocationV32.java b/dev/com.ibm.ws.jpa.container.v32/src/com/ibm/ws/jpa/container/v32/JPATxEmInvocationV32.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2022 IBM Corporation and others.
+ * Copyright (c) 2023 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at

diff --git a/dev/com.ibm.ws.jpa.container.v32/src/com/ibm/ws/jpa/container/v32/JPATxEntityManagerV32.java b/dev/com.ibm.ws.jpa.container.v32/src/com/ibm/ws/jpa/container/v32/JPATxEntityManagerV32.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2022 IBM Corporation and others.
+ * Copyright (c) 2023 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -37,7 +37,7 @@
 import com.ibm.ws.jpa.management.JPATxEntityManager;
 
 @SuppressWarnings("serial")
-public class JPATxEntityManagerV3 extends JPATxEntityManager {
+public class JPATxEntityManagerV32 extends JPATxEntityManager {
     private static final TraceComponent tc = Tr.register(JPATxEntityManagerV32.class,
                                                          JPA_TRACE_GROUP,
                                                          JPA_RESOURCE_BUNDLE_NAME);

diff --git a/dev/com.ibm.ws.jpa.container.v32/src/com/ibm/ws/jpa/container/v32/package-info.java b/dev/com.ibm.ws.jpa.container.v32/src/com/ibm/ws/jpa/container/v32/package-info.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2022 IBM Corporation and others.
+ * Copyright (c) 2023 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at

diff --git a/dev/io.openliberty.jakarta.persistence.3.2/.classpath b/dev/io.openliberty.jakarta.persistence.3.2/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/dev/io.openliberty.jakarta.persistence.3.2/bnd.bnd b/dev/io.openliberty.jakarta.persistence.3.2/bnd.bnd
@@ -1,5 +1,5 @@
 #*******************************************************************************
-# Copyright (c) 2022, 2023 IBM Corporation and others.
+# Copyright (c) 2023 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
@@ -41,8 +41,8 @@ instrument.disabled: true
 publish.wlp.jar.suffix: dev/api/spec
 
 -includeresource: \
-  @${repo;jakarta.persistence:jakarta.persistence-api;3.2.0;EXACT}!/!(META-INF/maven/*|module-info.class)
+  @${repo;jakarta.persistence:jakarta.persistence-api;3.2.0.M1;EXACT}!/!(META-INF/maven/*|module-info.class)
 
 -buildpath: \
-  jakarta.persistence:jakarta.persistence-api;version=3.2.0;strategy=exact,\
+  jakarta.persistence:jakarta.persistence-api;version=3.2.0.M1;strategy=exact,\
   io.openliberty.jakartapersistenceactivator;version=latest
diff --git a/dev/io.openliberty.jakarta.persistence.api.3.2/.settings/org.eclipse.jdt.core.prefs b/dev/io.openliberty.jakarta.persistence.api.3.2/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,12 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/dev/io.openliberty.org.eclipse.persistence-3.2/bnd.bnd b/dev/io.openliberty.org.eclipse.persistence-3.2/bnd.bnd
@@ -1,5 +1,5 @@
 #*******************************************************************************
-# Copyright (c) 2022, 2023 IBM Corporation and others.
+# Copyright (c) 2023 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at