diff --git a/admin-console/src/main/resources/liquibase/admin-console/changeSetServ.xml b/admin-console/src/main/resources/liquibase/admin-console/changeSetServ.xml
index 02c19969e0..b8d9486e31 100644
--- a/admin-console/src/main/resources/liquibase/admin-console/changeSetServ.xml
+++ b/admin-console/src/main/resources/liquibase/admin-console/changeSetServ.xml
@@ -13,7 +13,7 @@
 
     <changeSet id="00000000000001_adminconsole_dataServ_restore" author="entando" context="restore" />
 
-    <changeSet id="20230118100000_adminconsole_usershortcuts_table_remove" author="entando">
+    <changeSet id="20230118100000_adminconsole_usershortcuts_table_remove_v2" author="entando">
         <preConditions onFail="MARK_RAN">
             <tableExists tableName="authusershortcuts"></tableExists>
         </preConditions>
diff --git a/admin-console/src/main/resources/liquibase/admin-console/serv/00000000000001_dataServ_production.xml b/admin-console/src/main/resources/liquibase/admin-console/serv/00000000000001_dataServ_production.xml
index 1da53851b7..c356f7df65 100644
--- a/admin-console/src/main/resources/liquibase/admin-console/serv/00000000000001_dataServ_production.xml
+++ b/admin-console/src/main/resources/liquibase/admin-console/serv/00000000000001_dataServ_production.xml
@@ -5,13 +5,15 @@
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd
            http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.4.xsd">
 
-    <changeSet id="00000000000001_adminconsole_dataServ_production" author="entando" context="production">
+    <changeSet id="00000000000001_adminconsole_dataServ_production_v2" author="entando" context="production">
         <preConditions onFail="MARK_RAN">
             <!-- Use uppercase table name to avoid MySQL issue -->
             <sqlCheck expectedResult="0">SELECT COUNT(*) FROM DATABASECHANGELOG WHERE id = '00000000000001_adminconsole_dataServ_restore'</sqlCheck>
             <!-- This changeSet contains the same logic (in XML) of the old 00000000000001_dataServ_production.sql file, that was included by changeSetServ.xml
                  Execution of this changeSet must be skipped if tables had already been filled using that file -->
             <sqlCheck expectedResult="0">SELECT COUNT(*) FROM DATABASECHANGELOG WHERE id = '00000000000001_adminconsole_dataServ_production' AND filename = 'liquibase/admin-console/changeSetServ.xml'</sqlCheck>
+            <tableExists tableName="authusershortcuts"/>
+            <sqlCheck expectedResult="0">SELECT COUNT(*) FROM authusershortcuts WHERE username = 'admin'</sqlCheck>
         </preConditions>
         <insert tableName="authusershortcuts">
             <column name="username" value="admin" />
diff --git a/admin-console/src/main/resources/liquibase/admin-console/serv/00000000000001_schemaServ.xml b/admin-console/src/main/resources/liquibase/admin-console/serv/00000000000001_schemaServ.xml
index 84d9cc1524..e709b0ed00 100644
--- a/admin-console/src/main/resources/liquibase/admin-console/serv/00000000000001_schemaServ.xml
+++ b/admin-console/src/main/resources/liquibase/admin-console/serv/00000000000001_schemaServ.xml
@@ -5,8 +5,14 @@
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd
            http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.4.xsd">
 
-    <changeSet id="00000000000001_adminconsole_schemaServ" author="entando" >
-        
+    <changeSet id="00000000000001_adminconsole_schemaServ_v2" author="entando" >
+        <preConditions onFail="MARK_RAN">
+            <sqlCheck expectedResult="0">SELECT COUNT(*) FROM DATABASECHANGELOG WHERE id = '00000000000001_adminconsole_schemaServ'</sqlCheck>
+            <not>
+                <tableExists tableName="authusershortcuts"/>
+            </not>
+        </preConditions>
+
         <createTable tableName="authusershortcuts" >
             <column name="username" type="varchar(40)">
                 <constraints primaryKey="true" nullable="false"/>
@@ -15,7 +21,7 @@
                 <constraints nullable="false" />
             </column>
         </createTable>
-        
+
     </changeSet>
 
 </databaseChangeLog>
diff --git a/cms-plugin/src/main/resources/liquibase/jacms/port/00000000000001_dataPort_production.xml b/cms-plugin/src/main/resources/liquibase/jacms/port/00000000000001_dataPort_production.xml
index 4419780f46..a0dd04431d 100644
--- a/cms-plugin/src/main/resources/liquibase/jacms/port/00000000000001_dataPort_production.xml
+++ b/cms-plugin/src/main/resources/liquibase/jacms/port/00000000000001_dataPort_production.xml
@@ -5,14 +5,16 @@
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd
            http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.4.xsd">
 
