Skip to content

Commit

Permalink
Merge pull request #7112 from davidwatkins73/waltz-7079-prep-1-62
Browse files Browse the repository at this point in the history
Prep 1.62
  • Loading branch information
jessica-woodland-scott-db authored Jul 12, 2024
2 parents 7c80dec + 35b1232 commit 6ca681a
Show file tree
Hide file tree
Showing 14 changed files with 46 additions and 17 deletions.
9 changes: 3 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ Getting started
[![FINOS Hosted Platform - Waltz Demo](https://img.shields.io/badge/FINOS%20Hosted%20Platform-Waltz%20Demo-blue)](https://demo.waltz.finos.org/)
[![postgres build](https://github.com/finos/waltz/actions/workflows/maven.yml/badge.svg)](https://github.com/finos/waltz/actions)
[![Latest Version](https://badgers.space/github/release/finos/waltz)](https://github.com/finos/waltz/releases)
[![Language Grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/khartec/waltz.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/khartec/waltz/context:javascript)
[![Language Grade: Java](https://img.shields.io/lgtm/grade/java/g/khartec/waltz.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/khartec/waltz/context:java)
[![FINOS - Active](https://cdn.jsdelivr.net/gh/finos/contrib-toolbox@master/images/badge-active.svg)](https://finosfoundation.atlassian.net/wiki/display/FINOS/Active)

## Corporate Contributors
Expand Down Expand Up @@ -68,10 +66,9 @@ progress and done issues.

**Provisional** dates for upcoming releases:

| Release | Date | Provisional Change Summary |
|--------|---------------|----------------------------|
| 1.61.1 | Jul 11th 2024 | Alias search, minor fixes |
| 1.62 | Jul 30th 2024 | Java 11, possible move to Javalin |
| Release | Date | Provisional Change Summary |
|---------|---------------|-----------------------------------|
| 1.62 | Jul 30th 2024 | Java 11, possible move to Javalin |

See the [releases](https://github.com/finos/waltz/releases) page for historic versions.

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

<groupId>org.finos</groupId>
<artifactId>waltz</artifactId>
<version>1.61.1-SNAPSHOT</version>
<version>1.62-SNAPSHOT</version>
<modules>
<module>waltz-common</module>
<module>waltz-model</module>
Expand Down
2 changes: 1 addition & 1 deletion waltz-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>waltz</artifactId>
<groupId>org.finos</groupId>
<version>1.61.1-SNAPSHOT</version>
<version>1.62-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion waltz-data/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>waltz</artifactId>
<groupId>org.finos</groupId>
<version>1.61.1-SNAPSHOT</version>
<version>1.62-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion waltz-integration-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>waltz</artifactId>
<groupId>org.finos</groupId>
<version>1.61.1-SNAPSHOT</version>
<version>1.62-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion waltz-jobs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>waltz</artifactId>
<groupId>org.finos</groupId>
<version>1.61.1-SNAPSHOT</version>
<version>1.62-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion waltz-model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>waltz</artifactId>
<groupId>org.finos</groupId>
<version>1.61.1-SNAPSHOT</version>
<version>1.62-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion waltz-ng/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "waltz-ng",
"version": "1.61.1",
"version": "1.62.0",
"description": "To start test server run: `npm run dev-server` and ensure java backend is running on 8443",
"main": "client/main.js",
"browserslist": [
Expand Down
2 changes: 1 addition & 1 deletion waltz-schema/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>waltz</artifactId>
<groupId>org.finos</groupId>
<version>1.61.1-SNAPSHOT</version>
<version>1.62-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
29 changes: 29 additions & 0 deletions waltz-schema/src/main/resources/liquibase/db.changelog-1.62.xml
Original file line number Diff line number Diff line change
@@ -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.62.xml">


<changeSet id="v1-61-tag"
author="davidwatkins73">
<tagDatabase tag="v1.61"/> <!-- tag the current db version, i.e. the last -->
</changeSet>

</databaseChangeLog>
Original file line number Diff line number Diff line change
Expand Up @@ -213,4 +213,7 @@
<include file="db.changelog-1.61.xml"
relativeToChangelogFile="true"/>

<include file="db.changelog-1.62.xml"
relativeToChangelogFile="true"/>

</databaseChangeLog>
2 changes: 1 addition & 1 deletion waltz-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<artifactId>waltz</artifactId>
<groupId>org.finos</groupId>
<version>1.61.1-SNAPSHOT</version>
<version>1.62-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion waltz-test-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>waltz</artifactId>
<groupId>org.finos</groupId>
<version>1.61.1-SNAPSHOT</version>
<version>1.62-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion waltz-web/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<artifactId>waltz</artifactId>
<groupId>org.finos</groupId>
<version>1.61.1-SNAPSHOT</version>
<version>1.62-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>waltz-web</artifactId>
Expand Down

0 comments on commit 6ca681a

Please sign in to comment.