feat(arch): Wire presentation->services and service->integrations; refine pom output

- Each presentation module now depends on all service modules.
- Each named service area depends on the integration module sharing its
  name; the single default 'service' module depends on every integration
  module.
  (New IT test service-integration-match covers the name-match path.)
- domain-service modules describe "the service tier" (with the area name
  when named) rather than "the application", in both pom description and
  package-info.
- presentation-graphql uses "Resolver" wording (pom description and
  main/test package-info) instead of "Request-handling".
- acceptance-tests and common-testing are managed in the parent
  dependencyManagement TEST section with <scope>test</scope>.
- Generated poms put a blank line between <dependencies> and <build>.

Verify scripts updated for the reordered dependencyManagement (now a set
comparison) and for the new wiring and wording.

Document presentation/service wiring and DM test scope in modules.adoc.
Presentation modules depend on all service modules; service
modules depend on their matching integration(s) (default 'service' on
all); dependencyManagement splits acceptance-tests/common-testing into a
test-scoped TEST section.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01McmUDzyMrkYpbyeU5UWrot

Author: jeffjensen

src/main/resources/META-INF/archetype-post-generate.groovy

@@ -122,6 +122,9 @@ def modulePom = { String gId, String prefix, String ver,
         depsSection = "\n  <dependencies>\n${section.join('\n')}\n  </dependencies>\n"
     }
 
+    // #3: a blank line separates <dependencies> from <build> when both are present.
+    def buildPart = buildSection ? "\n${buildSection}" : ''
+
     """\
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -139,7 +142,7 @@ def modulePom = { String gId, String prefix, String ver,
 
   <artifactId>${prefix}-${aId}</artifactId>
   <description>${desc}</description>
-${depsSection}${buildSection}</project>
+${depsSection}${buildPart}</project>
 """
 }
 
@@ -327,14 +330,20 @@ public class ${className} {
 
 def modulesXml = allModules.collect { "    <module>../${it}</module>" }.join('\n')
 
-def dmXml = allModules.collect { mod ->
+// #5: acceptance-tests and common-testing are test-only artifacts — managed in the TEST section
+// with <scope>test</scope>; every other module is managed (default/compile) in the PROD section.
+def DM_TEST_MODULES = ['acceptance-tests', 'common-testing']
+def dmEntry = { String mod ->
+    def scopeLine = (mod in DM_TEST_MODULES) ? '\n        <scope>test</scope>' : ''
     """\
       <dependency>
         <groupId>${groupId}</groupId>
         <artifactId>${artifactId}-${mod}</artifactId>
-        <version>\${project.version}</version>
+        <version>\${project.version}</version>${scopeLine}
       </dependency>"""
-}.join('\n')
+}
+def dmTestXml = allModules.findAll { it in DM_TEST_MODULES }.collect(dmEntry).join('\n')
+def dmProdXml = allModules.findAll { !(it in DM_TEST_MODULES) }.collect(dmEntry).join('\n')
 
 // ─── Parent-pom dependency blocks (instructions 4–6) ──────────────────────────
 // All gated on includeSpring so a Spring-off project carries no Spring artifacts.
@@ -428,9 +437,10 @@ ${modulesXml}
   <dependencyManagement>
     <dependencies>
       <!-- TEST -->
+${dmTestXml}
 
       <!-- PROD -->
-${dmXml}${springCoreDm}
+${dmProdXml}${springCoreDm}
     </dependencies>
   </dependencyManagement>
 ${parentDependencies}
@@ -661,8 +671,9 @@ serviceModules.each { svcMod ->
 
     def svcDesc = svcMod == 'service' ? 'Business logic for the application.'
                                       : "Business logic for the ${label} service area."
-    def domDesc = svcMod == 'service' ? 'Domain classes for the application.'
-                                      : "Domain classes for the ${label} service area."
+    // #4: domain-service modules describe the service tier (plus the area name when named).
+    def domDesc = svcMod == 'service' ? 'Domain classes for the service tier.'
+                                      : "Domain classes for the ${label} service tier."
 
     // Domain classes owned by this service area.
     writeFile(projectDir, "${domMod}/pom.xml",
@@ -672,11 +683,16 @@ serviceModules.each { svcMod ->
     srcTree(projectDir, domMod, pkgPath, [domPkg], [domPkg], domDesc)
     configClass(domMod, domPkg)
 
-    // Business logic, depending on its own service-area domain module.
+    // Business logic, depending on its own service-area domain module and (#2) the integration
+    // module(s) it consumes: a named service area takes the integration sharing its name, while the
+    // single default 'service' module takes every integration module.
+    def svcIntegrations = svcMod == 'service'
+        ? intImplMods
+        : integrations.findAll { it.name == label }.collect { "integration-${it.abbrev}-${it.name}" }
     writeFile(projectDir, "${svcMod}/pom.xml",
         modulePom(groupId, artifactId, version,
             svcMod, svcDesc,
-            ['common-domain', domMod]))
+            ['common-domain', domMod] + svcIntegrations))
     srcTree(projectDir, svcMod, pkgPath, [svcPkg], [svcPkg], svcDesc)
     configClass(svcMod, svcPkg)
 }
@@ -698,14 +714,21 @@ presentations.each { pType ->
         "Domain classes for the ${disp} presentation tier.")
     configClass(domMod, "domain/${pType}")
 
+    // #7: GraphQL presentation classes are resolvers, not request-handling controllers.
+    def implDesc = pType == 'graphql'
+        ? "Resolver classes for the ${disp} presentation tier."
+        : "Request-handling classes (controllers) for the ${disp} presentation tier."
+    def implPkgDesc = pType == 'graphql'
+        ? "Resolver classes for the ${disp} presentation tier."
+        : "Request-handling classes for the ${disp} presentation tier."
+    // #1: every presentation module depends on all service modules.
     writeFile(projectDir, "${implMod}/pom.xml",
         modulePom(groupId, artifactId, version,
-            implMod,
-            "Request-handling classes (controllers) for the ${disp} presentation tier.",
-            ['common-domain', domMod] + starterDeps(presentationStarter(pType))))
+            implMod, implDesc,
+            ['common-domain', domMod] + serviceModules + starterDeps(presentationStarter(pType))))
     srcTree(projectDir, implMod, pkgPath,
         ["presentation/${pType}"], ["presentation/${pType}"],
-        "Request-handling classes for the ${disp} presentation tier.")
+        implPkgDesc)
     configClass(implMod, "presentation/${pType}")
 }
 

