Pass system properties to build sub-modules in release mojo

Author: adrienlauer

CHANGELOG.md

@@ -1,3 +1,8 @@
+# Version 2.6.2 (2017-08-10)
+
+* [chg] Use `web-archetype` as default archetype id when manually entering coordinates during generation.
+* [chg] If the user cancels (ctrl+c) generation during questions, still render the template with fallback variables. 
+
 # Version 2.6.1 (2017-08-04)
 
 * [chg] Search custom archetype catalog first (`http://seedstack.org/maven/` by default), then central, then local, then manual coordinates.

pom.xml

@@ -19,7 +19,7 @@
 
     <groupId>org.seedstack</groupId>
     <artifactId>seedstack-maven-plugin</artifactId>
-    <version>2.6.1-SNAPSHOT</version>
+    <version>2.6.2-SNAPSHOT</version>
     <packaging>maven-plugin</packaging>
 
     <properties>

src/license/THIRD-PARTY.properties

@@ -13,7 +13,7 @@
 # Please fill the missing licenses for dependencies :
 #
 #
-#Fri Aug 04 17:39:15 CEST 2017
+#Thu Aug 10 14:33:05 CEST 2017
 classworlds--classworlds--1.1-alpha-2=
 commons-collections--commons-collections--3.1=
 dom4j--dom4j--1.6.1=

src/main/java/org/seedstack/maven/GenerateMojo.java

@@ -130,7 +130,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
                         // Ask for archetype group id (defaults to distribution group id)
                         archetypeGroupId = prompter.promptInput("Enter the archetype group id", archetypeGroupId);
                         // Ask for archetype artifact id
-                        archetypeArtifactId = prompter.promptInput("Enter the archetype artifact id", null);
+                        archetypeArtifactId = prompter.promptInput("Enter the archetype artifact id", "web-archetype");
                         // Ask for archetype version (defaults to latest)
                         try {
                             archetypeVersion = artifactResolver.getHighestVersion(mavenProject, archetypeGroupId, archetypeArtifactId, allowSnapshots);
@@ -206,8 +206,10 @@ public void execute() throws MojoExecutionException, MojoFailureException {
 
                 executionEnvironment(mavenProject, mavenSession, buildPluginManager));
 
-        File projectDir = new File("." + File.separator + artifactId);
+        final File projectDir = new File("." + File.separator + artifactId);
         if (projectDir.exists() && projectDir.canWrite()) {
+            final File questionFile = new File(projectDir, "questions.json");
+
             // Create template engines
             stringTemplateEngine = new PebbleEngine.Builder()
                     .loader(new StringLoader())
@@ -218,7 +220,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
                     .build();
 
             // Create vars
-            HashMap<String, Object> vars = new HashMap<>();
+            final HashMap<String, Object> vars = new HashMap<>();
 
             // Put project values in vars
             HashMap<String, Object> projectVars = new HashMap<>();
@@ -240,11 +242,24 @@ public void execute() throws MojoExecutionException, MojoFailureException {
             archetypeVars.put("version", archetypeVersion);
             vars.put("archetype", archetypeVars);
 
+            Thread shutdownRender = new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    renderTemplates(projectDir, vars);
+                    if (questionFile.exists() && questionFile.canRead() && !questionFile.delete()) {
+                        getLog().warn("Unable to delete question file, useless files may be still be present in project");
+                    }
+                }
+            }, "render-hook");
+
+            // If the user cancels during question, complete the process with minimal vars
+            Runtime.getRuntime().addShutdownHook(shutdownRender);
+
             // Inquire from user if a question file is present
+            HashMap<String, Object> varsWithAnswers = new HashMap<>(vars);
             try {
-                File questionFile = new File(projectDir, "questions.json");
                 if (questionFile.exists() && questionFile.canRead()) {
-                    vars.putAll(inquire.inquire(questionFile.toURI().toURL()));
+                    varsWithAnswers.putAll(inquire.inquire(questionFile.toURI().toURL()));
                     if (!questionFile.delete()) {
                         getLog().warn("Unable to delete question file, useless files may be still be present in project");
                     }
@@ -253,7 +268,10 @@ public void execute() throws MojoExecutionException, MojoFailureException {
                 getLog().error("Unable to process question file, resulting project might be unusable", e);
             }
 
-            renderTemplates(projectDir, vars);
+            // We can now do the rendering properly, cancel the shutdown hook
+            Runtime.getRuntime().removeShutdownHook(shutdownRender);
+
+            renderTemplates(projectDir, varsWithAnswers);
         }
     }