Latest version of UMLet and PlantUML

Makefile

@@ -31,16 +31,16 @@ endif
 
 smokeTests:
 	TAG=smoketests docker buildx bake kroki companion-images --load --set "*.cache-from=$(CACHE_FROM)" --set "*.cache-to=$(CACHE_TO)"
-	@docker-compose --file "$(TESTS_DIR)/docker-compose.yaml" up --build --detach \
+	@docker compose --file "$(TESTS_DIR)/docker-compose.yaml" up --build --detach \
 	&& echo \
-	&& docker-compose --file "$(TESTS_DIR)/docker-compose.yaml" ps \
+	&& docker compose --file "$(TESTS_DIR)/docker-compose.yaml" ps \
 	&& echo \
 	&& "$(TESTS_DIR)/wait-for-it.sh" localhost:8000 --timeout="$(COMPOSE_TIMEOUT)" \
 	&& echo \
 	&& echo 'Waiting for the containers'\'' services to be available... ($(SERVICES_TIMEOUT) seconds)' \
 	&& sleep "$(SERVICES_TIMEOUT)" \
 	&& npm test \
-	&& docker-compose -f "$(TESTS_DIR)/docker-compose.yaml" stop
+	&& docker compose -f "$(TESTS_DIR)/docker-compose.yaml" stop
 
 installJavaScriptDependencies:
 	npm i --prefix bpmn

ci/tasks/update-versions.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
-import { promises as fs } from 'fs'
-import * as url from 'url'
-import ospath from 'path'
+import { promises as fs } from 'node:fs'
+import * as url from 'node:url'
+import ospath from 'node:path'
 import { createRequire } from 'node:module'
 import { spawn } from 'node:child_process'
 