src/site/asciidoc/modules.adoc

@@ -41,7 +41,9 @@ _Depends on_: `common-domain`
 Business logic for a service area (see the `serviceAreas` prompt).
 +
 _Package_: `{base.package}.service` or `{base.package}.service.{name}` +
-_Depends on_: `common-domain`, its own `domain-service` / `domain-service-{name}` module
+_Depends on_: `common-domain`, its own `domain-service` / `domain-service-{name}` module, and the
+integration module(s) it consumes — a named area takes the integration sharing its name, while the
+single default `service` takes every integration module
 
 `domain-service` _or_ `domain-service-{name}`::
 Domain classes owned by a service area — one per `service` / `service-{name}` module.
@@ -103,7 +105,7 @@ Request-handling classes — controllers, resolvers, etc.
 (e.g. `presentation-rest`, `presentation-graphql`).
 +
 _Package_: `{base.package}.presentation.{type}` +
-_Depends on_: `common-domain`, `domain-{type}`
+_Depends on_: `common-domain`, `domain-{type}`, and all service modules
 
 == Parent POM
 
@@ -115,7 +117,9 @@ It contains:
 * `<parent>` — inherits `spring-boot-starter-parent` (4.1.0) via an empty `<relativePath/>`, supplying Spring dependency management and plugin defaults
 * `<packaging>pom</packaging>`
 * `<modules>` — all sibling modules referenced as `../module` relative paths, sorted alphabetically
-* `<dependencyManagement>` — all modules pinned to `${project.version}`, sorted alphabetically by `artifactId`
+* `<dependencyManagement>` — every module pinned to `${project.version}`, split into a TEST section
+  (`acceptance-tests` and `common-testing`, at `<scope>test</scope>`) and a PROD section (all other
+  modules, plus managed third-party dependencies such as `spring-core`)
 * Common properties: Java 21 via `maven.compiler.release`; UTF-8 source encoding
 * `<pluginManagement>` — pinned versions for `maven-compiler-plugin`, `maven-failsafe-plugin`,
   `maven-jar-plugin` (with `skipIfEmpty=true`), `maven-surefire-plugin`,

