From 2f487f4d3384aaa65b698b25fa9a161e60cde9c3 Mon Sep 17 00:00:00 2001
From: Devendra-Ramesh Patil <devendra-ramesh.patil@db.com>
Date: Fri, 25 Oct 2024 13:26:20 +0530
Subject: [PATCH 1/4] Updated the version to 1.66-SNAPSHOT #CTCTOWALTZ-3417
 #7151

---
 pom.xml                        | 2 +-
 waltz-common/pom.xml           | 2 +-
 waltz-data/pom.xml             | 2 +-
 waltz-integration-test/pom.xml | 2 +-
 waltz-jobs/pom.xml             | 2 +-
 waltz-model/pom.xml            | 2 +-
 waltz-schema/pom.xml           | 2 +-
 waltz-service/pom.xml          | 2 +-
 waltz-test-common/pom.xml      | 2 +-
 waltz-web/pom.xml              | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7a790b3523..b130fd7409 100644
--- 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
index 75d449715a..4a044194ec 100644
--- 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
index 7a103c638a..22551ebf50 100644
--- 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
index e3268b07ca..42b5762c43 100644
--- 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
index 608e4d7267..3295314564 100644
--- 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
index 0951453291..bcecd0967f 100644
--- 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-schema/pom.xml b/waltz-schema/pom.xml
index db613b6f8e..5beab11547 100644
--- 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-service/pom.xml b/waltz-service/pom.xml
index f2e521ca29..3f9a9e09ab 100644
--- 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
index 883b5dc07a..fd874b31df 100644
--- 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
index 99e10aecf1..4fe9d542ff 100644
--- 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>

From 2708c226936573d9445301bcad3f890cbe9fa9fd Mon Sep 17 00:00:00 2001
From: Devendra-Ramesh Patil <devendra-ramesh.patil@db.com>
Date: Fri, 25 Oct 2024 13:33:21 +0530
Subject: [PATCH 2/4] Updated the version to 1.66-SNAPSHOT #CTCTOWALTZ-3417
 #7151

---
 waltz-ng/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/waltz-ng/package.json b/waltz-ng/package.json
index 30f9b2410f..555c3703bc 100644
--- 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": [

From 5304f0874b05ef822dff1604a705e6f29c740cfd Mon Sep 17 00:00:00 2001
From: Devendra-Ramesh Patil <devendra-ramesh.patil@db.com>
Date: Fri, 25 Oct 2024 13:45:49 +0530
Subject: [PATCH 3/4] Updated the changelog and read me. #CTCTOWALTZ-3417 #7151

---
 README.md                                     |  8 +++---
 .../resources/liquibase/db.changelog-1.66.xml | 27 +++++++++++++++++++
 .../liquibase/db.changelog-master.xml         |  2 ++
 3 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 waltz-schema/src/main/resources/liquibase/db.changelog-1.66.xml

diff --git a/README.md b/README.md
index f217d528cc..4676c65344 100644
--- 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/waltz-schema/src/main/resources/liquibase/db.changelog-1.66.xml b/waltz-schema/src/main/resources/liquibase/db.changelog-1.66.xml
new file mode 100644
index 0000000000..7a273c0d17
--- /dev/null
+++ 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>
\ No newline at end of file
diff --git a/waltz-schema/src/main/resources/liquibase/db.changelog-master.xml b/waltz-schema/src/main/resources/liquibase/db.changelog-master.xml
index 3d0f8f33b2..b0d2967fe9 100644
--- 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>
\ No newline at end of file

From 4ff21edc0b133f0022e3feb6c15cfe6f0a9f3661 Mon Sep 17 00:00:00 2001
From: Devendra-Ramesh Patil <devendra-ramesh.patil@db.com>
Date: Tue, 12 Nov 2024 17:32:53 +0530
Subject: [PATCH 4/4] Updated dbms in changelog 1.65 to mssql. #7151
 #CTCTOWALTZ-3417 #7151

---
 .../resources/liquibase/db.changelog-1.65.xml | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

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
index b3c501ba69..b5aaf0839f 100644
--- 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"/>