-    <changeSet id="00000000000001_jacms_dataPort_production" author="entando" context="production">
+    <changeSet id="00000000000001_jacms_dataPort_production_v2" author="entando" context="production">
 
         <preConditions onFail="MARK_RAN">
             <!-- Use uppercase table name to avoid MySQL issue -->
+            <sqlCheck expectedResult="0">SELECT COUNT(*) FROM DATABASECHANGELOG WHERE id = '00000000000001_jacms_dataPort_production'</sqlCheck>
             <sqlCheck expectedResult="0">SELECT COUNT(*) FROM DATABASECHANGELOG WHERE id = '00000000000001_jacms_dataPort_restore'</sqlCheck>
             <!-- This changeSet contains the same logic (in XML) of the old 00000000000001_dataPort_production.sql file, that was included by changeSetPort.xml
                  Execution of this changeSet must be skipped if tables had already been filled using that file -->
             <sqlCheck expectedResult="0">SELECT COUNT(*) FROM DATABASECHANGELOG WHERE id = '00000000000001_jacms_dataPort_production' AND filename = 'liquibase/jacms/changeSetPort.xml'</sqlCheck>
+            <sqlCheck expectedResult="0">SELECT COUNT(*) FROM sysconfig WHERE item = 'contentTypes'</sqlCheck>
         </preConditions>
 
         <insert tableName="sysconfig">
diff --git a/cms-plugin/src/main/resources/liquibase/jacms/port/00000000000001_schemaPort.xml b/cms-plugin/src/main/resources/liquibase/jacms/port/00000000000001_schemaPort.xml
index f2ed61b8e7..8c20182ddd 100644
--- a/cms-plugin/src/main/resources/liquibase/jacms/port/00000000000001_schemaPort.xml
+++ b/cms-plugin/src/main/resources/liquibase/jacms/port/00000000000001_schemaPort.xml
@@ -5,7 +5,16 @@
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd
            http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.4.xsd">
 
-    <changeSet id="00000000000001_jacms_schemaPort" author="entando">
+    <changeSet id="00000000000001_jacms_schemaPort_v2" author="entando">
+        <preConditions onFail="MARK_RAN">
+            <and>
+                <!-- Use uppercase table name to avoid MySQL issue -->
+                <sqlCheck expectedResult="0">SELECT COUNT(*) FROM DATABASECHANGELOG WHERE id = '00000000000001_jacms_schemaPort'</sqlCheck>
+                <not>
+                    <tableExists tableName="contents"/>
+                </not>
+            </and>
+        </preConditions>
         
         <createTable tableName="contentmodels" >
             <column name="modelid" type="int">
diff --git a/cms-plugin/src/main/resources/liquibase/jacms/port/00000000000002_schemaPort.xml b/cms-plugin/src/main/resources/liquibase/jacms/port/00000000000002_schemaPort.xml
index c582401ba0..3ae269a689 100644
--- a/cms-plugin/src/main/resources/liquibase/jacms/port/00000000000002_schemaPort.xml
+++ b/cms-plugin/src/main/resources/liquibase/jacms/port/00000000000002_schemaPort.xml
@@ -5,7 +5,7 @@
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd
            http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.4.xsd">
 
-    <changeSet id="00000000000002_jacms_schemaPort" author="entando">
+    <changeSet id="00000000000002_jacms_schemaPort" author="entando" failOnError="false">
         <addNotNullConstraint tableName="contentattributeroles" columnName="attrname" columnDataType="varchar(30)"></addNotNullConstraint>
         <addNotNullConstraint tableName="contentattributeroles" columnName="rolename" columnDataType="varchar(50)"></addNotNullConstraint>
         <addNotNullConstraint tableName="contentsearch" columnName="attrname" columnDataType="varchar(30)"></addNotNullConstraint>
diff --git a/cms-plugin/src/main/resources/liquibase/jacms/port/20230224000000_jacms_social_tag_roles.xml b/cms-plugin/src/main/resources/liquibase/jacms/port/20230224000000_jacms_social_tag_roles.xml
index 86e24bb066..c3ef137b79 100644
--- a/cms-plugin/src/main/resources/liquibase/jacms/port/20230224000000_jacms_social_tag_roles.xml
+++ b/cms-plugin/src/main/resources/liquibase/jacms/port/20230224000000_jacms_social_tag_roles.xml
@@ -5,7 +5,13 @@
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd
            http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.4.xsd">
     
