merged origin/master into NotficationCenter

.liquibase/Data_alias/basic/2019.2/alter_activityLink_Derby.xml

+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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-3.6.xsd">
+    <changeSet dbms="derby" author="j.hoermann" id="4e0bce38-7470-4289-a656-2f2e34cefd9c">
+        <sql>
+            ALTER TABLE ACTIVITYLINK ADD COLUMN ACTIVITY_ID_NEW CHAR(36);
+            UPDATE ACTIVITYLINK SET ACTIVITY_ID_NEW=ACTIVITY_ID;
+            ALTER TABLE ACTIVITYLINK DROP COLUMN ACTIVITY_ID;
+            RENAME COLUMN ACTIVITYLINK.ACTIVITY_ID_NEW TO ACTIVITY_ID;
+        </sql>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/basic/2019.2/alter_activityLink_notDerby.xml

+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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-3.6.xsd">
+    <changeSet dbms="!derby" author="j.hoermann" id="634590d7-8bcc-40f9-9615-9de7cd91e586">
+        <modifyDataType tableName="ACTIVITYLINK" columnName="ACTIVITY_ID" newDataType="CHAR(36)"/>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file

others/db_changes/Data_alias/basic/2019.2/changelog.xml → .liquibase/Data_alias/basic/2019.2/changelog.xml

@@ -131,4 +131,9 @@
     <include relativeToChangelogFile="true" file="indicesRefactor/Task.xml"/>
 
     <include relativeToChangelogFile="true" file="update_Keyword_Essentials.xml" />
+    <include relativeToChangelogFile="true" file="Contactmanagement_added_ImageBlobs.xml" />
+	
+    <!-- Derby needs special handling -->
+    <include relativeToChangelogFile="true" file="alter_activityLink_notDerby.xml" />
+    <include relativeToChangelogFile="true" file="alter_activityLink_Derby.xml" />
 </databaseChangeLog>