Bump GraphViz and PlantUML (#1647)

resolves #1636
yuzutech · Sep 23, 2023 · bfd3587 · bfd3587
1 parent 2130ff8
commit bfd3587
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 13 deletions.
diff --git a/docs/antora.yml b/docs/antora.yml
@@ -7,20 +7,20 @@ asciidoc:
     blockdiag-version: 3.1.0
     bpmn-version: 14.0.0
     bytefield-version: 1.8.0
-    c4plantuml-version: 1.2023.10
+    c4plantuml-version: 1.2023.11
     d2-version: 0.6.0
     dbml-version: 1.0.27
     diagramsnet-version: 16.2.4
     ditaa-version: 1.0.3
     erd-version: 0.2.1.0
     excalidraw-version: 0.15.3
-    graphviz-version: 8.0.5
+    graphviz-version: 9.0.0
     mermaid-version: 10.4.0
     nomnoml-version: 1.6.2
     nwdiag-version: 3.1.0
     packetdiag-version: 3.1.0
     pikchr-version: '7269f78c4a'
-    plantuml-version: 1.2023.10
+    plantuml-version: 1.2023.11
     rackdiag-version: 3.1.0
     seqdiag-version: 3.1.0
     structurizr-version: 1.32.0

diff --git a/server/ops/docker/jdk11-jammy/Dockerfile b/server/ops/docker/jdk11-jammy/Dockerfile
@@ -235,9 +235,9 @@ RUN SVGBOB_VERSION=`cat Cargo.toml | grep "svgbob_cli =" | sed -r 's/.*"([^"]+)"
 FROM eclipse-temurin:11.0.19_7-jre-jammy
 
 ARG D2_VERSION="0.6.0"
-ARG PLANTUML_VERSION="1.2023.10"
+ARG PLANTUML_VERSION="1.2023.11"
 ARG UMLET_VERSION="2023-03-20_UMLet_v15.1"
-ARG GRAPHVIZ_VERSION="8.0.5"
+ARG GRAPHVIZ_VERSION="9.0.0"
 ARG DITAA_VERSION="1.0.3"
 ARG BLOCKDIAG_VERSION="3.1.0"
 ARG WIREVIZ_VERSION="0.3.3"

diff --git a/server/src/main/java/io/kroki/server/service/Graphviz.java b/server/src/main/java/io/kroki/server/service/Graphviz.java
@@ -49,7 +49,7 @@ public SourceDecoder getSourceDecoder() {
 
   @Override
   public String getVersion() {
-    return "8.0.5";
+    return "9.0.0";
   }
 
   @Override

diff --git a/server/src/main/java/io/kroki/server/service/Plantuml.java b/server/src/main/java/io/kroki/server/service/Plantuml.java
@@ -184,7 +184,7 @@ public SourceDecoder getSourceDecoder() {
 
   @Override
   public String getVersion() {
-    return "1.2023.10";
+    return "1.2023.11";
   }
 
   @Override

diff --git a/server/src/test/java/io/kroki/server/service/PlantumlServiceTest.java b/server/src/test/java/io/kroki/server/service/PlantumlServiceTest.java
@@ -702,8 +702,6 @@ void should_include_awslib() throws IOException, InterruptedException {
   void should_include_openiconic() throws IOException, InterruptedException {
     String diagram = "listopeniconic";
     byte[] convert = plantumlCommand.convert(diagram, FileFormat.SVG, new JsonObject());
-    System.out.println(new String(convert));
-    Pattern pattern = Pattern.compile("<path d=");
     String output = new String(convert);
     int countOccurrences= (output.length() - output.replace("<path d=\"", "").length()) / "<path d=\"".length();
     assertThat(countOccurrences).isEqualTo(223); // 223 icons

diff --git a/server/src/test/resources/aws.expected.svg b/server/src/test/resources/aws.expected.svg
diff --git a/server/src/test/resources/bigbank.containers.expected.svg b/server/src/test/resources/bigbank.containers.expected.svg
diff --git a/server/src/test/resources/bigbank.systemcontext.expected.svg b/server/src/test/resources/bigbank.systemcontext.expected.svg
diff --git a/server/src/test/resources/gettingstarted.expected.svg b/server/src/test/resources/gettingstarted.expected.svg