-    <changeSet id="20230224000000_jacms_social_tag_roles" author="entando" context="production">
+    <changeSet id="20230224000000_jacms_social_tag_roles_v2" author="entando" context="production">
+
+        <preConditions onFail="MARK_RAN">
+            <!-- Use uppercase table name to avoid MySQL issue -->
+            <sqlCheck expectedResult="0">SELECT COUNT(*) FROM DATABASECHANGELOG WHERE id = '20230224000000_jacms_social_tag_roles'</sqlCheck>
+            <sqlCheck expectedResult="0">SELECT COUNT(*) FROM sysconfig WHERE item = 'contentTypesRoles'</sqlCheck>
+        </preConditions>
         
         <insert tableName="sysconfig">
             <column name="version" value="production" />
diff --git a/contentscheduler-plugin/src/main/resources/liquibase/jpcontentscheduler/port/00000000000001_dataPort_production.xml b/contentscheduler-plugin/src/main/resources/liquibase/jpcontentscheduler/port/00000000000001_dataPort_production.xml
index 79de0306b4..2cc1968752 100644
--- a/contentscheduler-plugin/src/main/resources/liquibase/jpcontentscheduler/port/00000000000001_dataPort_production.xml
+++ b/contentscheduler-plugin/src/main/resources/liquibase/jpcontentscheduler/port/00000000000001_dataPort_production.xml
@@ -5,13 +5,14 @@
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd
            http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.4.xsd">
 
-    <changeSet id="00000000000001_jpcontentscheduler_dataPort_production" author="entando" context="production">
+    <changeSet id="00000000000001_jpcontentscheduler_dataPort_production_v2" author="entando" context="production">
         <preConditions onFail="MARK_RAN">
             <!-- Use uppercase table name to avoid MySQL issue -->
             <sqlCheck expectedResult="0">SELECT COUNT(*) FROM DATABASECHANGELOG WHERE id = '00000000000001_jpcontentscheduler_dataPort_restore'</sqlCheck>
             <!-- This changeSet contains the same logic (in XML) of the old 00000000000001_dataPort_production.sql file, that was included by changeSetPort.xml
                  Execution of this changeSet must be skipped if tables had already been filled using that file -->
             <sqlCheck expectedResult="0">SELECT COUNT(*) FROM DATABASECHANGELOG WHERE id = '00000000000001_jpcontentscheduler_dataPort_production' AND filename = 'liquibase/changeSetPort.xml'</sqlCheck>
+            <sqlCheck expectedResult="0">SELECT COUNT(*) FROM sysconfig WHERE item = 'cthread_config'</sqlCheck>
         </preConditions>
         
         <insert tableName="sysconfig">
diff --git a/engine/src/main/resources/liquibase/port/00000000000001_dataPort_production.xml b/engine/src/main/resources/liquibase/port/00000000000001_dataPort_production.xml
index e7729f7f94..7c7fb13472 100644
--- a/engine/src/main/resources/liquibase/port/00000000000001_dataPort_production.xml
+++ b/engine/src/main/resources/liquibase/port/00000000000001_dataPort_production.xml
@@ -5,13 +5,14 @@
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd
            http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.4.xsd">
 
-    <changeSet id="00000000000001_dataPort_production" author="entando" context="production">
+    <changeSet id="00000000000001_dataPort_production_v2" author="entando" context="production">
         <preConditions onFail="MARK_RAN">
             <!-- Use uppercase table name to avoid MySQL issue -->
             <sqlCheck expectedResult="0">SELECT COUNT(*) FROM DATABASECHANGELOG WHERE id = '00000000000001_dataPort_restore'</sqlCheck>
             <!-- This changeSet contains the same logic (in XML) of the old 00000000000001_dataPort_production.sql file, that was included by changeSetPort.xml
                  Execution of this changeSet must be skipped if tables had already been filled using that file -->
             <sqlCheck expectedResult="0">SELECT COUNT(*) FROM DATABASECHANGELOG WHERE id = '00000000000001_dataPort_production' AND filename = 'liquibase/changeSetPort.xml'</sqlCheck>
+            <sqlCheck expectedResult="0">SELECT COUNT(*) FROM categories WHERE catcode = 'home'</sqlCheck>
         </preConditions>
 
         <insert tableName="categories">
diff --git a/engine/src/main/resources/liquibase/port/00000000000001_schemaPort.xml b/engine/src/main/resources/liquibase/port/00000000000001_schemaPort.xml
index 141b2c037e..07028fa4e9 100644
--- a/engine/src/main/resources/liquibase/port/00000000000001_schemaPort.xml
+++ b/engine/src/main/resources/liquibase/port/00000000000001_schemaPort.xml
@@ -5,7 +5,14 @@
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd
            http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.4.xsd">
 
