Upgrade to Spring Modulith 0.1 snapshots and ArchUnit 1.0.

Author: odrotbohm

jmolecules-presentation/01-traditional/src/test/java/example/jmolecules/presentation/traditional/ApplicationIntegrationTest.java

@@ -26,11 +26,10 @@
 import lombok.RequiredArgsConstructor;
 
 import org.junit.jupiter.api.Test;
-import org.moduliths.docs.Documenter;
-import org.moduliths.docs.Documenter.Options;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.modulith.docs.Documenter;
 
 /**
  * @author Oliver Drotbohm
@@ -73,8 +72,6 @@ void exposesPersistenceComponents() {
 	@Test
 	void generateDocumentation() throws Exception {
 
-		new Documenter(Application.class)
-				.writeModulesAsPlantUml(Options.defaults())
-				.writeModuleCanvases();
+		new Documenter(Application.class).writeDocumentation();
 	}
 }

jmolecules-presentation/01-traditional/src/test/java/example/jmolecules/presentation/traditional/ArchitectureTest.java

@@ -21,7 +21,7 @@
 import com.tngtech.archunit.lang.SimpleConditionEvent;
 
 @AnalyzeClasses(packagesOf = Application.class)
-public class ArchitectureTest {
+class ArchitectureTest {
 
 	@ArchTest
 	void verifyAggregates(JavaClasses types) {

jmolecules-presentation/02-annotations/src/test/java/example/jmolecules/presentation/annotations/ApplicationIntegrationTests.java

@@ -27,11 +27,10 @@
 import lombok.RequiredArgsConstructor;
 
 import org.junit.jupiter.api.Test;
-import org.moduliths.docs.Documenter;
-import org.moduliths.docs.Documenter.Options;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.modulith.docs.Documenter;
 
 /**
  * @author Oliver Drotbohm
@@ -71,9 +70,6 @@ void exposesPersistenceComponents() {
 
 	@Test
 	void generateDocumentation() throws Exception {
-
-		new Documenter(Application.class)
-				.writeModulesAsPlantUml(Options.defaults())
-				.writeModuleCanvases();
+		new Documenter(Application.class).writeDocumentation();
 	}
 }

jmolecules-presentation/03-types/src/test/java/example/jmolecules/presentation/types/ApplicationIntegrationTests.java

@@ -17,7 +17,6 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import example.jmolecules.presentation.types.Application;
 import example.jmolecules.presentation.types.customer.Address;
 import example.jmolecules.presentation.types.customer.Customer;
 import example.jmolecules.presentation.types.customer.CustomerManagement;
@@ -27,11 +26,10 @@
 import lombok.RequiredArgsConstructor;
 
 import org.junit.jupiter.api.Test;
-import org.moduliths.docs.Documenter;
-import org.moduliths.docs.Documenter.Options;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.modulith.docs.Documenter;
 
 /**
  * @author Oliver Drotbohm
@@ -74,8 +72,6 @@ void exposesPersistenceComponents() {
 	@Test
 	void generateDocumentation() throws Exception {
 
-		new Documenter(Application.class)
-				.writeModulesAsPlantUml(Options.defaults())
-				.writeModuleCanvases();
+		new Documenter(Application.class).writeDocumentation();
 	}
 }

jmolecules-presentation/03-types/src/test/java/example/jmolecules/presentation/types/ArchitectureTests.java

@@ -19,9 +19,10 @@
 
 import org.jmolecules.archunit.JMoleculesDddRules;
 import org.junit.jupiter.api.Test;
-import org.moduliths.docs.Documenter;
-import org.moduliths.docs.Documenter.Options;
-import org.moduliths.docs.Documenter.Options.DiagramStyle;
+import org.springframework.modulith.docs.Documenter;
+import org.springframework.modulith.docs.Documenter.CanvasOptions;
+import org.springframework.modulith.docs.Documenter.DiagramOptions;
+import org.springframework.modulith.docs.Documenter.DiagramOptions.DiagramStyle;
 
 import com.tngtech.archunit.junit.AnalyzeClasses;
 import com.tngtech.archunit.junit.ArchTest;
@@ -37,8 +38,10 @@ class ArchitectureTests {
 
 	@Test
 	void documentation() throws IOException {
-		new Documenter(Application.class)
-				.writeModuleCanvases()
-				.writeModulesAsPlantUml(Options.defaults().withStyle(DiagramStyle.C4));
+
+		var diagramOptions = DiagramOptions.defaults().withStyle(DiagramStyle.C4);
+		var canvasOptions = CanvasOptions.defaults();
+
+		new Documenter(Application.class).writeDocumentation(diagramOptions, canvasOptions);
 	}
 }

jmolecules-presentation/pom.xml

@@ -19,6 +19,10 @@
 		<module>03-types</module>
 	</modules>
 
+	<properties>
+		<jmolecules-bom.version>2022.2.2-SNAPSHOT</jmolecules-bom.version>
+	</properties>
+
 	<dependencies>
 
 		<!-- Persistence -->
@@ -37,9 +41,9 @@
 		<!-- Moduliths -->
 
 		<dependency>
-			<groupId>org.moduliths</groupId>
-			<artifactId>moduliths-docs</artifactId>
-			<version>${moduliths.version}</version>
+			<groupId>org.springframework.experimental</groupId>
+			<artifactId>spring-modulith-docs</artifactId>
+			<version>${spring-modulith.version}</version>
 			<scope>test</scope>
 		</dependency>
 

pom.xml

@@ -19,12 +19,12 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<archunit.version>0.23.1</archunit.version>
+		<archunit.version>1.0.0</archunit.version>
 		<axon.version>4.6.1</axon.version>
 		<bytebuddy.version>1.12.18</bytebuddy.version>
 		<java.version>17</java.version>
 		<jmolecules-bom.version>2022.2.1</jmolecules-bom.version>
-		<moduliths.version>1.3.0</moduliths.version>
+		<spring-modulith.version>0.1.0-SNAPSHOT</spring-modulith.version>
 		<spring-boot.version>3.0.0-SNAPSHOT</spring-boot.version>
 	</properties>