#6894 Java 17, Tomcat 10 plus other bits

.github/workflows/maven.yml

@@ -12,7 +12,7 @@ jobs:
 
     services:
       postgres:
-        image: postgres:15
+        image: postgres:16
         env:
           POSTGRES_USER: postgres
           POSTGRES_DB: waltz
@@ -29,7 +29,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Set up JDK 17
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         java-version: '17'
         distribution: 'temurin'
@@ -54,6 +54,12 @@ jobs:
         name: waltz-web-postgres.war
         path: waltz-web/target/waltz-web.war
 
+    - name: Publish build jakarta
+      uses: actions/upload-artifact@v4
+      with:
+        name: waltz-web-jakarta-postgres.war
+        path: waltz-web/target/waltz-web-jakarta.war
+
     - name: Publish mocha results
       uses: actions/upload-artifact@v4
       with:
@@ -105,5 +111,5 @@ jobs:
       with:
         files: |
           waltz-schema/target/liquibase-scripts.zip
-          waltz-web/target/waltz-web.war
+          waltz-web/target/waltz-web-jakarta.war
           waltz-web/target/waltz-web-jar-with-dependencies.jar

CONTRIBUTORS.md

@@ -4,13 +4,14 @@
 
 The following table list the people and/or organisations involved with Waltz
 
-| Name | Type |
-| --- | --- |
-| [David Watkins](https://github.com/davidwatkins73) | individual |
-| [Deutsche Bank](https://github.com/db-waltz) | organisational |
-| [Kamran Saleem](https://github.com/kamransaleem) | individual |
-| [Rohit Vats](https://github.com/rovats) | individual |
+| Name                                                         | Type |
+|--------------------------------------------------------------| --- |
+| [David Watkins](https://github.com/davidwatkins73)           | individual |
+| [Deutsche Bank](https://github.com/db-waltz)                 | organisational |
+| [Kamran Saleem](https://github.com/kamransaleem)             | individual |
+| [Rohit Vats](https://github.com/rovats)                      | individual |
 | [Jessica Woodland-Scott](https://github.com/JWoodland-Scott) | individual |
+| [HMx Labs](https://github.com/hmxlabs/waltz)                      | organisational |
 
 
 ### Libraries

Dockerfile

@@ -4,7 +4,8 @@ ENV PATH="/usr/local/bin/liquibase:${PATH}"
 
 COPY docker/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
 COPY ./waltz-schema/src/main/resources/liquibase/*.xml /opt/waltz/liquibase/
-COPY ./waltz-web/target/waltz-web.war /usr/local/tomcat/webapps/ROOT.war
+#COPY ./waltz-web/target/waltz-web.war /usr/local/tomcat/webapps/ROOT.war
+COPY ./waltz-web/target/waltz-web-jakarta.war /usr/local/tomcat/webapps/ROOT.war
 COPY docker/waltz.properties /home/waltz/.waltz/waltz-template
 COPY waltz-web/src/main/resources/logback.example.xml /home/waltz/.waltz/waltz-logback.xml
 
@@ -20,6 +21,10 @@ RUN useradd -ms /bin/bash waltz && \
   rm -rf /var/lib/apt/lists/* lpm-0.1.2-linux.zip liquibase-4.5.0.zip && \
   lpm update && lpm add -g postgresql
 
+RUN apt-get update && apt-get install -y dos2unix
+RUN dos2unix /usr/local/bin/docker-entrypoint.sh
+RUN chmod +x /usr/local/bin/docker-entrypoint.sh
+
 EXPOSE 8080
 
 USER waltz

README.md

@@ -33,8 +33,8 @@ Getting started
 
 ### Server
 
-- Java 8
-- Embedded Jetty or WAR file (tested on Tomcat 7/8)
+- Java 17
+- Embedded Jetty or WAR file (tested on Tomcat 9/10)
 - Spark framework
 - JDBC via JOOQ
 

docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.9"
-
 services:
   waltz:
     image: ghcr.io/finos/waltz:latest

pom.xml

@@ -78,7 +78,7 @@
         <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
 
         <annotation-api.version>1.3.2</annotation-api.version>
-        <archunit.version>1.0.1</archunit.version>
+        <archunit.version>1.4.1</archunit.version>
         <freemarker.version>2.3.32</freemarker.version>
         <h2.version>2.2.220</h2.version>
         <hikari.version>3.4.5</hikari.version>

waltz-jobs/pom.xml

@@ -54,9 +54,9 @@
         </dependency>
 
         <dependency>
-            <groupId>io.codearte.jfairy</groupId>
+            <groupId>com.devskiller</groupId>
             <artifactId>jfairy</artifactId>
-            <version>0.5.9</version>
+            <version>0.6.5</version>
         </dependency>
 
         <dependency>

waltz-jobs/src/main/java/org/finos/waltz/jobs/generators/PersonDataGenerator.java

@@ -18,8 +18,8 @@
 
 package org.finos.waltz.jobs.generators;
 
-import io.codearte.jfairy.Fairy;
-import io.codearte.jfairy.producer.person.Person;
+import com.devskiller.jfairy.Fairy;
+import com.devskiller.jfairy.producer.person.Person;
 import org.finos.waltz.common.MapUtilities;
 import org.finos.waltz.common.RandomUtilities;
 import org.finos.waltz.model.person.ImmutablePerson;

waltz-jobs/src/main/java/org/finos/waltz/jobs/tools/DataScrambler.java

@@ -1,7 +1,7 @@
 package org.finos.waltz.jobs.tools;
 
-import io.codearte.jfairy.Fairy;
-import io.codearte.jfairy.producer.person.Person;
+import com.devskiller.jfairy.Fairy;
+import com.devskiller.jfairy.producer.person.Person;
 import org.finos.waltz.common.IOUtilities;
 import org.finos.waltz.schema.tables.records.ApplicationRecord;
 import org.finos.waltz.schema.tables.records.ChangeInitiativeRecord;

waltz-web/pom.xml

@@ -46,19 +46,11 @@
             <exclusions>
                 <exclusion>
                     <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-util</artifactId>
+                    <artifactId>*</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-io</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-webapp</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-server</artifactId>
+                    <groupId>org.eclipse.jetty.websocket</groupId>
+                    <artifactId>*</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -283,6 +275,42 @@
                     </execution>
                 </executions>
             </plugin>
+            <!-- AntRun to execute the Jakarta migration Ant task -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>3.1.0</version>
+                <executions>
+                    <execution>
+                        <id>jakarta-migration</id>
+                        <phase>package</phase>
+                        <configuration>
+                            <target>
+                                <!-- Define the migration task -->
+                                <taskdef name="jakarta-migration"
+                                         classname="org.apache.tomcat.jakartaee.MigrationTask"
+                                         classpathref="maven.plugin.classpath"/>
+
+                                <!-- Run the migration on the WAR output -->
+                                <jakarta-migration
+                                        src="${project.build.directory}${file.separator}${project.build.finalName}.war"
+                                        dest="${project.build.directory}${file.separator}${project.build.finalName}-jakarta.war"/>
+                            </target>
+                        </configuration>
+                        <goals>
+
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.tomcat</groupId>
+                        <artifactId>jakartaee-migration</artifactId>
+                        <version>1.0.9</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>