-    <changeSet id="00000000000001_schemaPort" author="entando" >
+    <changeSet id="00000000000001_schemaPort_v2" author="entando" >
+        <preConditions onFail="MARK_RAN">
+            <!-- Use uppercase table name to avoid MySQL issue -->
+            <sqlCheck expectedResult="0">SELECT COUNT(*) FROM DATABASECHANGELOG WHERE id = '00000000000001_schemaPort'</sqlCheck>
+            <not>
+                <tableExists tableName="sysconfig"/>
+            </not>
+        </preConditions>
 
         <createTable tableName="sysconfig" >
             <column name="version" type="varchar(10)">
diff --git a/engine/src/main/resources/liquibase/port/00000000000002_schemaPort.xml b/engine/src/main/resources/liquibase/port/00000000000002_schemaPort.xml
index 4bd219bd1f..98026c562e 100644
--- a/engine/src/main/resources/liquibase/port/00000000000002_schemaPort.xml
+++ b/engine/src/main/resources/liquibase/port/00000000000002_schemaPort.xml
@@ -5,7 +5,7 @@
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd
            http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.4.xsd">
 
-    <changeSet id="00000000000002_schemaPort" author="entando">
+    <changeSet id="00000000000002_schemaPort" author="entando" failOnError="false">
         <addNotNullConstraint tableName="widgetcatalog" columnName="locked" columnDataType="smallint"></addNotNullConstraint>
         <addNotNullConstraint tableName="pages" columnName="pos" columnDataType="int"></addNotNullConstraint>
         <addNotNullConstraint tableName="localstrings" columnName="stringvalue" columnDataType="longtext"></addNotNullConstraint>
diff --git a/engine/src/main/resources/liquibase/port/20221004100000_messages_system.xml b/engine/src/main/resources/liquibase/port/20221004100000_messages_system.xml
index 62adc66b7b..281d04730f 100644
--- a/engine/src/main/resources/liquibase/port/20221004100000_messages_system.xml
+++ b/engine/src/main/resources/liquibase/port/20221004100000_messages_system.xml
@@ -5,7 +5,12 @@
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd
            http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.4.xsd">
 
-    <changeSet id="20221004100000_messages_system" author="entando" context="production">
+    <changeSet id="20221004100000_messages_system_v2" author="entando" context="production">
+        <preConditions onFail="MARK_RAN">
+            <!-- Use uppercase table name to avoid MySQL issue -->
+            <sqlCheck expectedResult="0">SELECT COUNT(*) FROM DATABASECHANGELOG WHERE id = '20221004100000_messages_system'</sqlCheck>
+            <sqlCheck expectedResult="0">SELECT COUNT(*) FROM localstrings WHERE keycode = 'USER_UNAUTHORIZED'</sqlCheck>
+        </preConditions>
         
         <insert tableName="localstrings">
             <column name="keycode" value="USER_UNAUTHORIZED" />
diff --git a/engine/src/main/resources/liquibase/port/20230224000000_default_profile_roles.xml b/engine/src/main/resources/liquibase/port/20230224000000_default_profile_roles.xml
index e20f478eca..c4cdd2013e 100644
--- a/engine/src/main/resources/liquibase/port/20230224000000_default_profile_roles.xml
+++ b/engine/src/main/resources/liquibase/port/20230224000000_default_profile_roles.xml
@@ -5,7 +5,12 @@
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd
            http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.4.xsd">
     
-    <changeSet id="20230224000000_default_profile_roles" author="entando" context="production">
+    <changeSet id="20230224000000_default_profile_roles_v2" author="entando" context="production">
+        <preConditions onFail="MARK_RAN">
+            <!-- Use uppercase table name to avoid MySQL issue -->
+            <sqlCheck expectedResult="0">SELECT COUNT(*) FROM DATABASECHANGELOG WHERE id = '20230224000000_default_profile_roles'</sqlCheck>
+            <sqlCheck expectedResult="0">SELECT COUNT(*) FROM sysconfig WHERE item = 'userProfileTypesRoles'</sqlCheck>
+        </preConditions>
         
         <insert tableName="sysconfig">
             <column name="version" value="production" />
diff --git a/engine/src/main/resources/liquibase/port/20230407000000_disable_content_menu.xml b/engine/src/main/resources/liquibase/port/20230407000000_disable_content_menu.xml
index 0b158d95f6..de1f8cb540 100644
--- a/engine/src/main/resources/liquibase/port/20230407000000_disable_content_menu.xml
+++ b/engine/src/main/resources/liquibase/port/20230407000000_disable_content_menu.xml
@@ -5,7 +5,14 @@
     xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd
                         http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.4.xsd">
 
