Merge branch 'master' into idetect-4641

# Conflicts:
#	documentation/src/main/markdown/currentreleasenotes.md

Author: gopanna

detectable/src/main/java/com/blackduck/integration/detectable/detectables/pnpm/lockfile/process/PnpmYamlTransformer.java

@@ -193,6 +193,7 @@ private List<String> extractRootPackageIds(
 
     private String convertRawEntryToPackageId(String name, String version, PnpmLinkedPackageResolver linkedPackageResolver, @Nullable String reportingProjectPackagePath) {
         name = StringUtils.strip(name, "'");
+        
         if (version.startsWith(LINKED_PACKAGE_PREFIX)) {
             // a linked project package's version will be referenced in the format: <linkPrefix><pathToLinkedPackageRelativeToReportingProjectPackage>
             version = linkedPackageResolver.resolveVersionOfLinkedPackage(reportingProjectPackagePath, version.replace(LINKED_PACKAGE_PREFIX, ""));
@@ -205,16 +206,15 @@ private String convertRawEntryToPackageId(String name, String version, PnpmLinke
             packageFormat = "/%s@%s";
         }
 
+        version = removeExtraVersionInformation(version);
+
         return String.format(packageFormat, name, version);
     }
 
     private Optional<NameVersion> parseNameVersionFromId(String id) {
         // ids follow format: /name@version in v6, name@version in v9
         try {
-            // It seems critical not to send this extra information in () or the kb will fail matching it.
-            if (id.contains("(")) {
-                id = id.split("\\(")[0];
-            }
+            id = removeExtraVersionInformation(id);
 
             int indexOfLastSlash = id.lastIndexOf("@");
             // v9 lockfile does not have names starting with /, v 6 does
@@ -273,4 +273,13 @@ private boolean isRootPackage(String id, List<String> rootIds) {
                 .anyMatch(id::equals); // for file dependencies, they are declared as <name> : <fileIdAsReportedInPackagesSection>
     }
 
+    private String removeExtraVersionInformation(String version) {
+        // Need to remove extra information from version or we will not appropriately
+        // perform KB matches later.
+        if (version != null && version.contains("(")) {
+            version = version.split("\\(")[0];
+        }
+        
+        return version;
+    }
 }

documentation/src/main/markdown/currentreleasenotes.md

@@ -22,10 +22,11 @@
 
 ### New features
 
-* 
+* Support for Conda has been extended to 25.1.1.
 
 ### Resolved issues
 
+* (IDETECT-4642) - Improved handling of pnpm packages that contain detailed version information in the pnpm-lock.yaml. Resolving [detect_product_short] missing some packages through failure to link direct and transitive dependencies. 
 * (IDETECT-4641) - Improved [detect_product_short]'s Yarn detector to handle non-standard version entries for component dependencies.
 
 ### Dependency updates