Merge pull request #7081 from davidwatkins73/waltz-7034-prep-1_61

Prep 1.61 release
finos · May 30, 2024 · 75152cc · 75152cc
2 parents 3f59834 + 0c2e899
commit 75152cc
Show file tree

Hide file tree

Showing 15 changed files with 48 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -68,10 +68,9 @@ progress and done issues.
 
 **Provisional** dates for upcoming releases:
 
-| Release | Date          | Provisional Change Summary                                            |
-|---------|---------------|-----------------------------------------------------------------------|
-| 1.58.1  | Feb 27th 2024 | Minor fixes                                                           |
-| 1.59    | Mar 26th 2024 | Flow classification rules for aggregator apps (not just distributors) |
+| Release | Date          | Provisional Change Summary |
+|---------|---------------|----------------------------|
+| 1.61    | Jun 25th 2024 | Java 17 support            |
 
 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.59-SNAPSHOT</version>
+    <version>1.61-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.59-SNAPSHOT</version>
+        <version>1.61-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.59-SNAPSHOT</version>
+        <version>1.61-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.59-SNAPSHOT</version>
+        <version>1.61-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.59-SNAPSHOT</version>
+        <version>1.61-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.59-SNAPSHOT</version>
+        <version>1.61-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/waltz-ng/package-lock.json b/waltz-ng/package-lock.json
diff --git a/waltz-ng/package.json b/waltz-ng/package.json
@@ -1,6 +1,6 @@
 {
     "name": "waltz-ng",
-    "version": "1.59",
+    "version": "1.61",
     "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.59-SNAPSHOT</version>
+        <version>1.61-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/waltz-schema/src/main/resources/liquibase/db.changelog-1.61.xml b/waltz-schema/src/main/resources/liquibase/db.changelog-1.61.xml
@@ -0,0 +1,29 @@
+<!--
+  ~ 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.61.xml">
+
+
+    <changeSet id="v1-60-tag"
+               author="woodjes">
+        <tagDatabase tag="v1.60"/> <!-- 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
@@ -210,4 +210,7 @@
     <include file="db.changelog-1.60.xml"
                 relativeToChangelogFile="true"/>
 
+    <include file="db.changelog-1.61.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.59-SNAPSHOT</version>
+        <version>1.61-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.59-SNAPSHOT</version>
+        <version>1.61-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.59-SNAPSHOT</version>
+        <version>1.61-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>waltz-web</artifactId>