-    <changeSet id="20230407000000_disable_content_menu" author="entando">
+    <changeSet id="20230407000000_disable_content_menu_v2" author="entando">
+        <preConditions onFail="MARK_RAN">
+            <!-- Use uppercase table name to avoid MySQL issue -->
+            <sqlCheck expectedResult="0">SELECT COUNT(*) FROM DATABASECHANGELOG WHERE id = '20230407000000_disable_content_menu'</sqlCheck>
+            <not>
+                <columnExists tableName="userpreferences" columnName="disablecontentmenu" />
+            </not>
+        </preConditions>
 
         <addColumn tableName="userpreferences">
             <column name="disablecontentmenu"
diff --git a/engine/src/main/resources/liquibase/serv/00000000000001_dataServ_production.xml b/engine/src/main/resources/liquibase/serv/00000000000001_dataServ_production.xml
index 7a2a8b3f25..c6b0c8e908 100644
--- a/engine/src/main/resources/liquibase/serv/00000000000001_dataServ_production.xml
+++ b/engine/src/main/resources/liquibase/serv/00000000000001_dataServ_production.xml
@@ -5,13 +5,14 @@
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd
            http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.4.xsd">
 
-    <changeSet id="00000000000001_dataServ_production" author="entando" context="production">
+    <changeSet id="00000000000001_dataServ_production_v2" author="entando" context="production">
         <preConditions onFail="MARK_RAN">
             <!-- Use uppercase table name to avoid MySQL issue -->
             <sqlCheck expectedResult="0">SELECT COUNT(*) FROM DATABASECHANGELOG WHERE id = '00000000000001_dataServ_restore'</sqlCheck>
             <!-- This changeSet contains the same logic (in XML) of the old 00000000000001_dataServ_production.sql file, that was included by changeSetServ.xml
                  Execution of this changeSet must be skipped if tables had already been filled using that file -->
             <sqlCheck expectedResult="0">SELECT COUNT(*) FROM DATABASECHANGELOG WHERE id = '00000000000001_dataServ_production' AND filename = 'liquibase/changeSetServ.xml'</sqlCheck>
+            <sqlCheck expectedResult="0">SELECT COUNT(*) FROM authgroups WHERE groupname = 'administrators'</sqlCheck>
         </preConditions>
 
         <insert tableName="authgroups">
diff --git a/engine/src/main/resources/liquibase/serv/00000000000001_schemaServ.xml b/engine/src/main/resources/liquibase/serv/00000000000001_schemaServ.xml
index 0d296d08a7..ae6b002b6f 100644
--- a/engine/src/main/resources/liquibase/serv/00000000000001_schemaServ.xml
+++ b/engine/src/main/resources/liquibase/serv/00000000000001_schemaServ.xml
@@ -5,7 +5,14 @@
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd
            http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.4.xsd">
     
-    <changeSet id="00000000000001_schemaServ" author="entando">
+    <changeSet id="00000000000001_schemaServ_v2" author="entando">
+        <preConditions onFail="MARK_RAN">
+            <!-- Use uppercase table name to avoid MySQL issue -->
+            <sqlCheck expectedResult="0">SELECT COUNT(*) FROM DATABASECHANGELOG WHERE id = '00000000000001_schemaServ'</sqlCheck>
+            <not>
+                <tableExists tableName="authgroups"/>
+            </not>
+        </preConditions>
 
         <createTable tableName="authgroups" >
             <column name="groupname" type="varchar(20)">
@@ -327,7 +334,14 @@
         <sql>CREATE TABLE api_oauth_consumers (consumerkey VARCHAR(100) NOT NULL, consumersecret VARCHAR(100) NOT NULL, name VARCHAR(255), description CLOB NOT NULL, callbackurl CLOB, scope VARCHAR(255), authorizedgranttypes VARCHAR(255), expirationdate TIMESTAMP, issueddate TIMESTAMP, CONSTRAINT PK_API_OAUTH_CONSUMERS PRIMARY KEY (consumerkey))</sql>
     </changeSet>
     
-    <changeSet id="00000000000001_schemaServ_consumers" author="entando" dbms="!derby">
+    <changeSet id="00000000000001_schemaServ_consumers_v2" author="entando" dbms="!derby">
+        <preConditions onFail="MARK_RAN">
+            <!-- Use uppercase table name to avoid MySQL issue -->
+            <sqlCheck expectedResult="0">SELECT COUNT(*) FROM DATABASECHANGELOG WHERE id = '00000000000001_schemaServ_consumers'</sqlCheck>
+            <not>
+                <tableExists tableName="api_oauth_consumers"/>
+            </not>
+        </preConditions>
         <createTable tableName="api_oauth_consumers" >
             <column name="consumerkey" type="varchar(100)">
                 <constraints primaryKey="true" nullable="false"/>
