Merge pull request #44141 from gsmet/quarkiverse-without-tests

Codestarts - Do not reference ITs module if extension without ITs
quarkusio · Oct 29, 2024 · f7930ce · f7930ce
2 parents a6a9f85 + a09e715
commit f7930ce
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/...ts/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/pom.tpl.qute.xml b/...ts/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/pom.tpl.qute.xml
@@ -21,6 +21,7 @@
         </pluginManagement>
     </build>
     {/if}
+    {#if has-integration-tests-module}
     <profiles>
         <profile>
             <id>it</id>
@@ -35,4 +36,5 @@
             </modules>
         </profile>
     </profiles>
+    {/if}
 </project>
diff --git a/.../main/java/io/quarkus/devtools/codestarts/extension/QuarkusExtensionCodestartCatalog.java b/.../main/java/io/quarkus/devtools/codestarts/extension/QuarkusExtensionCodestartCatalog.java
@@ -50,7 +50,8 @@ public enum QuarkusExtensionData implements DataKey {
         IT_PARENT_RELATIVE_PATH("it-parent.relative-path"),
         MAVEN_QUARKUS_EXTENSION_PLUGIN("maven.quarkus-extension-plugin"),
         MAVEN_COMPILER_PLUGIN_VERSION("maven.compiler-plugin-version"),
-        HAS_DOCS_MODULE("has-docs-module");
+        HAS_DOCS_MODULE("has-docs-module"),
+        HAS_INTEGRATION_TESTS_MODULE("has-integration-tests-module");
 
         private final String key;
 

diff --git a/...cts/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateExtension.java b/...cts/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateExtension.java
@@ -8,6 +8,7 @@
 import static io.quarkus.devtools.codestarts.extension.QuarkusExtensionCodestartCatalog.QuarkusExtensionData.EXTENSION_NAME;
 import static io.quarkus.devtools.codestarts.extension.QuarkusExtensionCodestartCatalog.QuarkusExtensionData.GROUP_ID;
 import static io.quarkus.devtools.codestarts.extension.QuarkusExtensionCodestartCatalog.QuarkusExtensionData.HAS_DOCS_MODULE;
+import static io.quarkus.devtools.codestarts.extension.QuarkusExtensionCodestartCatalog.QuarkusExtensionData.HAS_INTEGRATION_TESTS_MODULE;
 import static io.quarkus.devtools.codestarts.extension.QuarkusExtensionCodestartCatalog.QuarkusExtensionData.IT_PARENT_ARTIFACT_ID;
 import static io.quarkus.devtools.codestarts.extension.QuarkusExtensionCodestartCatalog.QuarkusExtensionData.IT_PARENT_GROUP_ID;
 import static io.quarkus.devtools.codestarts.extension.QuarkusExtensionCodestartCatalog.QuarkusExtensionData.IT_PARENT_RELATIVE_PATH;
@@ -105,6 +106,7 @@ public enum LayoutType {
     private String extensionsRelativeDir = "extensions";
     private boolean withCodestart;
     private String javaVersion;
+    private boolean hasIntegrationTestsModule;
 
     public CreateExtension(final Path baseDir) {
         this.baseDir = requireNonNull(baseDir, "extensionDirPath is required");
@@ -218,6 +220,7 @@ public CreateExtension withoutDevModeTest(boolean withoutDevModeTest) {
     }
 
     public CreateExtension withoutIntegrationTests(boolean withoutIntegrationTest) {
+        hasIntegrationTestsModule = !withoutIntegrationTest;
         this.builder.withoutIntegrationTests(withoutIntegrationTest);
         return this;
     }
@@ -263,6 +266,7 @@ public CreateExtensionCommandHandler prepare() throws QuarkusCommandException {
         data.putIfAbsent(CLASS_NAME_BASE, toCapCamelCase(extensionId));
         data.put(EXTENSION_FULL_NAME,
                 data.getRequiredStringValue(NAMESPACE_NAME) + data.getRequiredStringValue(EXTENSION_NAME));
+        data.put(HAS_INTEGRATION_TESTS_MODULE, hasIntegrationTestsModule);
 
         // for now, we only support Java extensions
         data.put(JAVA_VERSION, javaVersion == null ? JavaVersion.DEFAULT_JAVA_VERSION_FOR_EXTENSION