Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ Getting started
### Server

- Java 17 (OpenJDK)
- Embedded Jetty or WAR file (tested on Tomcat 7/8)
- Spark framework
- Embedded Jetty or WAR file (tested on Tomcat 10)
- Spark framework (2.9.4) compatible with Tomcat 10
- JDBC via JOOQ

See [pom.xml](https://github.com/finos/waltz/blob/master/pom.xml) for a full list of Java dependencies.

## Technical Upgrade Section
- Please refer to the Waltz [Technical Upgrade](TechnicalUpgrade.md) page.

### Supported Databases

Expand Down
17 changes: 17 additions & 0 deletions TechnicalUpgrade.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Java 17 Upgrade

- Waltz has been upgraded to run on Java 17, moving from Java 8.
- Developer Actions
- Please ensure your local development environment is configured to use JDK 17.
- Update your IDE settings (e.g., IntelliJ, Eclipse) to point to the JDK 17 installation.

## Framework Upgrade
- The web framework, Spark Java, has been upgraded from version 2.7.1 to 2.9.4.
- Developer Impact
- There are no immediate code changes required for developers. The upgrade is backward compatible with our existing usage.
- This change helps keep Waltz current and secure by using a more recent version of its core web framework.

## Key Changes
- See [pom.xml](https://github.com/finos/waltz/pull/7400/changes#diff-9c5fb3d1b7e3b0f54bc5c4182965c4fe1f9023d449017cece3005d3f90e8e4d8) for a full list of Java dependencies against Java & Sparx upgrade.


7 changes: 4 additions & 3 deletions docs/development/build.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Waltz is built using [Maven](https://maven.apache.org/).

- [Git](https://git-scm.com/)
- [Maven 3](https://maven.apache.org/)
- [JDK 8+](http://www.oracle.com/technetwork/java/javase/overview/index.html) (see note below)
- [JDK 17](http://www.oracle.com/technetwork/java/javase/overview/index.html) (see note below)
- [Node](https://nodejs.org/en/)
- [NPM](https://www.npmjs.com/) v6+
- [Sass](http://sass-lang.com/)
Expand All @@ -17,10 +17,11 @@ Waltz is built using [Maven](https://maven.apache.org/).
- [Postgres](https://www.postgresql.org/)
- [Liquibase](http://www.liquibase.org/) (recommended but not essential)
- [_jOOQ Pro_](https://www.jooq.org/download/) (if using Microsoft SQL Server)
- Tomcat 10


**Note**:
When developing on JDK 9+ please ensure all class imports are explicit.
When developing on JDK 17 please ensure all class imports are explicit.
This is to prevent collisions between `java.lang.Record` and `org.jooq.Record` which can cause compilation errors (see issue: [#6678](https://github.com/finos/waltz/issues/6678))


Expand All @@ -30,7 +31,7 @@ It is recommended that you clone the repository on GitHub to maintain your own f

## Preparing the database

For **Postgres** create a new daabase
For **Postgres** create a new database
```
create database waltz;
```
Expand Down
4 changes: 2 additions & 2 deletions waltz-web/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

## Pre Requisites

* Java 8
* Java 17
* Maven 3.5
* Tomcat 8 (optional)
* Tomcat 10

## Building

Expand Down
Loading