Merge pull request #36570 from JiriOndrusek/cli-platform-updates

Maven CLI: use recipes for platform extensions
quarkusio · Oct 26, 2023 · ac9d53a · ac9d53a
2 parents 11cf607 + a85a049
commit ac9d53a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/...devtools-common/src/main/java/io/quarkus/devtools/project/update/ExtensionUpdateInfo.java b/...devtools-common/src/main/java/io/quarkus/devtools/project/update/ExtensionUpdateInfo.java
@@ -93,4 +93,8 @@ public boolean isSimpleVersionUpdate() {
         return VersionUpdateType.UPDATE_VERSION.equals(getVersionUpdateType())
                 || VersionUpdateType.RECOMMEND_PLATFORM_MANAGED.equals(getVersionUpdateType());
     }
+
+    public boolean isVersionUpdate() {
+        return !VersionUpdateType.ADD_VERSION.equals(getVersionUpdateType());
+    }
 }
diff --git a/...-common/src/main/java/io/quarkus/devtools/project/update/ProjectExtensionsUpdateInfo.java b/...-common/src/main/java/io/quarkus/devtools/project/update/ProjectExtensionsUpdateInfo.java
@@ -42,6 +42,10 @@ public List<ExtensionUpdateInfo> getSimpleVersionUpdates() {
         return streamExtensions().filter(ExtensionUpdateInfo::isSimpleVersionUpdate).collect(Collectors.toList());
     }
 
+    public List<ExtensionUpdateInfo> getVersionUpdates() {
+        return streamExtensions().filter(ExtensionUpdateInfo::isVersionUpdate).collect(Collectors.toList());
+    }
+
     public boolean shouldUpdateExtensions() {
         return streamExtensions().anyMatch(ExtensionUpdateInfo::shouldUpdateExtension);
     }

diff --git a/...tools-common/src/main/java/io/quarkus/devtools/project/update/rewrite/QuarkusUpdates.java b/...tools-common/src/main/java/io/quarkus/devtools/project/update/rewrite/QuarkusUpdates.java
@@ -30,7 +30,7 @@ public static FetchResult createRecipe(MessageWriter log, Path target, MavenArti
                 request.currentVersion,
                 request.targetVersion,
                 request.projectExtensionsUpdateInfo
-                        .getSimpleVersionUpdates());
+                        .getVersionUpdates());
         QuarkusUpdateRecipe recipe = new QuarkusUpdateRecipe()
                 .buildTool(request.buildTool);
         if (request.updateJavaVersion.isPresent()) {