src/test/resources/projects/basic/verify.groovy

@@ -109,7 +109,7 @@ assert foundModules == moduleOrder : "parent <modules> not sorted alphabetically
 def dmBlock = (parentPom =~ /(?s)<dependencyManagement>.*?<\/dependencyManagement>/)[0]
 def dmIds = dmBlock.findAll(/<artifactId>[^<]+<\/artifactId>/).collect { it.replaceAll(/<\/?artifactId>/, '') }
 def dmModuleIds = dmIds.findAll { it.startsWith("${aid}-") }.collect { it.substring(aid.length() + 1) }
-assert dmModuleIds == modules.sort()        : "parent <dependencyManagement> not sorted alphabetically"
+assert dmModuleIds.sort() == modules.sort() : "parent <dependencyManagement> must manage exactly the sibling modules"
 assert dmModuleIds.size() == modules.size() : "parent <dependencyManagement> wrong entry count: expected ${modules.size()}, got ${dmModuleIds.size()}"
 
 // ── 6. Child module <parent> references parent/pom.xml ───────────────────────
@@ -260,5 +260,10 @@ check("app/src/main/java/${p}/app/config/AppServletInitializer.java")
 assert parentPom.contains('<artifactId>spring-boot-starter-parent</artifactId>') : 'parent must inherit spring-boot-starter-parent'
 assert appPom.contains('<artifactId>spring-boot-starter-web</artifactId>')     : 'app must depend on spring-boot-starter-web'
 
+// #1: each presentation module depends on all service modules
+assert text('presentation-rest/pom.xml').contains('<artifactId>service</artifactId>') : '#1: presentation-rest must depend on service'
+// #2: the single default 'service' module depends on every integration module
+assert text('service/pom.xml').contains('<artifactId>integration-db-main</artifactId>') : '#2: default service must depend on integration-db-main'
+
 _buildLog.append("\n=== PASSED ===\n")
 true

src/test/resources/projects/blank-presentation-types/verify.groovy

@@ -64,7 +64,7 @@ assert moduleBlock.findAll(/<module>[^<]+<\/module>/) == moduleOrder : "parent <
 def dmBlock = (parentPom =~ /(?s)<dependencyManagement>.*?<\/dependencyManagement>/)[0]
 def dmIds = dmBlock.findAll(/<artifactId>[^<]+<\/artifactId>/).collect { it.replaceAll(/<\/?artifactId>/, '') }
 def dmModuleIds = dmIds.findAll { it.startsWith("${aid}-") }.collect { it.substring(aid.length() + 1) }
-assert dmModuleIds == modules.sort()        : "parent <dependencyManagement> not sorted alphabetically"
+assert dmModuleIds.sort() == modules.sort() : "parent <dependencyManagement> must manage exactly the sibling modules"
 assert dmModuleIds.size() == modules.size() : "parent <dependencyManagement> wrong entry count: expected ${modules.size()}, got ${dmModuleIds.size()}"
 
 // ── 5. Child modules reference parent/pom.xml ────────────────────────────────

src/test/resources/projects/blank-service-areas/verify.groovy

@@ -70,7 +70,7 @@ assert moduleBlock.findAll(/<module>[^<]+<\/module>/) == moduleOrder : "parent <
 def dmBlock = (parentPom =~ /(?s)<dependencyManagement>.*?<\/dependencyManagement>/)[0]
 def dmIds = dmBlock.findAll(/<artifactId>[^<]+<\/artifactId>/).collect { it.replaceAll(/<\/?artifactId>/, '') }
 def dmModuleIds = dmIds.findAll { it.startsWith("${aid}-") }.collect { it.substring(aid.length() + 1) }
-assert dmModuleIds == modules.sort()        : "parent <dependencyManagement> not sorted alphabetically"
+assert dmModuleIds.sort() == modules.sort() : "parent <dependencyManagement> must manage exactly the sibling modules"
 assert dmModuleIds.size() == modules.size() : "parent <dependencyManagement> wrong entry count: expected ${modules.size()}, got ${dmModuleIds.size()}"
 
 // ── 5. Child modules reference parent/pom.xml ────────────────────────────────

