From 9678a5d2cd1499e5d27cd5d371ba32f91a5fcd5b Mon Sep 17 00:00:00 2001
From: Sjoerd Talsma <sjoerdtalsma@users.noreply.github.com>
Date: Mon, 19 Feb 2024 12:28:13 +0100
Subject: [PATCH] Replace PlantUML Version.versionString() by `%version()` in
 diagrams. (#549)

Signed-off-by: Sjoerd Talsma <sjoerdtalsma@users.noreply.github.com>
---
 src/main/java/nl/talsmasoftware/umldoclet/UMLDoclet.java   | 3 +--
 src/main/java/nl/talsmasoftware/umldoclet/uml/Diagram.java | 7 ++-----
 .../java/nl/talsmasoftware/umldoclet/uml/DiagramTest.java  | 7 +++----
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/main/java/nl/talsmasoftware/umldoclet/UMLDoclet.java b/src/main/java/nl/talsmasoftware/umldoclet/UMLDoclet.java
index 258480614..8f9acc40a 100644
--- a/src/main/java/nl/talsmasoftware/umldoclet/UMLDoclet.java
+++ b/src/main/java/nl/talsmasoftware/umldoclet/UMLDoclet.java
@@ -18,7 +18,6 @@
 import jdk.javadoc.doclet.DocletEnvironment;
 import jdk.javadoc.doclet.Reporter;
 import jdk.javadoc.doclet.StandardDoclet;
-import net.sourceforge.plantuml.version.Version;
 import nl.talsmasoftware.umldoclet.html.HtmlPostprocessor;
 import nl.talsmasoftware.umldoclet.javadoc.DocletConfig;
 import nl.talsmasoftware.umldoclet.javadoc.UMLFactory;
@@ -117,7 +116,7 @@ public Set<Option> getSupportedOptions() {
     @Override
     public boolean run(DocletEnvironment environment) {
         config.logger().info(DOCLET_COPYRIGHT, DOCLET_VERSION);
-        config.logger().info(PLANTUML_COPYRIGHT, Version.versionString());
+        config.logger().info(PLANTUML_COPYRIGHT);
 
         // First generate Standard HTML documentation
 
diff --git a/src/main/java/nl/talsmasoftware/umldoclet/uml/Diagram.java b/src/main/java/nl/talsmasoftware/umldoclet/uml/Diagram.java
index 35101a7a4..723c22a3d 100644
--- a/src/main/java/nl/talsmasoftware/umldoclet/uml/Diagram.java
+++ b/src/main/java/nl/talsmasoftware/umldoclet/uml/Diagram.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Talsma ICT
+ * Copyright 2016-2024 Talsma ICT
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -78,10 +78,7 @@ protected <IPW extends IndentingPrintWriter> IPW writeCustomDirectives(List<Stri
 
     private <IPW extends IndentingPrintWriter> IPW writeFooterTo(IPW output) {
         output.append("center footer").whitespace()
-                .append(config.logger().localize(
-                        Message.DOCLET_UML_FOOTER,
-                        Message.DOCLET_VERSION,
-                        net.sourceforge.plantuml.version.Version.versionString()))
+                .append(config.logger().localize(Message.DOCLET_UML_FOOTER, Message.DOCLET_VERSION))
                 .newline();
         return output;
     }
diff --git a/src/test/java/nl/talsmasoftware/umldoclet/uml/DiagramTest.java b/src/test/java/nl/talsmasoftware/umldoclet/uml/DiagramTest.java
index 94643b1b9..18050a63f 100644
--- a/src/test/java/nl/talsmasoftware/umldoclet/uml/DiagramTest.java
+++ b/src/test/java/nl/talsmasoftware/umldoclet/uml/DiagramTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 Talsma ICT
+ * Copyright 2016-2024 Talsma ICT
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  */
 package nl.talsmasoftware.umldoclet.uml;
 
-import net.sourceforge.plantuml.version.Version;
 import nl.talsmasoftware.umldoclet.configuration.Configuration;
 import nl.talsmasoftware.umldoclet.configuration.ImageConfig;
 import nl.talsmasoftware.umldoclet.logging.Message;
@@ -116,7 +115,7 @@ public void testCustomDirective() {
         StringWriter output = new StringWriter();
         Diagram testDiagram = new TestDiagram(config, new File("target/test-classes/custom-directive.puml"));
         IndentingPrintWriter writer = IndentingPrintWriter.wrap(output, Indentation.NONE);
-        String footer = logger.localize(Message.DOCLET_UML_FOOTER, Message.DOCLET_VERSION, Version.versionString());
+        String footer = logger.localize(Message.DOCLET_UML_FOOTER, Message.DOCLET_VERSION);
 
         // execute
         testDiagram.writeTo(writer);
@@ -138,7 +137,7 @@ public void testCustomBackgroundcolor() {
         StringWriter output = new StringWriter();
         Diagram testDiagram = new TestDiagram(config, new File("target/test-classes/custom-directive.puml"));
         IndentingPrintWriter writer = IndentingPrintWriter.wrap(output, Indentation.NONE);
-        String footer = logger.localize(Message.DOCLET_UML_FOOTER, Message.DOCLET_VERSION, Version.versionString());
+        String footer = logger.localize(Message.DOCLET_UML_FOOTER, Message.DOCLET_VERSION);
 
         // execute
         testDiagram.writeTo(writer);