From 79abbf586fde709eba514d5c7c82a9f827d0f190 Mon Sep 17 00:00:00 2001
From: mklkun <mohamed.khalil.labidi@gmail.com>
Date: Mon, 11 Jan 2021 16:16:30 +0100
Subject: [PATCH 1/3] Change DB to mariadb engine of melodic

---
 src/main/resources/META-INF/persistence.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
index 4d92591d..b4e8ced4 100644
--- a/src/main/resources/META-INF/persistence.xml
+++ b/src/main/resources/META-INF/persistence.xml
@@ -21,10 +21,10 @@
         <class>org.activeeon.morphemic.model.Hardware</class>
 
         <properties>
-            <property name="javax.persistence.jdbc.driver" value="org.hsqldb.jdbcDriver"/>
-            <property name="javax.persistence.jdbc.url" value="jdbc:hsqldb:file:./data/standalone;shutdown=true"/>
-            <property name="javax.persistence.jdbc.user" value="root"/>
-            <property name="javax.persistence.jdbc.password" value=""/>
+            <property name="javax.persistence.jdbc.driver" value="org.mariadb.jdbc.Driver"/>
+            <property name="javax.persistence.jdbc.url" value="jdbc:mariadb://melodic-store:3306/proactive" />
+            <property name="javax.persistence.jdbc.user" value="${JPA_USER}"/>
+            <property name="javax.persistence.jdbc.password" value="${JPA_PASSWORD}"/>
             <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
             <property name="hibernate.hbm2ddl.auto" value="update"/>
             <property name="hibernate.flushMode" value="FLUSH_AUTO" />
-- 
GitLab


From 2897138ee6760feb35479bf5d45031ebfabdf08e Mon Sep 17 00:00:00 2001
From: mklkun <mohamed.khalil.labidi@gmail.com>
Date: Mon, 11 Jan 2021 16:29:09 +0100
Subject: [PATCH 2/3] Fix user and password values

---
 src/main/resources/META-INF/persistence.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
index b4e8ced4..94b8e24a 100644
--- a/src/main/resources/META-INF/persistence.xml
+++ b/src/main/resources/META-INF/persistence.xml
@@ -23,8 +23,8 @@
         <properties>
             <property name="javax.persistence.jdbc.driver" value="org.mariadb.jdbc.Driver"/>
             <property name="javax.persistence.jdbc.url" value="jdbc:mariadb://melodic-store:3306/proactive" />
-            <property name="javax.persistence.jdbc.user" value="${JPA_USER}"/>
-            <property name="javax.persistence.jdbc.password" value="${JPA_PASSWORD}"/>
+            <property name="javax.persistence.jdbc.user" value="JPA_USER"/>
+            <property name="javax.persistence.jdbc.password" value="JPA_PASSWORD"/>
             <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
             <property name="hibernate.hbm2ddl.auto" value="update"/>
             <property name="hibernate.flushMode" value="FLUSH_AUTO" />
-- 
GitLab


From abed06671474e2b30fac77f81297ef050f801ae3 Mon Sep 17 00:00:00 2001
From: mklkun <mohamed.khalil.labidi@gmail.com>
Date: Mon, 11 Jan 2021 16:34:40 +0100
Subject: [PATCH 3/3] Reset u and p

---
 src/main/resources/META-INF/persistence.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
index 94b8e24a..83896965 100644
--- a/src/main/resources/META-INF/persistence.xml
+++ b/src/main/resources/META-INF/persistence.xml
@@ -23,8 +23,8 @@
         <properties>
             <property name="javax.persistence.jdbc.driver" value="org.mariadb.jdbc.Driver"/>
             <property name="javax.persistence.jdbc.url" value="jdbc:mariadb://melodic-store:3306/proactive" />
-            <property name="javax.persistence.jdbc.user" value="JPA_USER"/>
-            <property name="javax.persistence.jdbc.password" value="JPA_PASSWORD"/>
+            <property name="javax.persistence.jdbc.user" value=""/>
+            <property name="javax.persistence.jdbc.password" value=""/>
             <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
             <property name="hibernate.hbm2ddl.auto" value="update"/>
             <property name="hibernate.flushMode" value="FLUSH_AUTO" />
-- 
GitLab