diff --git a/maven-plugin/src/main/java/io/quarkus/bom/decomposer/maven/platformgen/GeneratePlatformProjectMojo.java b/maven-plugin/src/main/java/io/quarkus/bom/decomposer/maven/platformgen/GeneratePlatformProjectMojo.java index bc781d91..d27ba28a 100644 --- a/maven-plugin/src/main/java/io/quarkus/bom/decomposer/maven/platformgen/GeneratePlatformProjectMojo.java +++ b/maven-plugin/src/main/java/io/quarkus/bom/decomposer/maven/platformgen/GeneratePlatformProjectMojo.java @@ -44,7 +44,6 @@ import io.quarkus.maven.dependency.ArtifactCoords; import io.quarkus.maven.dependency.ArtifactKey; import io.quarkus.paths.PathTree; -import io.quarkus.registry.CatalogMergeUtility; import io.quarkus.registry.Constants; import io.quarkus.registry.catalog.CatalogMapperHelper; import io.quarkus.registry.catalog.ExtensionCatalog; @@ -455,23 +454,21 @@ private void generateDominoCliConfig() throws MojoExecutionException { + " is configured to include only supported extensions but no support metadata override sources were provided"); } selectedKeys = new HashSet<>(metadataOverrides.size()); - final List overrides = new ArrayList<>(metadataOverrides.size()); for (Path p : metadataOverrides) { try { - overrides.add(ExtensionCatalog.fromFile(p)); + ExtensionCatalog c = ExtensionCatalog.fromFile(p); + for (var e : c.getExtensions()) { + if (e.getMetadata().containsKey("redhat-support")) { + var key = e.getArtifact().getKey(); + selectedKeys.add(key); + selectedKeys.add(ArtifactKey.of(key.getGroupId(), key.getArtifactId() + "-deployment", + key.getClassifier(), key.getType())); + } + } } catch (IOException e) { throw new MojoExecutionException("Failed to deserialize " + p, e); } } - var catalog = CatalogMergeUtility.merge(overrides); - for (var e : catalog.getExtensions()) { - if (e.getMetadata().containsKey("redhat-support")) { - var key = e.getArtifact().getKey(); - selectedKeys.add(key); - selectedKeys.add(ArtifactKey.of(key.getGroupId(), key.getArtifactId() + "-deployment", - key.getClassifier(), key.getType())); - } - } } for (ProjectRelease r : member.getAlignedDecomposedBom().releases()) { for (ProjectDependency d : r.dependencies()) {