Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump GraphViz and PlantUML #1647

Merged
merged 2 commits into from
Sep 23, 2023
Merged
Show file tree
Hide file tree
Changes from all 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
6 changes: 3 additions & 3 deletions docs/antora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions server/ops/docker/jdk11-jammy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/io/kroki/server/service/Graphviz.java
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public SourceDecoder getSourceDecoder() {

@Override
public String getVersion() {
return "8.0.5";
return "9.0.0";
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/io/kroki/server/service/Plantuml.java
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ public SourceDecoder getSourceDecoder() {

@Override
public String getVersion() {
return "1.2023.10";
return "1.2023.11";
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion server/src/test/resources/aws.expected.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion server/src/test/resources/bigbank.containers.expected.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion server/src/test/resources/gettingstarted.expected.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.