Merge pull request #9 from itsallcode/documentation/8_update_plantuml…

…_dependency Documentation/8 update plantuml dependency
itsallcode · Jan 14, 2024 · 5be68b9 · 5be68b9
2 parents 4fe95ff + 8a2b704
commit 5be68b9
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# openfasttrace-architecture-template
+# OpenFastTrace Architecture Template
 
 Template for system and software architecture done with OpenFastTrace.
 
@@ -9,7 +9,11 @@ The architecture documents structure is based the the [arc42](https://arc42.org)
 The [arc42 template](https://github.com/arc42/arc42-template) is offered under the [CC-BY-SA](LICENSE.txt). Please keep attributions in all derived works.
 
 This build automatically includes license headers in the Markdown files for that reasons. See ["Automatic License Headers"](#automatic-license-headers) for details.
-
+
+## Change Log
+
+* [Change log](doc/changelog.md)
+
 ## Installation
 
 ### On Debian / Ubuntu Linux

diff --git a/doc/changelog.md b/doc/changelog.md
@@ -0,0 +1,3 @@
+## Change Log
+
+* [1.0.0](changes_1.0.0.md)
diff --git a/doc/changes_1.0.0.md b/doc/changes_1.0.0.md
@@ -0,0 +1,5 @@
+# OpenFastTrace Architecture Template - 1.0.0
+
+In this release we updated the PlantUML dependency to fix CVE-2023-3432.
+
+* #8: Updated the PlantUML dependency to fix CVE-2023-3432
diff --git a/pom.xml b/pom.xml
@@ -47,7 +47,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>3.1.0</version>
+        <version>3.3.1</version>
         <executions>
           <execution>
             <id>copy-resources</id>
@@ -68,9 +68,9 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>com.github.jeluard</groupId>
+        <groupId>com.github.davidmoten</groupId>
         <artifactId>plantuml-maven-plugin</artifactId>
-        <version>1.2</version>
+        <version>0.2.9</version>
         <executions>
           <execution>
             <id>plantuml</id>
@@ -81,28 +81,31 @@
           </execution>
         </executions>
         <configuration>
-          <sourceFiles>
+          <sources>
             <directory>${spec.model.directory}/diagrams</directory>
             <includes>
               <include>**/*.plantuml</include>
             </includes>
-          </sourceFiles>
-          <format>svg</format>
+          </sources>
+          <formats>
+            <format>svg</format>
+          </formats>
           <outputDirectory>${spec.build.uml.directory}</outputDirectory>
+          <preserveDirectoryStructure>true</preserveDirectoryStructure>
         </configuration>
         <dependencies>
           <dependency>
             <groupId>net.sourceforge.plantuml</groupId>
             <artifactId>plantuml</artifactId>
-            <version>1.2018.8</version>
+            <version>1.2023.13</version>
           </dependency>
         </dependencies>
       </plugin>
       <plugin>
         <!-- See http://www.mojohaus.org/license-maven-plugin/examples/example-add-license.html -->
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>license-maven-plugin</artifactId>
-        <version>1.16</version>
+        <version>2.3.0</version>
         <configuration>
           <verbose>false</verbose>
           <detail>true</detail>
@@ -149,7 +152,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>3.1.0</version>
+        <version>3.6.0</version>
         <configuration>
           <descriptors>
             <descriptor>${project.basedir}/src/assembly/htmldoc.xml</descriptor>
@@ -176,7 +179,7 @@
           <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>exec-maven-plugin</artifactId>
-            <version>1.6.0</version>
+            <version>3.1.1</version>
             <executions>
               <execution>
                 <id>pandoc-pdf</id>
@@ -243,6 +246,26 @@
               </execution>
             </executions>
           </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-enforcer-plugin</artifactId>
+            <version>3.4.1</version>
+            <executions>
+              <execution>
+                <id>enforce-maven</id>
+                <goals>
+                  <goal>enforce</goal>
+                </goals>
+                <configuration>
+                  <rules>
+                    <requireMavenVersion>
+                      <version>3.6.3</version>
+                    </requireMavenVersion>
+                  </rules>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
       </build>
     </profile>