diff --git a/engine/src/main/resources/liquibase/serv/00000000000002_schemaServ.xml b/engine/src/main/resources/liquibase/serv/00000000000002_schemaServ.xml
index 266555c35d..67288a46f9 100644
--- a/engine/src/main/resources/liquibase/serv/00000000000002_schemaServ.xml
+++ b/engine/src/main/resources/liquibase/serv/00000000000002_schemaServ.xml
@@ -5,7 +5,7 @@
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd
            http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.4.xsd">
 
-    <changeSet id="00000000000002_schemaServ" author="entando">
+    <changeSet id="00000000000002_schemaServ" author="entando" failOnError="false">
         <addNotNullConstraint tableName="authuserprofileattrroles" columnName="attrname" columnDataType="varchar(30)"></addNotNullConstraint>
         <addNotNullConstraint tableName="authuserprofileattrroles" columnName="rolename" columnDataType="varchar(50)"></addNotNullConstraint>
         <addNotNullConstraint tableName="authuserprofilesearch" columnName="attrname" columnDataType="varchar(30)"></addNotNullConstraint>
diff --git a/engine/src/main/resources/liquibase/serv/20230228000000_unused_permission.xml b/engine/src/main/resources/liquibase/serv/20230228000000_unused_permission.xml
index a6f47b074e..99a7e3e2b6 100644
--- a/engine/src/main/resources/liquibase/serv/20230228000000_unused_permission.xml
+++ b/engine/src/main/resources/liquibase/serv/20230228000000_unused_permission.xml
@@ -5,7 +5,12 @@
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd
            http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.4.xsd">
 
-    <changeSet id="20230228000000_unused_permission" author="entando">
+    <changeSet id="20230228000000_unused_permission_v2" author="entando">
+        <preConditions onFail="MARK_RAN">
+            <!-- Use uppercase table name to avoid MySQL issue -->
+            <sqlCheck expectedResult="0">SELECT COUNT(*) FROM DATABASECHANGELOG WHERE id = '20230228000000_unused_permission'</sqlCheck>
+            <tableExists tableName="authrolepermissions"/>
+        </preConditions>
         
         <delete tableName="authrolepermissions">
             <where>rolename='reviewer'</where>
diff --git a/mail-plugin/src/main/resources/liquibase/jpmail/port/00000000000001_dataPort_production.xml b/mail-plugin/src/main/resources/liquibase/jpmail/port/00000000000001_dataPort_production.xml
index e31bca8c9c..aaecdbb87e 100644
--- a/mail-plugin/src/main/resources/liquibase/jpmail/port/00000000000001_dataPort_production.xml
+++ b/mail-plugin/src/main/resources/liquibase/jpmail/port/00000000000001_dataPort_production.xml
@@ -5,13 +5,14 @@
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd
            http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.4.xsd">
 
-    <changeSet id="00000000000001_jpmail_dataPort_production" author="entando" context="production">
+    <changeSet id="00000000000001_jpmail_dataPort_production_v2" author="entando" context="production">
         <preConditions onFail="MARK_RAN">
             <!-- Use uppercase table name to avoid MySQL issue -->
             <sqlCheck expectedResult="0">SELECT COUNT(*) FROM DATABASECHANGELOG WHERE id = '00000000000001_jpmail_dataPort_restore'</sqlCheck>
             <!-- This changeSet contains the same logic (in XML) of the old 00000000000001_dataPort_production.sql file, that was included by changeSetPort.xml
                  Execution of this changeSet must be skipped if tables had already been filled using that file -->
             <sqlCheck expectedResult="0">SELECT COUNT(*) FROM DATABASECHANGELOG WHERE id = '00000000000001_jpmail_dataPort_production' AND filename = 'liquibase/jpmail/changeSetPort.xml'</sqlCheck>
+            <sqlCheck expectedResult="0">SELECT COUNT(*) FROM sysconfig WHERE item = 'jpmail_config'</sqlCheck>
         </preConditions>
 
         <insert tableName="sysconfig">
