From edb359db8f41a8addb9c16613422f6c48b2187f4 Mon Sep 17 00:00:00 2001
From: luiseufrasio <luis.eufrasio@gmail.com>
Date: Thu, 8 Dec 2022 11:42:54 -0300
Subject: [PATCH] FISH-6721 : dbschema version upgraded to 6.7

---
 appserver/packager/glassfish-cmp/pom.xml             | 3 ++-
 appserver/persistence/cmp/generator-database/pom.xml | 4 ++--
 appserver/persistence/cmp/model/pom.xml              | 4 ++--
 appserver/pom.xml                                    | 5 ++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/appserver/packager/glassfish-cmp/pom.xml b/appserver/packager/glassfish-cmp/pom.xml
index 1984a262c47..4e2ca927ca5 100644
--- a/appserver/packager/glassfish-cmp/pom.xml
+++ b/appserver/packager/glassfish-cmp/pom.xml
@@ -39,6 +39,7 @@
     only if the new code is made subject to such option by the copyright
     holder.
 
+    Portion Copyright [2022] Payara Foundation and/or affiliates
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -169,7 +170,7 @@
         </dependency>
         <dependency>
             <groupId>org.glassfish.external</groupId>
-            <artifactId>dbschema-repackaged</artifactId>
+            <artifactId>dbschema</artifactId>
         </dependency>
         <dependency>
             <groupId>fish.payara.server.internal.packager</groupId>
diff --git a/appserver/persistence/cmp/generator-database/pom.xml b/appserver/persistence/cmp/generator-database/pom.xml
index 8b62d9231dc..601bca158c7 100644
--- a/appserver/persistence/cmp/generator-database/pom.xml
+++ b/appserver/persistence/cmp/generator-database/pom.xml
@@ -39,7 +39,7 @@
     only if the new code is made subject to such option by the copyright
     holder.
 
-    Portion Copyright [2018-2019] Payara Foundation and/or affiliates
+    Portion Copyright [2018-2022] Payara Foundation and/or affiliates
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -84,7 +84,7 @@
         </dependency>
         <dependency>
             <groupId>org.glassfish.external</groupId>
-            <artifactId>dbschema-repackaged</artifactId>
+            <artifactId>dbschema</artifactId>
         </dependency>
         <dependency>
             <groupId>fish.payara.server.internal.common</groupId>
diff --git a/appserver/persistence/cmp/model/pom.xml b/appserver/persistence/cmp/model/pom.xml
index 474f15c5199..ac5cb817050 100644
--- a/appserver/persistence/cmp/model/pom.xml
+++ b/appserver/persistence/cmp/model/pom.xml
@@ -39,7 +39,7 @@
     only if the new code is made subject to such option by the copyright
     holder.
 
-    Portion Copyright [2018-2019] Payara Foundation and/or affiliates
+    Portion Copyright [2018-2022] Payara Foundation and/or affiliates
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -88,7 +88,7 @@
         </dependency>
         <dependency>
             <groupId>org.glassfish.external</groupId>
-            <artifactId>dbschema-repackaged</artifactId>
+            <artifactId>dbschema</artifactId>
         </dependency>
         <dependency>
             <groupId>fish.payara.server.internal.common</groupId>
diff --git a/appserver/pom.xml b/appserver/pom.xml
index 02bf8ad09c6..19f2b71b4c1 100644
--- a/appserver/pom.xml
+++ b/appserver/pom.xml
@@ -82,8 +82,7 @@
         <install.dir.name>payara${major_version}</install.dir.name>
         <uc-pkg-client.version>1.122-57.2889</uc-pkg-client.version>
         <uc-pkg-bootstrap.version>1.122-57.2889</uc-pkg-bootstrap.version>
-        <dbschema.version>3.1.1</dbschema.version>
-        <dbschema.osgi.version>6.0</dbschema.osgi.version>
+        <dbschema.version>6.7</dbschema.version>
         <schema2beans.version>6.7</schema2beans.version>
         <!-- Java API for XML Registries Resource Adapter -->
         <jaxr.version>JAXR_RA_20091012</jaxr.version>
@@ -565,7 +564,7 @@
             </dependency>
             <dependency>
                 <groupId>org.glassfish.external</groupId>
-                <artifactId>dbschema-repackaged</artifactId>
+                <artifactId>dbschema</artifactId>
                 <version>${dbschema.version}</version>
             </dependency>
             <dependency>