src/test/resources/projects/full/verify.groovy

@@ -78,7 +78,7 @@ assert moduleBlock.findAll(/<module>[^<]+<\/module>/) == moduleOrder : "parent <
 def dmBlock = (parentPom =~ /(?s)<dependencyManagement>.*?<\/dependencyManagement>/)[0]
 def dmIds = dmBlock.findAll(/<artifactId>[^<]+<\/artifactId>/).collect { it.replaceAll(/<\/?artifactId>/, '') }
 def dmModuleIds = dmIds.findAll { it.startsWith("${aid}-") }.collect { it.substring(aid.length() + 1) }
-assert dmModuleIds == modules.sort()        : "parent <dependencyManagement> not sorted alphabetically"
+assert dmModuleIds.sort() == modules.sort() : "parent <dependencyManagement> must manage exactly the sibling modules"
 assert dmModuleIds.size() == modules.size() : "parent <dependencyManagement> wrong entry count: expected ${modules.size()}, got ${dmModuleIds.size()}"
 
 // ── 6. Child modules reference parent/pom.xml ────────────────────────────────
@@ -317,5 +317,34 @@ assert depPom.contains('<!-- PROD -->') : 'dependency list must carry a PROD sec
 assert depPom.indexOf('<!-- TEST -->') < depPom.indexOf('<!-- PROD -->')                          : 'TEST section must come before PROD'
 assert depPom.indexOf('<!-- PROD -->') < depPom.indexOf('<artifactId>common-domain</artifactId>') : 'compile-scope deps must sit under PROD'
 
+// ── This change set: #1 presentation→services, #2 service→integration, #4 / #5 / #7 ──
+
+// #1: every presentation module depends on all service modules
+['presentation-rest', 'presentation-graphql'].each { pres ->
+    ['service-orders', 'service-notifications'].each { svc ->
+        assert text("${pres}/pom.xml").contains("<artifactId>${svc}</artifactId>") : "#1: ${pres} must depend on ${svc}"
+    }
+}
+
+// #2: these named service areas share no name with any integration, so they take no integration dep
+['service-orders', 'service-notifications'].each { svc ->
+    assert !text("${svc}/pom.xml").contains('<artifactId>integration-') : "#2: ${svc} must not take a non-matching integration"
+}
+
+// #4: domain-service-* describe the service tier (with the area name), not "the application"
+assert text('domain-service-orders/pom.xml').contains('<description>Domain classes for the orders service tier.</description>') : '#4: domain-service-orders pom description'
+assert text("domain-service-orders/src/main/java/${p}/domain/service/orders/package-info.java").contains('Domain classes for the orders service tier.') : '#4: domain-service-orders package-info'
+
+// #5: acceptance-tests and common-testing are managed in dependencyManagement at test scope
+['acceptance-tests', 'common-testing'].each { m ->
+    assert dmBlock =~ /(?s)<artifactId>${aid}-${m}<\/artifactId>\s*<version>[^<]+<\/version>\s*<scope>test<\/scope>/ : "#5: ${m} must be managed at <scope>test</scope>"
+}
+
+// #7: GraphQL presentation uses resolver wording, not request-handling
+assert text('presentation-graphql/pom.xml').contains('<description>Resolver classes for the GraphQL presentation tier.</description>') : '#7: presentation-graphql pom description'
+assert text("presentation-graphql/src/main/java/${p}/presentation/graphql/package-info.java").contains('Resolver classes for the GraphQL presentation tier.') : '#7: presentation-graphql main package-info'
+assert text("presentation-graphql/src/test/java/${p}/presentation/graphql/package-info.java").contains('resolver classes for the GraphQL presentation tier.') : '#7: presentation-graphql test package-info'
+assert !text('presentation-graphql/pom.xml').contains('Request-handling') : '#7: presentation-graphql must not use request-handling wording'
+
 _buildLog.append("\n=== PASSED ===\n")
 true

src/test/resources/projects/malformed-integrations/verify.groovy

