From 8bfd534443aa80c1d9622adb4a329f81f8b14a99 Mon Sep 17 00:00:00 2001
From: Alexey Loubyansky <olubyans@redhat.com>
Date: Tue, 16 Aug 2022 13:14:49 +0200
Subject: [PATCH] Use io.quarkus:quarkus-bom in extension projects and import
 quarkiverse-parent:10

---
 .../code/extension-base/java/pom.tpl.qute.xml               | 6 ++++++
 .../java/io/quarkus/devtools/commands/CreateExtension.java  | 2 +-
 ...ntime_src_main_resources_META-INF_quarkus-extension.yaml | 2 +-
 ...ntime_src_main_resources_META-INF_quarkus-extension.yaml | 2 +-
 .../quarkus-my-quarkiverse-ext_pom.xml                      | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/extension-base/java/pom.tpl.qute.xml b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/extension-base/java/pom.tpl.qute.xml
index 041d75b244381..495ab9aeb16b8 100644
--- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/extension-base/java/pom.tpl.qute.xml
+++ b/independent-projects/tools/base-codestarts/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/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateExtension.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateExtension.java
index 3caffa498d992..e45baba446fd1 100644
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateExtension.java
+++ b/independent-projects/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/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateCoreExtension/extensions_my-ext_runtime_src_main_resources_META-INF_quarkus-extension.yaml b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateCoreExtension/extensions_my-ext_runtime_src_main_resources_META-INF_quarkus-extension.yaml
index f487a25fd32c4..2edc8b86efdeb 100644
--- a/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateCoreExtension/extensions_my-ext_runtime_src_main_resources_META-INF_quarkus-extension.yaml
+++ b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateCoreExtension/extensions_my-ext_runtime_src_main_resources_META-INF_quarkus-extension.yaml
@@ -6,4 +6,4 @@ metadata:
 #  guide: ...
 #  categories:
 #    - "miscellaneous"
-#  status: "preview"
\ No newline at end of file
+#  status: "preview"
diff --git a/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateCoreExtensionFromExtensionsDir/extensions_my-ext_runtime_src_main_resources_META-INF_quarkus-extension.yaml b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateCoreExtensionFromExtensionsDir/extensions_my-ext_runtime_src_main_resources_META-INF_quarkus-extension.yaml
index f487a25fd32c4..2edc8b86efdeb 100644
--- a/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateCoreExtensionFromExtensionsDir/extensions_my-ext_runtime_src_main_resources_META-INF_quarkus-extension.yaml
+++ b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateCoreExtensionFromExtensionsDir/extensions_my-ext_runtime_src_main_resources_META-INF_quarkus-extension.yaml
@@ -6,4 +6,4 @@ metadata:
 #  guide: ...
 #  categories:
 #    - "miscellaneous"
-#  status: "preview"
\ No newline at end of file
+#  status: "preview"
diff --git a/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarkiverse-ext_pom.xml b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarkiverse-ext_pom.xml
index 6ba513c772856..3398446768dad 100644
--- a/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarkiverse-ext_pom.xml
+++ b/integration-tests/maven/src/test/resources/__snapshots__/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>