[pull] master from plantuml:master

.github/labeler.yml

@@ -1,37 +1,55 @@
 'm:release':
-- 'CHANGELOG.md'
-- 'gradle.properties'
+- changed-files:
+  - any-glob-to-any-file:
+    - 'CHANGELOG.md'
+    - 'gradle.properties'
 
 'm:docs':
-- '*.md'
-- 'docs/**/*'
+- changed-files:
+  - any-glob-to-any-file:
+    - '*.md'
+    - 'docs/**/*'
 
 'm:workflow':
-- .github/**
+- changed-files:
+  - any-glob-to-any-file:
+    - .github/**
 
 'm:gradle':
-- 'gradle*'
-- 'gradle/**'
-- '**/settings.gradle.*'
-- '**/build.gradle.*'
-- 'sjpp.jar'
+- changed-files:
+  - any-glob-to-any-file:
+    - 'gradle*'
+    - 'gradle/**'
+    - '**/settings.gradle.*'
+    - '**/build.gradle.*'
+    - 'sjpp.jar'
 
 'm:source':
-- 'skin/**/*'
-- 'src/**/*'
-- 'stdlib/**/*'
-- 'svg/**/*'
-- 'themes/**/*'
-- 'manifest.txt'
+- changed-files:
+  - any-glob-to-any-file:
+    - 'skin/**/*'
+    - 'src/**/*'
+    - 'stdlib/**/*'
+    - 'svg/**/*'
+    - 'themes/**/*'
+    - 'manifest.txt'
 
 'm:test':
-- 'test/**/*'
+- changed-files:
+  - any-glob-to-any-file:
+    - 'test/**/*'
 
 'm:license':
-- '**/*license.txt'
+- changed-files:
+  - any-glob-to-any-file:
+    - '**/*license.txt'
 
 'm:docker':
-- Dockerfile
+- changed-files:
+  - any-glob-to-any-file:
+    - Dockerfile
 
 'm:native':
-- .github/workflows/native-image.yml
+- changed-files:
+  - any-glob-to-any-file:
+    - .github/workflows/native-image.yml

.github/workflows/ci.yml

@@ -99,7 +99,7 @@ jobs:
 
       - name: Set up java
         if: needs.workflow_config.outputs.do_test_linux == 'true'
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java_version }}
           distribution: temurin
@@ -115,7 +115,7 @@ jobs:
         run: gradle test --no-daemon -i
 
       - name: Upload test reports
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: needs.workflow_config.outputs.do_test_linux == 'true'
         with:
           # Using github.run_number here to reduce confusion when downloading & comparing from several builds
@@ -132,7 +132,7 @@ jobs:
       - name: Checkout the repository
         uses: actions/checkout@v4
       - name: Set up java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: temurin
@@ -172,7 +172,7 @@ jobs:
         run: |
           echo "release_version=$(gradle properties -q | grep "version:" | awk '{print $2}')" >> $GITHUB_OUTPUT
       - name: Cache libs
-        uses: actions/cache/save@v3
+        uses: actions/cache/save@v4
         with:
           path: |
             build/libs
@@ -195,7 +195,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: temurin
@@ -221,14 +221,14 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: temurin
           cache: gradle
 
       - name: Restore Libs cache
-        uses: actions/cache/restore@v3
+        uses: actions/cache/restore@v4
         with:
           path: |
             build/libs
@@ -244,7 +244,7 @@ jobs:
           enableCrossOsArchive: true
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           # Using github.run_number here to reduce confusion when downloading & comparing artifacts from several builds
           name: ${{ github.run_number }}-artifacts

.github/workflows/labeler.yml

@@ -9,4 +9,4 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@v4
+    - uses: actions/labeler@v5

.github/workflows/native-image.yml

@@ -32,7 +32,7 @@ jobs:
           components: 'native-image'
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: actions/cache/restore@v3
+      - uses: actions/cache/restore@v4
         with:
           path: |
             build/libs
@@ -57,7 +57,7 @@ jobs:
           native-image -H:ConfigurationFileDirectories=native-image-config-dir --no-fallback --report-unsupported-elements-at-runtime -jar "build/libs/plantuml-${{ inputs.release-version }}.jar" -H:Path="build/libs" -H:Name="plantuml-${{ matrix.platform }}-${{ inputs.release-version }}"
 
       - name: Cache native image
