Merge pull request finos#7183 from deutschebank/db-contrib/waltz-7151…

…-prep Db contrib/waltz 7151 prep
G-Research · Nov 13, 2024 · f34071b · f34071b
2 parents 5a3a543 + cd2fdc9
commit f34071b
Show file tree

Hide file tree

Showing 15 changed files with 55 additions and 26 deletions.
diff --git a/README.md b/README.md
@@ -66,10 +66,10 @@ progress and done issues.
 
 **Provisional** dates for upcoming releases:
 
-| Release | Date        | Provisional Change Summary |
-|---------|-------------|----------------------------|
-| 1.65    | 24 Oct 2024 | Bulk loaders               | 
-| 1.66    | Nov 2024    | TBC                        | 
+| Release | Date     | Provisional Change Summary   |
+|---------|----------|------------------------------|
+| 1.66    | Nov 2024   | AGF Survey Changes and Fixes | 
+| 1.67    | Dec 2024 | TBC                          | 
 
 See the [releases](https://github.com/finos/waltz/releases) page for historic versions.
 

diff --git a/pom.xml b/pom.xml
@@ -31,7 +31,7 @@
 
     <groupId>org.finos</groupId>
     <artifactId>waltz</artifactId>
-    <version>1.65-SNAPSHOT</version>
+    <version>1.66-SNAPSHOT</version>
     <modules>
         <module>waltz-common</module>
         <module>waltz-model</module>

diff --git a/waltz-common/pom.xml b/waltz-common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.65-SNAPSHOT</version>
+        <version>1.66-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/waltz-data/pom.xml b/waltz-data/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.65-SNAPSHOT</version>
+        <version>1.66-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/waltz-integration-test/pom.xml b/waltz-integration-test/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.65-SNAPSHOT</version>
+        <version>1.66-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/waltz-jobs/pom.xml b/waltz-jobs/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.65-SNAPSHOT</version>
+        <version>1.66-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/waltz-model/pom.xml b/waltz-model/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.65-SNAPSHOT</version>
+        <version>1.66-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/waltz-ng/package.json b/waltz-ng/package.json
@@ -1,6 +1,6 @@
 {
     "name": "waltz-ng",
-    "version": "1.65.0",
+    "version": "1.66.0",
     "description": "To start test server run: `npm run dev-server` and ensure java backend is running on 8443",
     "main": "client/main.js",
     "browserslist": [

diff --git a/waltz-schema/pom.xml b/waltz-schema/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.65-SNAPSHOT</version>
+        <version>1.66-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/waltz-schema/src/main/resources/liquibase/db.changelog-1.65.xml b/waltz-schema/src/main/resources/liquibase/db.changelog-1.65.xml
@@ -57,77 +57,77 @@
     </changeSet>
     <changeSet id="20241009-7162-6"
                author="jejuabh"
-               dbms="!h2">
+               dbms="mssql">
         <comment>7162: Add description to table qrtz_triggers</comment>
         <setTableRemarks  remarks="is where general information of a trigger is saved"
                           tableName="qrtz_triggers"/>
     </changeSet>
     <changeSet id="20241009-7162-7"
                author="jejuabh"
-               dbms="!h2">
+               dbms="mssql">
         <comment>7162: Add description to table qrtz_simprop_triggers</comment>
         <setTableRemarks  remarks="have a foreign key relation to qrtz_triggers which save those specific details. Ex. Cron has cron expression which is unique to it."
                           tableName="qrtz_simprop_triggers"/>
     </changeSet>
     <changeSet id="20241009-7162-8"
                author="jejuabh"
-               dbms="!h2">
+               dbms="mssql">
         <comment>7162: Add description to table qrtz_simple_triggers</comment>
         <setTableRemarks  remarks="have a foreign key relation to qrtz_triggers which save those specific details. Ex. Cron has cron expression which is unique to it."
                           tableName="qrtz_simple_triggers"/>
     </changeSet>
     <changeSet id="20241009-7162-9"
                author="jejuabh"
-               dbms="!h2">
+               dbms="mssql">
         <comment>7162: Add description to table qrtz_scheduler_state</comment>
         <setTableRemarks  remarks="is for capturing the node state so that if in any case one node gets down or failed to execute one of the job then the other instance running in clustering mode can pick the misfired job"
                           tableName="qrtz_scheduler_state"/>
     </changeSet>
     <changeSet id="20241009-7162-10"
                author="jejuabh"
-               dbms="!h2">
+               dbms="mssql">
         <comment>7162: Add description to table qrtz_paused_trigger_grps</comment>
         <setTableRemarks  remarks="is to save the information about triggers which are not active"
                           tableName="qrtz_paused_trigger_grps"/>
     </changeSet>
     <changeSet id="20241009-7162-11"
                author="jejuabh"
-               dbms="!h2">
+               dbms="mssql">
         <comment>7162: Add description to table qrtz_locks</comment>
         <setTableRemarks  remarks="stores the value of the instance name executing the job, to avoid the sceanario of multiple nodes executing the same job"
                           tableName="qrtz_locks"/>
     </changeSet>
     <changeSet id="20241009-7162-12"
                author="jejuabh"
-               dbms="!h2">
+               dbms="mssql">
         <comment>7162: Add description to table qrtz_job_details</comment>
         <setTableRemarks  remarks="the task to be executed."
                           tableName="qrtz_job_details"/>
     </changeSet>
     <changeSet id="20241009-7162-13"
                author="jejuabh"
-               dbms="!h2">
+               dbms="mssql">
         <comment>7162: Add description to table qrtz_fired_triggers</comment>
         <setTableRemarks  remarks="is a log of all the triggers that were fired."
                           tableName="qrtz_fired_triggers"/>
     </changeSet>
     <changeSet id="20241009-7162-14"
                author="jejuabh"
-               dbms="!h2">
+               dbms="mssql">
         <comment>7162: Add description to table qrtz_cron_triggers</comment>
         <setTableRemarks  remarks="have a foreign key relation to qrtz_triggers which save those specific details. Ex. Cron has cron expression which is unique to it."
                           tableName="qrtz_cron_triggers"/>
     </changeSet>
     <changeSet id="20241009-7162-15"
                author="jejuabh"
-               dbms="!h2">
+               dbms="mssql">
         <comment>7162: Add description to table qrtz_calendars</comment>
         <setTableRemarks  remarks="for excluding blocks of time from the the trigger’s firing schedule. For instance, you could create a trigger that fires a job every weekday at 9:30 am, but then add a Calendar that excludes all of the business’s holidays"
                           tableName="qrtz_calendars"/>
     </changeSet>
     <changeSet id="20241009-7162-16"
                author="jejuabh"
-               dbms="!h2">
+               dbms="mssql">
         <comment>7162: Add description to table qrtz_blob_triggers</comment>
         <setTableRemarks  remarks="for excluding blocks of time from the the trigger’s firing schedule. For instance, you could create a trigger that fires a job every weekday at 9:30 am, but then add a Calendar that excludes all of the business’s holidays"
                           tableName="qrtz_blob_triggers"/>

diff --git a/waltz-schema/src/main/resources/liquibase/db.changelog-1.66.xml b/waltz-schema/src/main/resources/liquibase/db.changelog-1.66.xml
@@ -0,0 +1,27 @@
+<!--
+  ~ Waltz - Enterprise Architecture
+  ~ Copyright (C) 2016, 2017, 2018, 2019 Waltz open source project
+  ~ See README.md for more information
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific
+  ~
+  -->
+<databaseChangeLog xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd"
+                   logicalFilePath="db.changelog-1.66.xml">
+
+    <changeSet id="v1-65-tag"
+               author="patidev">
+        <tagDatabase tag="v1.65"/> <!-- tag the current db version, i.e. the last  -->
+    </changeSet>
+</databaseChangeLog>
diff --git a/waltz-schema/src/main/resources/liquibase/db.changelog-master.xml b/waltz-schema/src/main/resources/liquibase/db.changelog-master.xml
@@ -225,4 +225,6 @@
     <include file="db.changelog-1.65.xml"
              relativeToChangelogFile="true"/>
 
+    <include file="db.changelog-1.66.xml"
+             relativeToChangelogFile="true"/>
 </databaseChangeLog>
diff --git a/waltz-service/pom.xml b/waltz-service/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.65-SNAPSHOT</version>
+        <version>1.66-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/waltz-test-common/pom.xml b/waltz-test-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.65-SNAPSHOT</version>
+        <version>1.66-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/waltz-web/pom.xml b/waltz-web/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.65-SNAPSHOT</version>
+        <version>1.66-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>waltz-web</artifactId>