diff --git a/seo-plugin/src/main/resources/liquibase/jpseo/port/00000000000001_dataPort_production.xml b/seo-plugin/src/main/resources/liquibase/jpseo/port/00000000000001_dataPort_production.xml
index 60824bbce7..e88cd46ee8 100644
--- a/seo-plugin/src/main/resources/liquibase/jpseo/port/00000000000001_dataPort_production.xml
+++ b/seo-plugin/src/main/resources/liquibase/jpseo/port/00000000000001_dataPort_production.xml
@@ -5,13 +5,14 @@
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd
            http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.4.xsd">
 
-    <changeSet id="00000000000001_jpseo_dataPort_production" author="entando" context="production">
+    <changeSet id="00000000000001_jpseo_dataPort_production_v2" author="entando" context="production">
         <preConditions onFail="MARK_RAN">
             <!-- Use uppercase table name to avoid MySQL issue -->
             <sqlCheck expectedResult="0">SELECT COUNT(*) FROM DATABASECHANGELOG WHERE id = '00000000000001_jpseo_dataPort_restore'</sqlCheck>
             <!-- This changeSet contains the same logic (in XML) of the old 00000000000001_dataPort_production.sql file, that was included by changeSetPort.xml
                  Execution of this changeSet must be skipped if tables had already been filled using that file -->
             <sqlCheck expectedResult="0">SELECT COUNT(*) FROM DATABASECHANGELOG WHERE id = '00000000000001_jpseo_dataPort_production' AND filename = 'liquibase/jpseo/changeSetPort.xml'</sqlCheck>
+            <sqlCheck expectedResult="0">SELECT COUNT(*) FROM widgetcatalog WHERE code = 'jpseo_content_viewer'</sqlCheck>
         </preConditions>
 
         <insert tableName="widgetcatalog">
diff --git a/seo-plugin/src/main/resources/liquibase/jpseo/port/00000000000001_schemaPort.xml b/seo-plugin/src/main/resources/liquibase/jpseo/port/00000000000001_schemaPort.xml
index ba8f43e398..8f3f9debda 100644
--- a/seo-plugin/src/main/resources/liquibase/jpseo/port/00000000000001_schemaPort.xml
+++ b/seo-plugin/src/main/resources/liquibase/jpseo/port/00000000000001_schemaPort.xml
@@ -5,7 +5,14 @@
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd
            http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.4.xsd">
 
-    <changeSet id="00000000000001_jpseo_schemaPort" author="entando">
+    <changeSet id="00000000000001_jpseo_schemaPort_v2" author="entando">
+        <preConditions onFail="MARK_RAN">
+            <!-- Use uppercase table name to avoid MySQL issue -->
+            <sqlCheck expectedResult="0">SELECT COUNT(*) FROM DATABASECHANGELOG WHERE id = '00000000000001_jpseo_schemaPort'</sqlCheck>
+            <not>
+                <tableExists tableName="jpseo_friendlycode"/>
+            </not>
+        </preConditions>
         
         <createTable tableName="jpseo_friendlycode" >
             <column name="friendlycode" type="varchar(256)">
diff --git a/versioning-plugin/src/main/resources/liquibase/jpversioning/port/00000000000001_schemaPort.xml b/versioning-plugin/src/main/resources/liquibase/jpversioning/port/00000000000001_schemaPort.xml
index 8f20c64787..3b4d7e8921 100644
--- a/versioning-plugin/src/main/resources/liquibase/jpversioning/port/00000000000001_schemaPort.xml
+++ b/versioning-plugin/src/main/resources/liquibase/jpversioning/port/00000000000001_schemaPort.xml
@@ -5,7 +5,14 @@
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd
            http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.4.xsd">
 
-    <changeSet id="00000000000001_jpversioning_schemaPort" author="entando">
+    <changeSet id="00000000000001_jpversioning_schemaPort_v2" author="entando">
+        <preConditions onFail="MARK_RAN">
+            <!-- Use uppercase table name to avoid MySQL issue -->
+            <sqlCheck expectedResult="0">SELECT COUNT(*) FROM DATABASECHANGELOG WHERE id = '00000000000001_jpversioning_schemaPort'</sqlCheck>
+            <not>
+                <tableExists tableName="jpversioning_trashedresources"/>
+            </not>
+        </preConditions>
         
         <createTable tableName="jpversioning_trashedresources" >
             <column name="resid" type="varchar(16)">
diff --git a/webapp/src/main/resources/liquibase/defaultResources/port/00000000000001_dataPort_production.xml b/webapp/src/main/resources/liquibase/defaultResources/port/00000000000001_dataPort_production.xml
index ce74627dd0..b3be06ce90 100644
--- a/webapp/src/main/resources/liquibase/defaultResources/port/00000000000001_dataPort_production.xml
+++ b/webapp/src/main/resources/liquibase/defaultResources/port/00000000000001_dataPort_production.xml
@@ -5,7 +5,7 @@
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd
            http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.4.xsd">
 