@@ -172,7 +172,7 @@ try {
 
   const dockerfileContent = await fs.readFile(ospath.join(rootDir, 'server', 'ops', 'docker', 'jdk11-jammy', 'Dockerfile'), 'utf8')
   for (const line of dockerfileContent.split('\n')) {
-    const erdVersionFound = line.match(/^FROM yuzutech\/kroki-builder-erd:(?<version>\S+) as kroki-builder-static-erd$/)
+    const erdVersionFound = line.match(/^FROM yuzutech\/kroki-builder-erd:(?<version>\S+) AS kroki-builder-static-erd$/)
     if (erdVersionFound) {
       const { version } = erdVersionFound.groups
       diagramLibraryVersions.erd = version
@@ -182,10 +182,16 @@ try {
       const { version } = pikchrVersionFound.groups
       diagramLibraryVersions.pikchr = version.slice(0, 10)
     }
-    const umletVersionFound = line.match(/^ARG UMLET_VERSION=(?<version>.+)$/)
+    const umletVersionFound = line.match(/^ARG UMLET_VERSION="(?<version>.+)"$/)
     if (umletVersionFound) {
       const { version } = umletVersionFound.groups
-      diagramLibraryVersions.umlet = version.split('+')[0]
+      // format: YYYY-mm-dd_UMLet_v0.0
+      diagramLibraryVersions.umlet = version.split('_')[2].substring(1)
+    }
+    const plantumlVersionFound = line.match(/^ARG PLANTUML_VERSION="(?<version>.+)"$/)
+    if (plantumlVersionFound) {
+      const { version } = plantumlVersionFound.groups
+      diagramLibraryVersions.plantuml = version
     }
   }
 
@@ -207,9 +213,6 @@ try {
     }
   }
 
-  const { value: plantumlVersion } = await mvnEvaluateExpression('plantuml.version')
-  diagramLibraryVersions.plantuml = plantumlVersion
-
   const { value: structurizrVersion } = await mvnEvaluateExpression('structurizr-dsl.version')
   diagramLibraryVersions.structurizr = structurizrVersion
 

docs/antora.yml

@@ -6,28 +6,28 @@ asciidoc:
     actdiag-version: 3.0.0
     blockdiag-version: 3.0.0
     bpmn-version: 10.3.0
-    bytefield-version: 1.7.0
+    bytefield-version: 1.8.0
     c4plantuml-version: 1.2022.5
     d2-version: 0.1.5
     dbml-version: 1.0.26
     diagramsnet-version: 16.2.4
     ditaa-version: 1.0.3
     erd-version: 0.2.1.0
     excalidraw-version: 0.14.2
-    graphviz-version: 3.0.0
-    mermaid-version: 9.3.0
+    graphviz-version: 2.42.2
+    mermaid-version: 9.4.3
     nomnoml-version: 1.5.3
     nwdiag-version: 3.0.0
     packetdiag-version: 3.0.0
     pikchr-version: '7269f78c4a'
-    plantuml-version: 1.2022.14
+    plantuml-version: 1.2023.6
     rackdiag-version: 3.0.0
     seqdiag-version: 3.0.0
-    structurizr-version: 1.23.0
+    structurizr-version: 1.30.1
     svgbob-version: 0.6.0
-    umlet-version: 15.0.0
-    vega-version: 5.22.1
-    vegalite-version: 5.6.0
+    umlet-version: 15.1
+    vega-version: 5.24.0
+    vegalite-version: 5.7.0
     wavedrom-version: 2.9.1
     wireviz-version: 0.3.2
     uri-docker-get-started: https://docs.docker.com/get-started/

server/ops/docker/jdk11-jammy/Dockerfile

@@ -210,38 +210,12 @@ RUN SVGBOB_VERSION=`cat Cargo.toml | grep "svgbob_cli =" | sed -r 's/.*"([^"]+)"
 ## yuzutech/kroki
 FROM eclipse-temurin:11.0.18_10-jre-jammy
 
-ARG UMLET_VERSION="15.1"
-ARG PLANTUML_VERSION="1.2023.5"
+ARG UMLET_VERSION="2023-03-20_UMLet_v15.1"
+ARG PLANTUML_VERSION="1.2023.6"
 ARG TARGETARCH
 
 RUN addgroup --gecos 1000 kroki && adduser --disabled-password --ingroup kroki -u 1000 kroki
 
-COPY --from=kroki-builder-static-svgbob /usr/local/cargo/bin/svgbob /usr/bin/svgbob
-COPY --from=kroki-builder-static-erd /root/.local/bin/erd /usr/bin/erd
-COPY --from=kroki-builder-static-pikchr /build/pikchr /usr/bin/pikchr
-COPY --from=kroki-builder-nomnoml /app/app.bin /usr/bin/nomnoml
-COPY --from=kroki-builder-vega /app/app.bin /usr/bin/vega
-COPY --from=kroki-builder-dbml /app/app.bin /usr/bin/dbml
-COPY --from=kroki-builder-wavedrom /app/app.bin /usr/bin/wavedrom
-COPY --from=kroki-builder-bytefield /app/app.bin /usr/bin/bytefield
-COPY --from=kroki-builder-d2 /go/bin/d2 /usr/bin/d2
-COPY --from=kroki-builder-dvisvgm /usr/local/bin/dvisvgm /usr/bin/dvisvgm
-COPY --from=tikz tikz2svg /usr/bin/tikz2svg
-
-RUN apt-get update && apt-get install --no-install-recommends --yes \
-    libjpeg9 \
-    giflib-tools \
-    graphviz \
-    fonts-freefont-ttf \
-    fonts-noto-cjk && \
-    apt-get clean && apt-get autoremove
-
-RUN wget "https://github.com/yuzutech/umlet/releases/download/2023-03-20_UMLet_v${UMLET_VERSION}/umlet-linux-${TARGETARCH}" -O /usr/bin/umlet && \
-    chmod +x /usr/bin/umlet
-
-RUN wget "https://github.com/ggrossetie/plantuml/releases/download/v${PLANTUML_VERSION}/plantuml-linux-${TARGETARCH}-${PLANTUML_VERSION}" -O /usr/bin/plantuml && \
-    chmod +x /usr/bin/plantuml
-
 # For TikZ
 #
 # * ghostscript - Dynamically linked dependency required by dvisvgm
@@ -252,6 +226,11 @@ RUN wget "https://github.com/ggrossetie/plantuml/releases/download/v${PLANTUML_V
 # * texlive-pictures - Provides various graphics packages like "circuitikz"
 # * texlive-science - Provides various science packages like "siunitx"
 RUN apt-get update && apt-get install --no-install-recommends --yes \
+    libjpeg9 \
+    giflib-tools \
+    graphviz \
+    fonts-freefont-ttf \
+    fonts-noto-cjk \
     ghostscript \
     poppler-utils \
     texlive \
@@ -261,6 +240,24 @@ RUN apt-get update && apt-get install --no-install-recommends --yes \
     texlive-science && \
     apt-get clean && apt-get autoremove
 
+RUN wget "https://github.com/yuzutech/umlet/releases/download/${UMLET_VERSION}/umlet-linux-${TARGETARCH}" -O /usr/bin/umlet && \
+    chmod +x /usr/bin/umlet
+
+RUN wget "https://github.com/ggrossetie/plantuml/releases/download/v${PLANTUML_VERSION}/plantuml-linux-${TARGETARCH}-${PLANTUML_VERSION}" -O /usr/bin/plantuml && \
+    chmod +x /usr/bin/plantuml
+
+COPY --from=kroki-builder-static-svgbob /usr/local/cargo/bin/svgbob /usr/bin/svgbob
+COPY --from=kroki-builder-static-erd /root/.local/bin/erd /usr/bin/erd
+COPY --from=kroki-builder-static-pikchr /build/pikchr /usr/bin/pikchr
+COPY --from=kroki-builder-nomnoml /app/app.bin /usr/bin/nomnoml
+COPY --from=kroki-builder-vega /app/app.bin /usr/bin/vega
+COPY --from=kroki-builder-dbml /app/app.bin /usr/bin/dbml
+COPY --from=kroki-builder-wavedrom /app/app.bin /usr/bin/wavedrom
+COPY --from=kroki-builder-bytefield /app/app.bin /usr/bin/bytefield
+COPY --from=kroki-builder-d2 /go/bin/d2 /usr/bin/d2
+COPY --from=kroki-builder-dvisvgm /usr/local/bin/dvisvgm /usr/bin/dvisvgm
+COPY --from=tikz tikz2svg /usr/bin/tikz2svg
+
 COPY --chown=kroki:kroki ops/docker/logback.xml /etc/kroki/logback.xml
 
 ENV KROKI_CONTAINER_SUPPORT=""

server/src/main/java/io/kroki/server/service/Bytefield.java

@@ -47,7 +47,7 @@ public SourceDecoder getSourceDecoder() {
 
   @Override
   public String getVersion() {
-    return "1.7.0";
+    return "1.8.0";
   }
 
   @Override

server/src/main/java/io/kroki/server/service/Graphviz.java

@@ -49,7 +49,7 @@ public SourceDecoder getSourceDecoder() {
 
   @Override
   public String getVersion() {
-    return "3.0.0";
+    return "2.42.2";
   }
 
   @Override

server/src/main/java/io/kroki/server/service/Mermaid.java

@@ -49,7 +49,7 @@ public SourceDecoder getSourceDecoder() {
 
   @Override
   public String getVersion() {
-    return "9.3.0";
+    return "9.4.3";
   }
 
   @Override

server/src/main/java/io/kroki/server/service/Structurizr.java

@@ -83,7 +83,7 @@ public SourceDecoder getSourceDecoder() {
 
   @Override
   public String getVersion() {
-    return "1.23.0";
+    return "1.30.1";
   }
 
   @Override

server/src/main/java/io/kroki/server/service/Umlet.java

@@ -50,7 +50,7 @@ public SourceDecoder getSourceDecoder() {
 
   @Override
   public String getVersion() {
-    return "15.0.0";
+    return "15.1"";
   }
 
   @Override

server/src/main/java/io/kroki/server/service/Vega.java

@@ -53,9 +53,9 @@ public SourceDecoder getSourceDecoder() {
   @Override
   public String getVersion() {
     if (specFormat == SpecFormat.DEFAULT) {
-      return "5.22.1";
+      return "5.24.0";
     } else {
-      return "5.6.0"; // Vega Lite
+      return "5.7.0"; // Vega Lite
     }
   }