feat: upgrade the PlantUML version to 1.2021.15

tmorin · Dec 3, 2021 · 7985feb · 7985feb
1 parent 31dbf06
commit 7985feb
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/src/cmd/diagram/generate/mod.rs b/src/cmd/diagram/generate/mod.rs
@@ -148,7 +148,7 @@ mod test {
             "generate",
             "-s=target/tests/cmd/diagram/generate/source",
             "-C=target/tests/cmd/diagram/generate/cache",
-            "-P=test/plantuml-1.2021.3.jar",
+            "-P=test/plantuml-1.2021.15.jar",
         ]);
         execute_diagram_generate(
             &arg_matches

diff --git a/src/cmd/library/generate/generator.rs b/src/cmd/library/generate/generator.rs
@@ -141,7 +141,7 @@ mod tests {
             .unwrap_or_default();
         let config = &Config::default()
             .rebase_directories("target/tests/generator/library-full".to_string())
-            .update_plantuml_jar("test/plantuml-1.2021.3.jar".to_string());
+            .update_plantuml_jar("test/plantuml-1.2021.15.jar".to_string());
         let tera = &create_tera(TEMPLATES.to_vec(), Some("test/tera/**".to_string())).unwrap();
         let plantuml = &create_plantuml(
             &config.java_binary,
@@ -161,7 +161,7 @@ mod tests {
     fn test_icon_reference() {
         let config = &Config::default()
             .rebase_directories("target/tests/generator/library-icon_reference".to_string())
-            .update_plantuml_jar("test/plantuml-1.2021.3.jar".to_string());
+            .update_plantuml_jar("test/plantuml-1.2021.15.jar".to_string());
         let tera = &create_tera(TEMPLATES.to_vec(), Some("test/tera/**".to_string())).unwrap();
         let plantuml = &create_plantuml(
             &config.java_binary,

diff --git a/src/cmd/library/generate/mod.rs b/src/cmd/library/generate/mod.rs
@@ -122,7 +122,7 @@ mod test {
             "-u=c4model",
             "-O=target/tests/cmd/library/generate/urns/distribution",
             "-C=target/tests/cmd/library/generate/urns/cache",
-            "-P=test/plantuml-1.2021.3.jar",
+            "-P=test/plantuml-1.2021.15.jar",
         ]);
         execute_library_generate(
             &arg_matches
@@ -154,7 +154,7 @@ mod test {
             "--clean-cache",
             "-O=target/tests/cmd/library/generate/clean_cache/distribution",
             "-C=target/tests/cmd/library/generate/clean_cache/cache",
-            "-P=test/plantuml-1.2021.3.jar",
+            "-P=test/plantuml-1.2021.15.jar",
         ]);
         execute_library_generate(
             &arg_matches
@@ -183,7 +183,7 @@ mod test {
             "--clean-urn=a_package/a_module",
             "-O=target/tests/cmd/library/generate/clean_urns/distribution",
             "-C=target/tests/cmd/library/generate/clean_urns/cache",
-            "-P=test/plantuml-1.2021.3.jar",
+            "-P=test/plantuml-1.2021.15.jar",
         ]);
         execute_library_generate(
             &arg_matches

diff --git a/src/cmd/library/generate/tasks/item/sprite_value.rs b/src/cmd/library/generate/tasks/item/sprite_value.rs
@@ -144,7 +144,7 @@ mod test {
             full_source_icon: "test/original_icon.png".to_string(),
             full_destination_text: "target/tests/sprite_value/test_generate.text".to_string(),
             java_binary: config.java_binary,
-            plantuml_jar: "test/plantuml-1.2021.3.jar".to_string(),
+            plantuml_jar: "test/plantuml-1.2021.15.jar".to_string(),
         };
         generator.cleanup(&vec![CleanupScope::All]).unwrap();
         generator.create_resources().unwrap();

diff --git a/src/constants.rs b/src/constants.rs
@@ -88,12 +88,12 @@ pub fn get_default_tera_discovery_pattern() -> String {
     TERA_DISCOVERY_PATTERN.to_string()
 }
 
-pub const PLANTUML_VERSION: &str = "1.2021.7";
+pub const PLANTUML_VERSION: &str = "1.2021.15";
 pub fn get_default_plantuml_version() -> String {
     PLANTUML_VERSION.to_string()
 }
 
-pub const PLANTUML_JAR: &str = ".cache/plantuml-1.2021.7.jar";
+pub const PLANTUML_JAR: &str = ".cache/plantuml-1.2021.15.jar";
 pub fn get_default_plantuml_jar() -> String {
     PLANTUML_JAR.to_string()
 }

diff --git a/src/plantuml.rs b/src/plantuml.rs
@@ -49,8 +49,8 @@ impl PlantUML {
         Ok(())
     }
     pub fn download(&self) -> Result<()> {
-        // https://netcologne.dl.sourceforge.net/project/plantuml/1.2021.7/plantuml.1.2021.7.jar
-        // https://downloads.sourceforge.net/project/plantuml/1.2021.7/plantuml.1.2021.7.jar
+        // https://netcologne.dl.sourceforge.net/project/plantuml/1.2021.15/plantuml.1.2021.15.jar
+        // https://downloads.sourceforge.net/project/plantuml/1.2021.15/plantuml.1.2021.15.jar
         let url = format!(
             "https://downloads.sourceforge.net/project/plantuml/{}/plantuml.{}.jar",
             self.plantuml_version, self.plantuml_version,

diff --git a/test/plantuml-1.2021.3.jar → test/plantuml-1.2021.15.jar b/test/plantuml-1.2021.3.jar → test/plantuml-1.2021.15.jar