@@ -69,7 +69,7 @@ assert moduleBlock.findAll(/<module>[^<]+<\/module>/) == moduleOrder : "parent <
 def dmBlock = (parentPom =~ /(?s)<dependencyManagement>.*?<\/dependencyManagement>/)[0]
 def dmIds = dmBlock.findAll(/<artifactId>[^<]+<\/artifactId>/).collect { it.replaceAll(/<\/?artifactId>/, '') }
 def dmModuleIds = dmIds.findAll { it.startsWith("${aid}-") }.collect { it.substring(aid.length() + 1) }
-assert dmModuleIds == modules.sort()        : "parent <dependencyManagement> not sorted alphabetically"
+assert dmModuleIds.sort() == modules.sort() : "parent <dependencyManagement> must manage exactly the sibling modules"
 assert dmModuleIds.size() == modules.size() : "parent <dependencyManagement> wrong entry count: expected ${modules.size()}, got ${dmModuleIds.size()}"
 
 // ── 5. Child modules reference parent/pom.xml ────────────────────────────────

src/test/resources/projects/minimal/verify.groovy

@@ -62,7 +62,7 @@ assert moduleBlock.findAll(/<module>[^<]+<\/module>/) == moduleOrder : "parent <
 def dmBlock = (parentPom =~ /(?s)<dependencyManagement>.*?<\/dependencyManagement>/)[0]
 def dmIds = dmBlock.findAll(/<artifactId>[^<]+<\/artifactId>/).collect { it.replaceAll(/<\/?artifactId>/, '') }
 def dmModuleIds = dmIds.findAll { it.startsWith("${aid}-") }.collect { it.substring(aid.length() + 1) }
-assert dmModuleIds == modules.sort()        : "parent <dependencyManagement> not sorted alphabetically"
+assert dmModuleIds.sort() == modules.sort() : "parent <dependencyManagement> must manage exactly the sibling modules"
 assert dmModuleIds.size() == modules.size() : "parent <dependencyManagement> wrong entry count: expected ${modules.size()}, got ${dmModuleIds.size()}"
 
 // ── 4. Child modules reference parent/pom.xml ────────────────────────────────

src/test/resources/projects/multi-integration/verify.groovy

@@ -75,7 +75,7 @@ assert moduleBlock.findAll(/<module>[^<]+<\/module>/) == moduleOrder : "parent <
 def dmBlock = (parentPom =~ /(?s)<dependencyManagement>.*?<\/dependencyManagement>/)[0]
 def dmIds = dmBlock.findAll(/<artifactId>[^<]+<\/artifactId>/).collect { it.replaceAll(/<\/?artifactId>/, '') }
 def dmModuleIds = dmIds.findAll { it.startsWith("${aid}-") }.collect { it.substring(aid.length() + 1) }
-assert dmModuleIds == modules.sort()        : "parent <dependencyManagement> not sorted alphabetically"
+assert dmModuleIds.sort() == modules.sort() : "parent <dependencyManagement> must manage exactly the sibling modules"
 assert dmModuleIds.size() == modules.size() : "parent <dependencyManagement> wrong entry count: expected ${modules.size()}, got ${dmModuleIds.size()}"
 
 // ── 6. Child modules reference parent/pom.xml ────────────────────────────────

src/test/resources/projects/multi-service/verify.groovy

@@ -67,7 +67,7 @@ assert moduleBlock.findAll(/<module>[^<]+<\/module>/) == moduleOrder : "parent <
 def dmBlock = (parentPom =~ /(?s)<dependencyManagement>.*?<\/dependencyManagement>/)[0]
 def dmIds = dmBlock.findAll(/<artifactId>[^<]+<\/artifactId>/).collect { it.replaceAll(/<\/?artifactId>/, '') }
 def dmModuleIds = dmIds.findAll { it.startsWith("${aid}-") }.collect { it.substring(aid.length() + 1) }
-assert dmModuleIds == modules.sort()        : "parent <dependencyManagement> not sorted alphabetically"
+assert dmModuleIds.sort() == modules.sort() : "parent <dependencyManagement> must manage exactly the sibling modules"
 assert dmModuleIds.size() == modules.size() : "parent <dependencyManagement> wrong entry count: expected ${modules.size()}, got ${dmModuleIds.size()}"
 
 // ── 5. Child modules reference parent/pom.xml ────────────────────────────────