Add bill-of-materials.override.json to fix license detection issues

kube-reporting · Mar 26, 2018 · a59b1bb · a59b1bb
1 parent acc30be
commit a59b1bb
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -232,4 +232,4 @@ pkg/hive/hive_thrift: thrift/TCLIService.thrift
 	for i in `go list -f '{{if eq .Name "main"}}{{ .Dir }}{{end}}' ./$@/...`; do rm -rf $$i; done
 
 bill-of-materials.json: bill-of-materials.override.json
-	license-bill-of-materials ./... > $(ROOT_DIR)/bill-of-materials.json
+	license-bill-of-materials --override-file $(ROOT_DIR)/bill-of-materials.override.json ./... > $(ROOT_DIR)/bill-of-materials.json
diff --git a/bill-of-materials.json b/bill-of-materials.json
@@ -66,8 +66,8 @@
 		"project": "github.com/ghodss/yaml",
 		"licenses": [
 			{
-				"type": "BSD 3-clause \"New\" or \"Revised\" License",
-				"confidence": 0.8357142857142857
+				"type": "MIT License and BSD 3-clause \"New\" or \"Revised\" License",
+				"confidence": 1
 			}
 		]
 	},
@@ -111,12 +111,12 @@
 		"project": "github.com/go-openapi/spec",
 		"licenses": [
 			{
-				"type": "Apache License 2.0",
+				"type": "MIT License and BSD 3-clause \"New\" or \"Revised\" License",
 				"confidence": 1
 			},
 			{
-				"type": "The Unlicense",
-				"confidence": 0.3422459893048128
+				"type": "Apache License 2.0",
+				"confidence": 1
 			}
 		]
 	},
@@ -223,8 +223,16 @@
 		"project": "github.com/jmespath/go-jmespath",
 		"licenses": [
 			{
-				"type": "The Unlicense",
-				"confidence": 0.35294117647058826
+				"type": "MIT License and BSD 3-clause \"New\" or \"Revised\" License",
+				"confidence": 1
+			},
+			{
+				"type": "Apache License 2.0",
+				"confidence": 1
+			},
+			{
+				"type": "Apache License 2.0",
+				"confidence": 1
 			}
 		]
 	},

diff --git a/bill-of-materials.override.json b/bill-of-materials.override.json
@@ -0,0 +1,26 @@
+[
+	{
+		"project": "github.com/ghodss/yaml",
+		"licenses": [
+			{
+				"type": "MIT License and BSD 3-clause \"New\" or \"Revised\" License"
+			}
+		]
+	},
+	{
+		"project": "github.com/jmespath/go-jmespath",
+		"licenses": [
+			{
+				"type": "Apache License 2.0"
+			}
+		]
+	},
+	{
+		"project": "github.com/go-openapi/spec",
+		"licenses": [
+			{
+				"type": "Apache License 2.0"
+			}
+		]
+	}
+]