-        uses: actions/cache/save@v3
+        uses: actions/cache/save@v4
         with:
           path: "build/libs/plantuml-${{ matrix.platform }}-*"
           key: "native-image-${{ matrix.platform }}-${{ github.run_id }}"

BUILDING.md

@@ -2,7 +2,7 @@
 
 Thank you for your interest in contributing to PlantUML! This guide will help you build the PlantUML project.
 
-PlantUML can be built using either [Gradle](#building-plantuml-with-gradle) or [Ant](#building-plantuml-with-ant-alternative-method). It's recommended to use Gradle as the primary build tool for this project. You will find instructions for both methods, starting with Gradle.
+PlantUML can be built using either [Gradle](#-building-plantuml-with-gradle) or [Ant](#-building-plantuml-with-ant-alternative-method). It's recommended to use Gradle as the primary build tool for this project. You will find instructions for both methods, starting with Gradle.
 
 ## ☕ Java Compatibility and Development Notes
 

README.md

@@ -56,6 +56,7 @@ PlantUML is a component that allows you to create various UML diagrams through s
   - [SDL (Specification and Description Language)](http://plantuml.com/activity-diagram-beta#sdl)
   - [Ditaa diagram](http://plantuml.com/ditaa)
   - [Gantt diagram](http://plantuml.com/gantt-diagram)
+  - [Chronology diagram](http://plantuml.com/chronology-diagram)
   - [MindMap diagram](http://plantuml.com/mindmap-diagram)
   - [WBS (Work Breakdown Structure)](http://plantuml.com/wbs-diagram)
   - [Mathematical Notations (AsciiMath, JLaTeXMath)](http://plantuml.com/ascii-math)

build.gradle.kts

@@ -31,8 +31,9 @@ dependencies {
 	compileOnly("org.apache.ant:ant:1.10.14")
 
 	testImplementation("io.github.glytching:junit-extensions:2.6.0")
-	testImplementation("org.assertj:assertj-core:3.24.2")
-	testImplementation("org.junit.jupiter:junit-jupiter:5.10.1")
+	testImplementation("org.assertj:assertj-core:3.25.3")
+	testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
+	testImplementation("org.xmlunit:xmlunit-core:2.9.+")
 	if (JavaVersion.current().isJava8) {
 		testImplementation("org.mockito:mockito-core:4.+")
 		testImplementation("org.mockito:mockito-junit-jupiter:4.+")

docs/PACKAGE_AND_DISTRIBUTION.md

@@ -0,0 +1,97 @@
+# PlantUML packages and PlantUML on the _[most popular]_ GNU/Linux distributions
+
+## PlantUML packages
+
+### GitHub _(The main PlantUML package repository)_
+[![GitHub Release](https://img.shields.io/github/v/release/plantuml/plantuml)](https://github.com/plantuml/plantuml/releases/latest)
+
+### Chocolatey
+[![Chocolatey Version](https://img.shields.io/chocolatey/v/plantuml)](https://community.chocolatey.org/packages/plantuml)
+
+### Docker
+[![Docker Image Version](https://img.shields.io/docker/v/plantuml/plantuml)](https://github.com/plantuml/plantuml/pkgs/container/plantuml)
+
+### Homebrew
+[![homebrew version](https://img.shields.io/homebrew/v/plantuml)](https://formulae.brew.sh/formula/plantuml)
+
+### Maven
+[![Maven Central Version](https://img.shields.io/maven-central/v/net.sourceforge.plantuml/plantuml)](https://mvnrepository.com/artifact/net.sourceforge.plantuml/plantuml)
+
+### Scoop 
+[![Scoop Version](https://img.shields.io/scoop/v/plantuml?bucket=extras)](https://scoop.sh/#/apps?q=plantuml)
+
+
+
+## PlantUML on the _[most popular]_ GNU/Linux distributions
+
+### [Alpine Linux](https://www.alpinelinux.org)
+|  Type   | Link |
+| ------- | ---- |
+| Distribution           | ![Alpine Linux](https://img.shields.io/badge/Alpine_Linux-%230D597F.svg?style=for-the-badge&logo=alpine-linux&logoColor=white) |
+| Last PlantUML version  |  |
+| Link                   | https://pkgs.alpinelinux.org/packages?name=plantuml&branch=edge |
+| Specificity            |  |
+
+###  [Archlinux](https://archlinux.org)
+|  Type   | Link |
+| ------- | ---- |
+| Distribution           |  ![Arch](https://img.shields.io/badge/Arch%20Linux-1793D1?logo=arch-linux&logoColor=fff&style=for-the-badge)  |
+| Last PlantUML version  |  [![Arch Linux package](https://img.shields.io/archlinux/v/extra/any/plantuml)](https://archlinux.org/packages/extra/any/plantuml/)  |
+| Link                   | https://archlinux.org/packages/extra/any/plantuml/  |
+| Specificity            |  |
+
+### [Debian](https://www.debian.org)
+|  Type   | Link |
+| ------- | ---- |
+| Distribution          | ![Debian](https://img.shields.io/badge/Debian-D70A53?style=for-the-badge&logo=debian&logoColor=white) |
+| Last PlantUML version | [![Debian package](https://img.shields.io/debian/v/plantuml)](https://salsa.debian.org/debian/plantuml)  |
+| Link                  | https://salsa.debian.org/debian/plantuml  |
+| Specificity           |  https://salsa.debian.org/debian/plantuml/-/tree/master/debian |
+
+### [Fedora](https://fedoraproject.org)
+|  Type   | Link |
+| ------- | ---- |
+| Distribution           |  ![Fedora](https://img.shields.io/badge/Fedora-294172?style=for-the-badge&logo=fedora&logoColor=white)  |
+| Last PlantUML version  |  [![Fedora package](https://img.shields.io/fedora/v/plantuml)](https://src.fedoraproject.org/rpms/plantuml)  |
+| Link                   |  https://src.fedoraproject.org/rpms/plantuml |
+| Specificity            |  |
+
+### [Gentoo](https://www.gentoo.org/)
+|  Type   | Link |
+| ------- | ---- |
+| Distribution           | ![Gentoo](https://img.shields.io/badge/Gentoo-54487A?style=for-the-badge&logo=gentoo&logoColor=white) |
+| Last PlantUML version  |  |
+| Link                   |  https://packages.gentoo.org/packages/media-gfx/plantuml |
+| Specificity            |  |
+
+### [openSUSE](https://www.opensuse.org)
+|  Type   | Link |
+| ------- | ---- |
+| Distribution           | ![openSUSE](https://img.shields.io/badge/openSUSE-%2364B345?style=for-the-badge&logo=openSUSE&logoColor=white) |
+| Last PlantUML version  |  |
+| Link                   | https://build.opensuse.org/search?search_text=plantuml |
+| Specificity            | https://build.opensuse.org/package/show/Java:packages/plantuml <br> https://build.opensuse.org/package/show/home:mnhauke/plantuml |
+
+### [SUSE](https://www.suse.com)
+|  Type   | Link |
+| ------- | ---- |
+| Distribution           | ![Suse](https://img.shields.io/badge/SUSE-0C322C?style=for-the-badge&logo=SUSE&logoColor=white)  |
+| Last PlantUML version  |  |
+| Link                   | https://packagehub.suse.com/packages/plantuml/ |
+| Specificity            |  |
+
+### [Ubuntu](https://ubuntu.com)
+|  Type   | Link |
+| ------- | ---- |
+| Distribution           |  ![Ubuntu](https://img.shields.io/badge/Ubuntu-E95420?style=for-the-badge&logo=ubuntu&logoColor=white)  |
+| Last PlantUML version  |  [![Ubuntu Package Version](https://img.shields.io/ubuntu/v/plantuml)](https://packages.ubuntu.com/search?keywords=plantuml&searchon=names&suite=all&section=all)  |
+| Link                   | https://packages.ubuntu.com/search?keywords=plantuml&searchon=names&suite=all&section=all  |
+| Specificity            |  |
+
+
+# Reference and acknowledgement
+- https://en.wikipedia.org/wiki/List_of_software_package_management_systems
+- https://en.wikipedia.org/wiki/List_of_Linux_distributions
+- https://docs.github.com/en/communities/setting-up-your-project-for-healthy-contributions/creating-a-default-community-health-file
+- https://shields.io
+

gradle.properties

@@ -1,4 +1,4 @@
 # Warning, "version" should be the same in gradle.properties and Version.java
 # Any idea anyone how to magically synchronize those :-) ?
-version = 1.2023.13beta3
+version = 1.2024.4beta1
 org.gradle.workers.max = 3

plantuml-asl/build.gradle.kts

@@ -25,9 +25,10 @@ java {
 
 dependencies {
 	compileOnly("org.apache.ant:ant:1.10.14")
-	testImplementation("org.assertj:assertj-core:3.24.2")
-	testImplementation("org.junit.jupiter:junit-jupiter:5.10.1")
+	testImplementation("org.assertj:assertj-core:3.25.3")
+	testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
 	testImplementation("org.scilab.forge:jlatexmath:1.0.7")
+	testImplementation("org.xmlunit:xmlunit-core:2.9.+")
 }
 
 repositories {

plantuml-bsd/build.gradle.kts

@@ -25,8 +25,8 @@ java {
 
 dependencies {
 	compileOnly("org.apache.ant:ant:1.10.14")
-	testImplementation("org.assertj:assertj-core:3.24.2")
-	testImplementation("org.junit.jupiter:junit-jupiter:5.10.1")
+	testImplementation("org.assertj:assertj-core:3.25.3")
+	testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
 	testImplementation("org.scilab.forge:jlatexmath:1.0.7")
 }
 

plantuml-epl/build.gradle.kts

@@ -25,9 +25,10 @@ java {
 
 dependencies {
 	compileOnly("org.apache.ant:ant:1.10.14")
-	testImplementation("org.assertj:assertj-core:3.24.2")
-	testImplementation("org.junit.jupiter:junit-jupiter:5.10.1")
+	testImplementation("org.assertj:assertj-core:3.25.3")
+	testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
 	testImplementation("org.scilab.forge:jlatexmath:1.0.7")
+	testImplementation("org.xmlunit:xmlunit-core:2.9.+")
 }
 
 repositories {

plantuml-gplv2/build.gradle.kts

@@ -25,9 +25,10 @@ java {
 
 dependencies {
 	compileOnly("org.apache.ant:ant:1.10.14")
-	testImplementation("org.assertj:assertj-core:3.24.2")
-	testImplementation("org.junit.jupiter:junit-jupiter:5.10.1")
+	testImplementation("org.assertj:assertj-core:3.25.3")
+	testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
 	testImplementation("org.scilab.forge:jlatexmath:1.0.7")
+	testImplementation("org.xmlunit:xmlunit-core:2.9.+")
 }
 
 repositories {

plantuml-lgpl/build.gradle.kts

@@ -25,9 +25,10 @@ java {
 
 dependencies {
 	compileOnly("org.apache.ant:ant:1.10.14")
-	testImplementation("org.assertj:assertj-core:3.24.2")
-	testImplementation("org.junit.jupiter:junit-jupiter:5.10.1")
+	testImplementation("org.assertj:assertj-core:3.25.3")
+	testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
 	testImplementation("org.scilab.forge:jlatexmath:1.0.7")
+	testImplementation("org.xmlunit:xmlunit-core:2.9.+")
 }
 
 repositories {

plantuml-mit/build.gradle.kts

@@ -25,9 +25,10 @@ java {
 
 dependencies {
 	compileOnly("org.apache.ant:ant:1.10.14")
-	testImplementation("org.assertj:assertj-core:3.24.2")
-	testImplementation("org.junit.jupiter:junit-jupiter:5.10.1")
+	testImplementation("org.assertj:assertj-core:3.25.3")
+	testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
 	testImplementation("org.scilab.forge:jlatexmath:1.0.7")
+	testImplementation("org.xmlunit:xmlunit-core:2.9.+")
 }
 
 repositories {

src/com/plantuml/api/cheerpj/v1/DirectDraw.java

@@ -53,6 +53,7 @@
 import net.sourceforge.plantuml.BlockUmlBuilder;
 import net.sourceforge.plantuml.ErrorUml;
 import net.sourceforge.plantuml.FileFormat;
+import net.sourceforge.plantuml.FileFormatOption;
 import net.sourceforge.plantuml.core.Diagram;
 import net.sourceforge.plantuml.error.PSystemError;
 import net.sourceforge.plantuml.klimt.color.ColorMapper;
@@ -122,7 +123,7 @@ public static Object draw(String mode, String text) {
 			ug.apply(back).apply(back.bg()).draw(URectangle.build(frameWidth, frameHeight));
 			WasmLog.log("...drawing...");
 
-			system.exportDiagramGraphic(ug);
+			system.exportDiagramGraphic(ug, new FileFormatOption(FileFormat.PNG));
 
 			WasmLog.log("done!");