From 71103a9c3ec882dee07d6a4b1c34a6667c493a3c Mon Sep 17 00:00:00 2001
From: Laird Nelson <laird.nelson@oracle.com>
Date: Mon, 24 Apr 2023 17:02:44 -0700
Subject: [PATCH] Upgrades JPA to 3.1 (#6684)

* Upgrades JPA to 3.1

Signed-off-by: Laird Nelson <laird.nelson@oracle.com>

* Squashable commit; interim work

Signed-off-by: Laird Nelson <laird.nelson@oracle.com>

---------

Signed-off-by: Laird Nelson <laird.nelson@oracle.com>
---
 .../main/resources/META-INF/persistence.xml.mustache   |  6 +++---
 dependencies/pom.xml                                   |  2 +-
 .../jpa/src/main/resources/META-INF/persistence.xml    |  6 +++---
 .../src/main/resources/META-INF/persistence.xml        |  6 +++---
 .../src/test/resources/META-INF/persistence.xml        |  6 +++---
 .../integrations/cdi/jpa/PersistenceUnitInfoBean.java  | 10 +++++-----
 .../src/test/resources/META-INF/persistence.xml        |  6 +++---
 .../appl/src/main/resources/META-INF/persistence.xml   |  6 +++---
 .../simple/src/test/resources/META-INF/persistence.xml |  6 +++---
 .../mp-2/src/main/resources/META-INF/persistence.xml   |  6 +++---
 10 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/archetypes/helidon/src/main/archetype/mp/database/files/src/main/resources/META-INF/persistence.xml.mustache b/archetypes/helidon/src/main/archetype/mp/database/files/src/main/resources/META-INF/persistence.xml.mustache
index 437cc6fec74..9c15e5d27fc 100644
--- a/archetypes/helidon/src/main/archetype/mp/database/files/src/main/resources/META-INF/persistence.xml.mustache
+++ b/archetypes/helidon/src/main/archetype/mp/database/files/src/main/resources/META-INF/persistence.xml.mustache
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--
 
-        Copyright (c) 2019, 2022 Oracle and/or its affiliates.
+        Copyright (c) 2019, 2023 Oracle and/or its affiliates.
 
         Licensed under the Apache License, Version 2.0 (the "License");
         you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@
         -->
 <persistence xmlns="https://jakarta.ee/xml/ns/persistence"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd"
-             version="3.0">
+             xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_1.xsd"
+             version="3.1">
 
     <persistence-unit name="{{pu-name}}" transaction-type="JTA">
         <jta-data-source>{{ds-name}}</jta-data-source>
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 457fd5335ae..34e839f37a8 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -77,7 +77,7 @@
         <version.lib.jakarta.jms-api>3.0.0</version.lib.jakarta.jms-api>
         <version.lib.jakarta.jsonb-api>3.0.0</version.lib.jakarta.jsonb-api>
         <version.lib.jakarta.jsonp-api>2.1.1</version.lib.jakarta.jsonp-api>
-        <version.lib.jakarta.persistence-api>3.0.0</version.lib.jakarta.persistence-api>
+        <version.lib.jakarta.persistence-api>3.1.0</version.lib.jakarta.persistence-api>
         <version.lib.jakarta.transaction-api>2.0.0</version.lib.jakarta.transaction-api>
         <version.lib.jakarta.validation-api>3.0.0</version.lib.jakarta.validation-api>
         <version.lib.jakarta.websockets-api>2.1.0</version.lib.jakarta.websockets-api>
diff --git a/examples/integrations/cdi/jpa/src/main/resources/META-INF/persistence.xml b/examples/integrations/cdi/jpa/src/main/resources/META-INF/persistence.xml
index a6a09c98da0..02c6ea5587a 100644
--- a/examples/integrations/cdi/jpa/src/main/resources/META-INF/persistence.xml
+++ b/examples/integrations/cdi/jpa/src/main/resources/META-INF/persistence.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2019, 2022 Oracle and/or its affiliates.
+    Copyright (c) 2019, 2023 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@
 <persistence xmlns="https://jakarta.ee/xml/ns/persistence"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence
-                                 https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd"
-             version="3.0">
+                                 https://jakarta.ee/xml/ns/persistence/persistence_3_1.xsd"
+             version="3.1">
     <persistence-unit name="test" transaction-type="JTA">
     <jta-data-source>test</jta-data-source>
     <class>io.helidon.examples.integrations.cdi.jpa.Greeting</class>
diff --git a/examples/integrations/cdi/pokemons/src/main/resources/META-INF/persistence.xml b/examples/integrations/cdi/pokemons/src/main/resources/META-INF/persistence.xml
index 2a32b31a1af..087ec1f49c3 100644
--- a/examples/integrations/cdi/pokemons/src/main/resources/META-INF/persistence.xml
+++ b/examples/integrations/cdi/pokemons/src/main/resources/META-INF/persistence.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2020, 2022 Oracle and/or its affiliates.
+    Copyright (c) 2020, 2023 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@
 <persistence xmlns="https://jakarta.ee/xml/ns/persistence"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence
-                                 https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd"
-             version="3.0">
+                                 https://jakarta.ee/xml/ns/persistence/persistence_3_1.xsd"
+             version="3.1">
     <persistence-unit name="test" transaction-type="JTA">
         <jta-data-source>test</jta-data-source>
         <class>io.helidon.examples.integrations.cdi.pokemon.Pokemon</class>
diff --git a/integrations/cdi/eclipselink-cdi/src/test/resources/META-INF/persistence.xml b/integrations/cdi/eclipselink-cdi/src/test/resources/META-INF/persistence.xml
index a826cadc078..b3a112618ea 100644
--- a/integrations/cdi/eclipselink-cdi/src/test/resources/META-INF/persistence.xml
+++ b/integrations/cdi/eclipselink-cdi/src/test/resources/META-INF/persistence.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2019, 2022 Oracle and/or its affiliates.
+    Copyright (c) 2019, 2023 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@
 <persistence xmlns="https://jakarta.ee/xml/ns/persistence"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence
-                                 https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd"
-             version="3.0">
+                                 https://jakarta.ee/xml/ns/persistence/persistence_3_1.xsd"
+             version="3.1">
     <persistence-unit name="test" transaction-type="JTA">
         <description>A persistence unit for use by unit tests.</description>
         <jta-data-source>test</jta-data-source>
diff --git a/integrations/cdi/jpa-cdi/src/main/java/io/helidon/integrations/cdi/jpa/PersistenceUnitInfoBean.java b/integrations/cdi/jpa-cdi/src/main/java/io/helidon/integrations/cdi/jpa/PersistenceUnitInfoBean.java
index b701ac6a312..9ca7f2fcb21 100644
--- a/integrations/cdi/jpa-cdi/src/main/java/io/helidon/integrations/cdi/jpa/PersistenceUnitInfoBean.java
+++ b/integrations/cdi/jpa-cdi/src/main/java/io/helidon/integrations/cdi/jpa/PersistenceUnitInfoBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2019, 2023 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -245,7 +245,7 @@ public PersistenceUnitInfoBean(final String persistenceUnitName,
      *
      * @param persistenceXMLSchemaVersion a {@link String}
      * representation of the version of JPA being supported; may be
-     * {@code null} in which case "{@code 2.2}" will be used instead
+     * {@code null} in which case "{@code 3.1}" will be used instead
      *
      * @param persistenceProviderClassName the fully-qualified class
      * name of a {@link PersistenceProvider} implementation; may be
@@ -402,7 +402,7 @@ public PersistenceUnitInfoBean(final String persistenceUnitName,
      *
      * @param persistenceXMLSchemaVersion a {@link String}
      * representation of the version of JPA being supported; may be
-     * {@code null} in which case "{@code 2.2}" will be used instead
+     * {@code null} in which case "{@code 3.1}" will be used instead
      *
      * @param persistenceProviderClassName the fully-qualified class
      * name of a {@link PersistenceProvider} implementation; may be
@@ -535,7 +535,7 @@ public PersistenceUnitInfoBean(final String persistenceUnitName,
         this.persistenceUnitName = persistenceUnitName;
         this.persistenceUnitRootUrl = persistenceUnitRootUrl;
         this.persistenceProviderClassName = persistenceProviderClassName;
-        this.persistenceXMLSchemaVersion = persistenceXMLSchemaVersion == null ? "2.2" : persistenceXMLSchemaVersion;
+        this.persistenceXMLSchemaVersion = persistenceXMLSchemaVersion == null ? "3.1" : persistenceXMLSchemaVersion;
         this.originalClassLoader = classLoader;
         this.classLoader = classLoader;
         this.tempClassLoaderSupplier = tempClassLoaderSupplier;
@@ -1075,7 +1075,7 @@ public String toString() {
         final PersistenceUnitInfoBean returnValue =
             new PersistenceUnitInfoBean(name,
                                         rootUrl,
-                                        "2.2",
+                                        "3.1",
                                         persistenceUnit.getProvider(),
                                         classLoader,
                                         tempClassLoaderSupplier,
diff --git a/integrations/cdi/jpa-cdi/src/test/resources/META-INF/persistence.xml b/integrations/cdi/jpa-cdi/src/test/resources/META-INF/persistence.xml
index 8eb7b3b91a6..9e245b07fed 100644
--- a/integrations/cdi/jpa-cdi/src/test/resources/META-INF/persistence.xml
+++ b/integrations/cdi/jpa-cdi/src/test/resources/META-INF/persistence.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2019, 2022 Oracle and/or its affiliates.
+    Copyright (c) 2019, 2023 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@
 <persistence xmlns="https://jakarta.ee/xml/ns/persistence"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence
-                                 https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd"
-             version="3.0">
+                                 https://jakarta.ee/xml/ns/persistence/persistence_3_1.xsd"
+             version="3.1">
 
     <persistence-unit name="test" transaction-type="JTA">
         <description>A persistence unit for use by unit tests.</description>
diff --git a/tests/integration/jpa/appl/src/main/resources/META-INF/persistence.xml b/tests/integration/jpa/appl/src/main/resources/META-INF/persistence.xml
index 4c25914c471..a9ee29ed093 100644
--- a/tests/integration/jpa/appl/src/main/resources/META-INF/persistence.xml
+++ b/tests/integration/jpa/appl/src/main/resources/META-INF/persistence.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2020, 2022 Oracle and/or its affiliates.
+    Copyright (c) 2020, 2023 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@
 <persistence xmlns="https://jakarta.ee/xml/ns/persistence"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence
-                                 https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd"
-             version="3.0">
+                                 https://jakarta.ee/xml/ns/persistence/persistence_3_1.xsd"
+             version="3.1">
     <persistence-unit name="test" transaction-type="JTA">
         <class>io.helidon.tests.integration.jpa.model.City</class>
         <class>io.helidon.tests.integration.jpa.model.Stadium</class>
diff --git a/tests/integration/jpa/simple/src/test/resources/META-INF/persistence.xml b/tests/integration/jpa/simple/src/test/resources/META-INF/persistence.xml
index 0ee934df38b..163e1d7a11e 100644
--- a/tests/integration/jpa/simple/src/test/resources/META-INF/persistence.xml
+++ b/tests/integration/jpa/simple/src/test/resources/META-INF/persistence.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2020, 2022 Oracle and/or its affiliates.
+    Copyright (c) 2020, 2023 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@
 <persistence xmlns="https://jakarta.ee/xml/ns/persistence"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence
-                                 https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd"
-             version="3.0">
+                                 https://jakarta.ee/xml/ns/persistence/persistence_3_1.xsd"
+             version="3.1">
     <persistence-unit name="test" transaction-type="JTA">
         <class>io.helidon.tests.integration.jpa.model.Type</class>
         <class>io.helidon.tests.integration.jpa.model.Trainer</class>
diff --git a/tests/integration/native-image/mp-2/src/main/resources/META-INF/persistence.xml b/tests/integration/native-image/mp-2/src/main/resources/META-INF/persistence.xml
index f0db1661299..a9a8c016a8b 100644
--- a/tests/integration/native-image/mp-2/src/main/resources/META-INF/persistence.xml
+++ b/tests/integration/native-image/mp-2/src/main/resources/META-INF/persistence.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2020, 2022 Oracle and/or its affiliates.
+    Copyright (c) 2020, 2023 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@
 <persistence xmlns="https://jakarta.ee/xml/ns/persistence"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence
-                                 https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd"
-             version="3.0">
+                                 https://jakarta.ee/xml/ns/persistence/persistence_3_1.xsd"
+             version="3.1">
     <persistence-unit name="test" transaction-type="JTA">
         <jta-data-source>test</jta-data-source>
         <class>io.helidon.tests.integration.nativeimage.mp2.GreetingEntity</class>