rebase to fix merge conflict.

Signed-off-by: Toure Dunnon <toure.dunnon@anchore.com>
anchore · Oct 16, 2020 · 6510963 · 6510963
1 parent 59b4820
commit 6510963
Showing 1 changed file with 32 additions and 45 deletions.
diff --git a/schema/json/schema.json b/schema/json/schema.json
@@ -40,9 +40,6 @@
                             "architecture": {
                                 "type": "string"
                             },
-                            "author": {
-                                "type": "string"
-                            },
                             "authors": {
                                 "type": "null"
                             },
@@ -53,55 +50,45 @@
                                 "type": "integer"
                             },
                             "files": {
-                                "anyOf": [
-                                    {
-                                        "type": "null"
-                                    },
-                                    {
-                                        "items": {
-                                            "anyOf": [
-                                                {
+                                "items": {
+                                    "anyOf": [
+                                        {
+                                            "type": "string"
+                                        },
+                                        {
+                                            "properties": {
+                                                "checksum": {
                                                     "type": "string"
                                                 },
-                                                {
-                                                    "properties": {
-                                                        "checksum": {
-                                                            "type": "string"
-                                                        },
-                                                        "ownerGid": {
-                                                            "type": "string"
-                                                        },
-                                                        "ownerUid": {
-                                                            "type": "string"
-                                                        },
-                                                        "path": {
-                                                            "type": "string"
-                                                        },
-                                                        "permissions": {
-                                                            "type": "string"
-                                                        }
-                                                    },
-                                                    "required": [
-                                                        "checksum",
-                                                        "ownerGid",
-                                                        "ownerUid",
-                                                        "path",
-                                                        "permissions"
-                                                    ],
-                                                    "type": "object"
+                                                "ownerGid": {
+                                                    "type": "string"
+                                                },
+                                                "ownerUid": {
+                                                    "type": "string"
+                                                },
+                                                "path": {
+                                                    "type": "string"
+                                                },
+                                                "permissions": {
+                                                    "type": "string"
                                                 }
-                                            ]
-                                        },
-                                        "type": "array"
-                                    }
-                                ]
+                                            },
+                                            "required": [
+                                                "checksum",
+                                                "ownerGid",
+                                                "ownerUid",
+                                                "path",
+                                                "permissions"
+                                            ],
+                                            "type": "object"
+                                        }
+                                    ]
+                                },
+                                "type": "array"
                             },
                             "gitCommitOfApkPort": {
                                 "type": "string"
                             },
-                            "homepage": {
-                                "type": "string"
-                            },
                             "installedSize": {
                                 "type": "integer"
                             },