From f9a6b306656f261e6f11ef00dd7d3dac6e81730b Mon Sep 17 00:00:00 2001 From: Gayal Dassanayake Date: Fri, 25 Oct 2024 16:02:29 +0530 Subject: [PATCH] Add dep-manifest modules to the pkg-manifest dep --- .../io/ballerina/projects/internal/BlendedManifest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/BlendedManifest.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/BlendedManifest.java index f8387d892b41..1ceb0d473c30 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/BlendedManifest.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/BlendedManifest.java @@ -35,6 +35,7 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Optional; @@ -132,11 +133,12 @@ public static BlendedManifest from(DependencyManifest dependencyManifest, } } } else { + Collection moduleNames = existingDepOptional.isPresent() ? + existingDepOptional.get().modules : Collections.emptyList(); depContainer.add(depInPkgManifest.org(), depInPkgManifest.name(), new Dependency( depInPkgManifest.org(), depInPkgManifest.name(), depInPkgManifest.version(), DependencyRelation.UNKNOWN, REPOSITORY_NOT_SPECIFIED, - moduleNames(new DependencyManifest.Package(depInPkgManifest.name(), depInPkgManifest.org(), - depInPkgManifest.version())), DependencyOrigin.USER_SPECIFIED)); + moduleNames, DependencyOrigin.USER_SPECIFIED)); continue; }