-    <changeSet id="00000000000001_de_defaultResources_dataPort_production" author="entando" context="production">
+    <changeSet id="00000000000001_de_defaultResources_dataPort_production_v2" author="entando" context="production">
 
         <preConditions onFail="MARK_RAN">
             <!-- Use uppercase table name to avoid MySQL issue -->
@@ -13,6 +13,7 @@
             <!-- This changeSet contains the same logic (in XML) of the old 00000000000001_dataPort_production.sql file, that was included by changeSetPort.xml
                  Execution of this changeSet must be skipped if tables had already been filled using that file -->
             <sqlCheck expectedResult="0">SELECT COUNT(*) FROM DATABASECHANGELOG WHERE id = '00000000000001_de_defaultResources_dataPort_production' AND filename = 'liquibase/defaultResources/changeSetPort.xml'</sqlCheck>
+            <sqlCheck expectedResult="0">SELECT COUNT(*) FROM widgetcatalog WHERE code = 'breadcrumb'</sqlCheck>
         </preConditions>
 
         <insert tableName="widgetcatalog">
diff --git a/webapp/src/main/resources/liquibase/defaultResources/port/20221004100000_errorpage_config.xml b/webapp/src/main/resources/liquibase/defaultResources/port/20221004100000_errorpage_config.xml
index 6ca7cbe38a..4760a69b68 100644
--- a/webapp/src/main/resources/liquibase/defaultResources/port/20221004100000_errorpage_config.xml
+++ b/webapp/src/main/resources/liquibase/defaultResources/port/20221004100000_errorpage_config.xml
@@ -5,7 +5,16 @@
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd
            http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.4.xsd">
 
-    <changeSet id="20221004100000_errorpage_config" author="entando" context="production">
+    <changeSet id="20221004100000_errorpage_config_v2" author="entando" context="production">
+
+        <preConditions onFail="MARK_RAN">
+            <!-- Use uppercase table name to avoid MySQL issue -->
+            <sqlCheck expectedResult="0">SELECT COUNT(*) FROM DATABASECHANGELOG WHERE id = '20221004100000_errorpage_config'</sqlCheck>
+            <sqlCheck expectedResult="1">SELECT COUNT(*) FROM pages WHERE code = 'errorpage'</sqlCheck>
+            <sqlCheck expectedResult="1">SELECT COUNT(*) FROM widgetcatalog WHERE code = 'messages_system'</sqlCheck>
+            <sqlCheck expectedResult="0">SELECT COUNT(*) FROM widgetconfig_draft WHERE widgetcode = 'messages_system' AND pagecode = 'errorpage' AND framepos = 0</sqlCheck>
+            <sqlCheck expectedResult="0">SELECT COUNT(*) FROM widgetconfig WHERE widgetcode = 'messages_system' AND pagecode = 'errorpage' AND framepos = 0</sqlCheck>
+        </preConditions>
 
         <insert tableName="widgetconfig_draft">
             <column name="pagecode" value="errorpage" />
diff --git a/webapp/src/main/resources/liquibase/defaultResources/port/20221214000000_legacy_navigation_menu_widget.xml b/webapp/src/main/resources/liquibase/defaultResources/port/20221214000000_legacy_navigation_menu_widget.xml
index 7540d19398..74369161ea 100644
--- a/webapp/src/main/resources/liquibase/defaultResources/port/20221214000000_legacy_navigation_menu_widget.xml
+++ b/webapp/src/main/resources/liquibase/defaultResources/port/20221214000000_legacy_navigation_menu_widget.xml
@@ -5,7 +5,13 @@
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd
            http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.4.xsd">
 
-    <changeSet id="20221214100000_navigation_bar_widget" author="entando" context="production">
+    <changeSet id="20221214100000_navigation_bar_widget_v2" author="entando" context="production">
+        <preConditions onFail="MARK_RAN">
+            <!-- Use uppercase table name to avoid MySQL issue -->
+            <sqlCheck expectedResult="0">SELECT COUNT(*) FROM DATABASECHANGELOG WHERE id = '20221214100000_navigation_bar_widget'</sqlCheck>
+            <sqlCheck expectedResult="0">SELECT COUNT(*) FROM widgetcatalog WHERE code = 'legacy-navigation-menu'</sqlCheck>
+        </preConditions>
+
         <insert tableName="widgetcatalog">
             <column name="code" value="legacy-navigation-menu" />
             <column name="titles" valueClobFile="clob/production/widgetcatalog_12.xml" />