test

Author: zhenghao104

src/Microsoft.ComponentDetection.Detectors/maven/MvnCliComponentDetector.cs

@@ -287,8 +287,6 @@ private async Task<IObservable<ProcessRequest>> RunMavenCliDetectionAsync(
 
             var pomFile = processRequest.ComponentStream;
             var pomDir = Path.GetDirectoryName(pomFile.Location);
-            var depsFileName = this.mavenCommandService.BcdeMvnDependencyFileName;
-            var depsFilePath = Path.Combine(pomDir, depsFileName);
 
             // Generate dependency file using Maven CLI.
             var result = await this.mavenCommandService.GenerateDependenciesFileAsync(
@@ -297,37 +295,7 @@ private async Task<IObservable<ProcessRequest>> RunMavenCliDetectionAsync(
 
             if (result.Success)
             {
-                // CLI succeeded - read the generated deps file
-                // We read the file here (rather than in MavenCommandService) to avoid
-                // unnecessary I/O for callers that scan for files later.
-                string depsFileContent = null;
-                if (this.fileUtilityService.Exists(depsFilePath))
-                {
-                    depsFileContent = this.fileUtilityService.ReadAllText(depsFilePath);
-                }
-
-                if (!string.IsNullOrEmpty(depsFileContent))
-                {
-                    Interlocked.Increment(ref cliSuccessCount);
-                    results.Add(new ProcessRequest
-                    {
-                        ComponentStream = new ComponentStream
-                        {
-                            Stream = new MemoryStream(Encoding.UTF8.GetBytes(depsFileContent)),
-                            Location = depsFilePath,
-                            Pattern = depsFileName,
-                        },
-                        SingleFileComponentRecorder = this.ComponentRecorder.CreateSingleFileComponentRecorder(
-                            Path.Combine(pomDir, MavenManifest)),
-                    });
-                }
-                else
-                {
-                    // CLI reported success but deps file is missing or empty - treat as failure
-                    Interlocked.Increment(ref cliFailureCount);
-                    failedDirectories.Add(pomDir);
-                    this.LogWarning($"Maven CLI succeeded but deps file not found or empty: {depsFilePath}");
-                }
+                Interlocked.Increment(ref cliSuccessCount);
             }
             else
             {
@@ -376,9 +344,35 @@ await this.RemoveNestedPomXmls(processRequests, cancellationToken).ForEachAsync(
         // Determine detection method based on results
         this.DetermineDetectionMethod(cliSuccessCount, cliFailureCount);
 
-        this.LogDebug($"Maven CLI processing complete: {cliSuccessCount} succeeded, {cliFailureCount} failed out of {this.originalPomFiles.Count} root pom.xml files.");
+        this.LogDebug($"Maven CLI processing complete: {cliSuccessCount} succeeded, {cliFailureCount} failed out of {this.originalPomFiles.Count} root pom.xml files. Retrieving generated dependency graphs.");
+
+        // Use original MvnCliComponentDetector approach: scan entire source directory for ALL generated dependency files
+        // This ensures we find dependency files from submodules even if Maven CLI was only run on parent pom.xml
+        var allGeneratedDependencyFiles = this.ComponentStreamEnumerableFactory
+            .GetComponentStreams(
+                this.CurrentScanRequest.SourceDirectory,
+                [this.mavenCommandService.BcdeMvnDependencyFileName],
+                this.CurrentScanRequest.DirectoryExclusionPredicate)
+            .Select(componentStream =>
+            {
+                // Read and store content to avoid stream disposal issues
+                using var reader = new StreamReader(componentStream.Stream);
+                var content = reader.ReadToEnd();
+                return new ProcessRequest
+                {
+                    ComponentStream = new ComponentStream
+                    {
+                        Stream = new MemoryStream(Encoding.UTF8.GetBytes(content)),
+                        Location = componentStream.Location,
+                        Pattern = componentStream.Pattern,
+                    },
+                    SingleFileComponentRecorder = this.ComponentRecorder.CreateSingleFileComponentRecorder(
+                        Path.Combine(Path.GetDirectoryName(componentStream.Location), MavenManifest)),
+                };
+            });
 
-        return results.ToObservable();
+        // Combine dependency files from CLI success with pom.xml files from CLI failures
+        return results.Concat(allGeneratedDependencyFiles).ToObservable();
     }
 
     protected override Task OnFileFoundAsync(