Merge pull request #27310 from aloubyansky/quarkiverse-parent-10

Use io.quarkus:quarkus-bom in extension projects and import quarkiverse-parent:10
quarkusio · Aug 16, 2022 · 3474cd8 · 3474cd8
2 parents 973e4e8 + 8bfd534
commit 3474cd8
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/...src/main/resources/codestarts/quarkus-extension/code/extension-base/java/pom.tpl.qute.xml b/...src/main/resources/codestarts/quarkus-extension/code/extension-base/java/pom.tpl.qute.xml
@@ -54,9 +54,15 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
+                {#if quarkus.version}
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bom</artifactId>
+                <version>$\{quarkus.version}</version>
+                {#else}
                 <groupId>{quarkus.bom.group-id}</groupId>
                 <artifactId>{quarkus.bom.artifact-id}</artifactId>
                 <version>{quarkus.bom.version}</version>
+                {/if}
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

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
@@ -52,7 +52,7 @@ public enum LayoutType {
 
     public static final String DEFAULT_QUARKIVERSE_PARENT_GROUP_ID = "io.quarkiverse";
     public static final String DEFAULT_QUARKIVERSE_PARENT_ARTIFACT_ID = "quarkiverse-parent";
-    public static final String DEFAULT_QUARKIVERSE_PARENT_VERSION = "9";
+    public static final String DEFAULT_QUARKIVERSE_PARENT_VERSION = "10";
     public static final String DEFAULT_QUARKIVERSE_NAMESPACE_ID = "quarkus-";
     public static final String DEFAULT_QUARKIVERSE_GUIDE_URL = "https://quarkiverse.github.io/quarkiverse-docs/%s/dev/";
 

diff --git a/...oreExtension/extensions_my-ext_runtime_src_main_resources_META-INF_quarkus-extension.yaml b/...oreExtension/extensions_my-ext_runtime_src_main_resources_META-INF_quarkus-extension.yaml
@@ -6,4 +6,4 @@ metadata:
 #  guide: ...
 #  categories:
 #    - "miscellaneous"
-#  status: "preview"
+#  status: "preview"
diff --git a/...xtensionsDir/extensions_my-ext_runtime_src_main_resources_META-INF_quarkus-extension.yaml b/...xtensionsDir/extensions_my-ext_runtime_src_main_resources_META-INF_quarkus-extension.yaml
@@ -6,4 +6,4 @@ metadata:
 #  guide: ...
 #  categories:
 #    - "miscellaneous"
-#  status: "preview"
+#  status: "preview"
diff --git a/..._/CreateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarkiverse-ext_pom.xml b/..._/CreateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarkiverse-ext_pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.quarkiverse</groupId>
     <artifactId>quarkiverse-parent</artifactId>
-    <version>9</version>
+    <version>10</version>
   </parent>
   <groupId>io.quarkiverse.my-quarkiverse-ext</groupId>
   <artifactId>quarkus-my-quarkiverse-ext-parent</artifactId>