Merge branch '4.1.0'

# Conflicts: # hub-detect/src/main/groovy/com/blackducksoftware/integration/hub/detect/bomtool/npm/NpmCliExtractor.java
blackducksoftware · Jul 16, 2018 · 8731aba · 8731aba
2 parents 9450f18 + 505318c
commit 8731aba
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/...main/groovy/com/blackducksoftware/integration/hub/detect/bomtool/npm/NpmCliExtractor.java b/...main/groovy/com/blackducksoftware/integration/hub/detect/bomtool/npm/NpmCliExtractor.java
@@ -27,7 +27,7 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.util.Arrays;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.slf4j.Logger;
@@ -66,11 +66,11 @@ public Extraction extract(final BomToolType bomToolType, final File directory, f
         final File npmLsErrorFile = detectFileManager.getOutputFile(outputDirectory, NpmCliExtractor.ERROR_FILE);
 
         final boolean includeDevDeps = detectConfigWrapper.getBooleanProperty(DetectProperty.DETECT_NPM_INCLUDE_DEV_DEPENDENCIES);
-        List<String> exeArgs;
+        final List<String> exeArgs = new ArrayList<>();
+        exeArgs.add("ls");
+        exeArgs.add("-json");
         if (!includeDevDeps) {
-            exeArgs = Arrays.asList("ls", "-json", "-prod");
-        } else {
-            exeArgs = Arrays.asList("ls", "-json");
+            exeArgs.add("-prod");
         }
 
         final Executable npmLsExe = new Executable(directory, npmExe, exeArgs);