From 4385bd4e59706a4b74cbc1174dcdc9018560155b Mon Sep 17 00:00:00 2001
From: Shai Almog <67850168+shai-almog@users.noreply.github.com>
Date: Fri, 29 May 2026 16:25:54 +0300
Subject: [PATCH] scripts/initializr: sync template with cn1app-archetype

The initializr-served project template drifted from the
cn1app-archetype:

- common/pom.xml and javase/pom.xml both lacked the
  org.junit.jupiter:junit-jupiter:5.9.3 test-scope dependency, so the
  JUnit 5 test that ships in common/src/test/java fails to compile
  ("package org.junit.jupiter.api does not exist") in any generated
  project.
- common/pom.xml was missing the codenameone-maven-plugin
  transcode-svg execution and the process-annotations goal on
  cn1-process-classes, so generated apps had no SVG transcoding and
  no @Route dispatcher generation.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 scripts/initializr/common/pom.xml | 34 +++++++++++++++++++++++++++++++
 scripts/initializr/javase/pom.xml |  6 ++++++
 2 files changed, 40 insertions(+)

diff --git a/scripts/initializr/common/pom.xml b/scripts/initializr/common/pom.xml
index 6a217c55cc..f5d3085e3c 100644
--- a/scripts/initializr/common/pom.xml
+++ b/scripts/initializr/common/pom.xml
@@ -22,6 +22,12 @@
             <artifactId>codenameone-javase</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.9.3</version>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
           <artifactId>initializr-ZipSupport</artifactId>
@@ -355,6 +361,19 @@
                 <artifactId>codenameone-maven-plugin</artifactId>
 
                 <executions>
+                    <execution>
+                        <!-- Build-time SVG transcoder: any SVG dropped into
+                             src/main/css/ or src/main/svg/ is compiled into
+                             a GeneratedSVGImage subclass plus an SVGRegistry,
+                             so theme.css `url(*.svg)` references resolve at
+                             runtime to vector-rendered Image objects on every
+                             port. See docs/developer-guide/svg.md. -->
+                        <id>transcode-svg</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>transcode-svg</goal>
+                        </goals>
+                    </execution>
                     <execution>
                         <id>generate-gui-sources</id>
                         <phase>process-sources</phase>
@@ -368,6 +387,12 @@
                         <goals>
                             <goal>bytecode-compliance</goal>
                             <goal>css</goal>
+                            <!-- Scans the project's compiled bytecode for
+                                 @Route declarations and generates the
+                                 dispatcher class consumed by the per-platform
+                                 application stub. No-op for projects with no
+                                 @Route. -->
+                            <goal>process-annotations</goal>
                             <!--<goal>compile-javase-sources</goal>-->
                         </goals>
                     </execution>
@@ -384,6 +409,15 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
+                <!--
+                  Surefire is intentionally skipped in the common module.
+                  Legacy AbstractTest classes run through `cn1:test` (wired
+                  in the javase module's "test" profile). New JUnit 5
+                  tests under src/test/java run from the javase module as
+                  well, which mounts these same sources via
+                  testSourceDirectory. Enabling Surefire here too would
+                  execute every JUnit test twice.
+                  -->
                 <configuration>
                     <skipTests>true</skipTests>
                 </configuration>
diff --git a/scripts/initializr/javase/pom.xml b/scripts/initializr/javase/pom.xml
index 9d2ee89d50..61f4d324f9 100644
--- a/scripts/initializr/javase/pom.xml
+++ b/scripts/initializr/javase/pom.xml
@@ -72,6 +72,12 @@
           <artifactId>codenameone-javase</artifactId>
           <scope>provided</scope>
       </dependency>
+      <dependency>
+          <groupId>org.junit.jupiter</groupId>
+          <artifactId>junit-jupiter</artifactId>
+          <version>5.9.3</version>
+          <scope>test</scope>
+      </dependency>
 
   </dependencies>