feat!: Remove support for external location with new Structurizr version

Dockerfile

@@ -11,4 +11,4 @@ EXPOSE 3000
 
 WORKDIR /docs
 
-CMD ["java", "-jar", "/app/structurizr-to-png.jar"]
+ENTRYPOINT ["/opt/java/openjdk/bin/java", "-jar", "/app/structurizr-to-png.jar"]

README.md

@@ -5,11 +5,10 @@
 Create PNGs from [Structurizr DSL](https://github.com/structurizr/dsl#readme) files.
 
 This project uses [PlantUML](https://plantuml.com) or [Graphviz](https://graphviz.org) to render Structurizr DSL to PNG
-images with various rendering strategies. Image rendering is based on exports from the Structurizr CLI. The project
-performs some post-processing of the workspace model to support conventions around external software systems.
+images with various rendering strategies. Image rendering is based on exports from the Structurizr CLI.
 
-  * Tags are mapped to shapes in the [`theme.json`](./src/main/resources/themes/theme.json)
-  * Systems tagged with `External`, `External System` or `Existing System` will be rendered as external
+A default [`theme.json`](./src/main/resources/themes/theme.json) is used when no user provided theme is referenced. The
+default theme maps tags to shapes and has some conventions around external systems.
 
 ## Features
 

pom.xml

@@ -61,7 +61,7 @@
       <dependency>
         <groupId>io.vertx</groupId>
         <artifactId>vertx-stack-depchain</artifactId>
-        <version>4.4.4</version>
+        <version>4.5.9</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -83,22 +83,22 @@
       <dependency>
         <groupId>com.structurizr</groupId>
         <artifactId>structurizr-client</artifactId>
-        <version>1.24.1</version>
+        <version>2.2.0</version>
       </dependency>
       <dependency>
         <groupId>com.structurizr</groupId>
         <artifactId>structurizr-core</artifactId>
-        <version>1.24.1</version>
+        <version>2.2.0</version>
       </dependency>
       <dependency>
         <groupId>com.structurizr</groupId>
         <artifactId>structurizr-dsl</artifactId>
-        <version>1.30.2</version>
+        <version>2.2.0</version>
       </dependency>
       <dependency>
         <groupId>com.structurizr</groupId>
         <artifactId>structurizr-export</artifactId>
-        <version>1.15.0</version>
+        <version>2.2.0</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -124,7 +124,7 @@
     <dependency>
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
-      <version>1.5.0</version>
+      <version>1.8.0</version>
     </dependency>
     <dependency>
       <groupId>io.vertx</groupId>
@@ -137,12 +137,12 @@
     <dependency>
       <groupId>net.sourceforge.plantuml</groupId>
       <artifactId>plantuml</artifactId>
-      <version>1.2023.10</version>
+      <version>1.2024.6</version>
     </dependency>
     <dependency>
       <groupId>org.fusesource.jansi</groupId>
       <artifactId>jansi</artifactId>
-      <version>2.4.0</version>
+      <version>2.4.1</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -191,11 +191,11 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.11.0</version>
+        <version>3.13.0</version>
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.1.2</version>
+        <version>3.3.1</version>
         <configuration>
           <argLine>@{argLine} -Dfile.encoding=UTF-8</argLine>
           <runOrder>random</runOrder>
@@ -204,7 +204,7 @@
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.8.10</version>
+        <version>0.8.12</version>
         <executions>
           <execution>
             <id>jacoco-surefire</id>
@@ -233,7 +233,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
-        <version>3.6.0</version>
+        <version>3.7.1</version>
         <executions>
           <execution>
             <id>copy-dependencies</id>
@@ -253,7 +253,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.3.0</version>
+        <version>3.4.2</version>
         <configuration>
           <archive>
             <manifest>

src/main/java/com/extendaretail/dsl2png/WorkspaceReader.java

@@ -3,7 +3,6 @@
 import com.structurizr.Workspace;
 import com.structurizr.dsl.StructurizrDslParser;
 import com.structurizr.dsl.StructurizrDslParserException;
-import com.structurizr.model.Location;
 import com.structurizr.model.SoftwareSystem;
 import com.structurizr.view.ComponentView;
 import com.structurizr.view.Configuration;
@@ -54,7 +53,7 @@ public WorkspaceReader(int themePort) {
   public Workspace loadFromDsl(File dslFile) throws IOException, StructurizrDslParserException {
     Workspace workspace = parseDsl(dslFile);
     addTheme(workspace);
-    setExternalLocation(workspace);
+    // setExternalLocation(workspace);
     workspace
         .getViews()
         .getViews()
@@ -121,12 +120,12 @@ private void addTheme(Workspace workspace) throws IOException {
     }
   }
 
-  private void setExternalLocation(Workspace workspace) {
-    workspace.getModel().getSoftwareSystems().stream()
-        .filter(hasExternalTag)
-        .forEach(
-            s -> {
-              s.setLocation(Location.External);
-            });
-  }
+  //  private void setExternalLocation(Workspace workspace) {
+  //    workspace.getModel().getSoftwareSystems().stream()
+  //        .filter(hasExternalTag)
+  //        .forEach(
+  //            s -> {
+  //              s.setLocation(Location.External);
+  //            });
+  //  }
 }

src/test/java/com/extendaretail/dsl2png/WorkspaceReaderTest.java

@@ -7,7 +7,6 @@
 import com.extendaretail.dsl2png.vertx.MainVerticle;
 import com.structurizr.Workspace;
 import com.structurizr.dsl.StructurizrDslParserException;
-import com.structurizr.model.Location;
 import io.vertx.core.DeploymentOptions;
 import io.vertx.core.Vertx;
 import io.vertx.junit5.VertxExtension;
@@ -42,11 +41,6 @@ void dslWithValidSyntax(TestInfo testInfo, Vertx vertx, VertxTestContext testCon
           assertEquals(2, workspace.getModel().getSoftwareSystems().size());
           assertEquals(4, workspace.getViews().getViews().size());
 
-          // Location should've been decorated.
-          assertEquals(
-              Location.External,
-              workspace.getModel().getSoftwareSystemWithName("Existing System").getLocation());
-
           testContext.completeNow();
         });
   }
@@ -61,7 +55,8 @@ void dslWithSyntaxError(TestInfo testInfo, VertxTestContext testContext) throws
                   () -> new WorkspaceReader(httpPort).loadFromDsl(createInvalidDsl(testInfo)));
           assertThat(e)
               .hasMessageContaining("Unexpected tokens")
-              .hasMessageContaining("at line 3: user = personX \"User\" \"A user\"");
+              .hasMessageContaining("at line 3")
+              .hasMessageContaining("user = personX \"User\" \"A user\"");
           testContext.completeNow();
         });
   }