snyk 1.994.0 → 1.995.0

package/dist/cli/thirdPartyNotice.json

@@ -2475,10 +2475,10 @@
   },
   {
     "name": "snyk-gradle-plugin",
-    "version": "3.21.1",
+    "version": "3.22.1",
     "author": "snyk.io",
     "repository": "https://github.com/snyk/snyk-gradle-plugin",
-    "source": "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.21.1.tgz",
+    "source": "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.22.1.tgz",
     "license": "Apache-2.0",
     "licenseText": "Copyright 2017 Snyk Ltd.\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n    http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n"
   },

package/dist/lib/init.gradle

@@ -155,6 +155,9 @@ def matchesAttributeFilter(conf, confAttrSpec) {
 
 def findMatchingConfigs(confs, confNameFilter, confAttrSpec) {
     def matching = confs.findAll({ it.name =~ confNameFilter })
+    if (matching.isEmpty() && !confs.isEmpty()) {
+        throw new RuntimeException('Matching configurations ' + confNameFilter + ' were not found')  
+    }
     if (confAttrSpec == null) {
         // We don't have an attribute spec to match
         return matching
@@ -181,6 +184,7 @@ def findProjectConfigs(proj, confNameFilter, confAttrSpec) {
             resolvable.add(it)
         } catch (Exception ex) {
             // Swallow the error
+            debugLog("Skipping config ${it.name} due to resolvedConfiguration error.")
         }
     })
     debugLog("resolvableConfigs=$resolvable")
@@ -281,10 +285,9 @@ allprojects { currProj ->
                         debugLog("first level module dependencies for config `$config.name': $resConf.firstLevelModuleDependencies")
                     }
                 })
-                if (resolvedConfigs.isEmpty() && !proj.configurations.isEmpty()) {
-                    throw new RuntimeException('Matching configurations not found: ' + confNameFilter +
-                            ', available configurations for project ' + proj + ': '
-                            + proj.configurations.collect { it.name })
+                if (resolvedConfigs.isEmpty() && !resolvableConfigs.isEmpty()) {
+                    throw new RuntimeException('Configurations: ' + resolvableConfigs.collect { it.name } +
+                            ' for project ' + proj + ' could not be resolved.')
                 }
 
                 def nonemptyFirstLevelDeps = resolvedConfigs.resolvedConfiguration.firstLevelModuleDependencies.findAll({ !it.isEmpty() })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "snyk",
-  "version": "1.994.0",
+  "version": "1.995.0",
   "description": "snyk library and cli utility",
   "files": [
     "help/cli-commands",