From c39a8b1509da69827f6a1321d26069c0bc40915d Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@microsoft.com>
Date: Thu, 1 Sep 2022 09:10:57 -0700
Subject: [PATCH 1/2] Add `$schema` to `cgmanifest.json`

---
 tools/java-source-utils/CGManifest.json | 49 +++++++++++++------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/tools/java-source-utils/CGManifest.json b/tools/java-source-utils/CGManifest.json
index eeac90a8f..c9f6ea763 100644
--- a/tools/java-source-utils/CGManifest.json
+++ b/tools/java-source-utils/CGManifest.json
@@ -1,26 +1,27 @@
 {
-    "Registrations": [
-        {
-            "Component": {
-                "Type": "maven",
-                "Maven": {
-                    "GroupId": "com.github.javaparser",
-                    "ArtifactId": "javaparser-core",
-                    "Version": "3.16.1"
-                }
-            },
-            "DevelopmentDependency":false
-        },
-        {
-            "Component": {
-                "Type": "maven",
-                "Maven": {
-                    "GroupId": "com.github.javaparser",
-                    "ArtifactId": "javaparser-symbol-solver-core",
-                    "Version": "3.16.1"
-                }
-            },
-            "DevelopmentDependency":false
+  "$schema": "https://json.schemastore.org/component-detection-manifest.json",
+  "Registrations": [
+    {
+      "Component": {
+        "Type": "maven",
+        "Maven": {
+          "GroupId": "com.github.javaparser",
+          "ArtifactId": "javaparser-core",
+          "Version": "3.16.1"
         }
-    ]
-}
\ No newline at end of file
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "maven",
+        "Maven": {
+          "GroupId": "com.github.javaparser",
+          "ArtifactId": "javaparser-symbol-solver-core",
+          "Version": "3.16.1"
+        }
+      },
+      "DevelopmentDependency": false
+    }
+  ]
+}

From b1670d33a5b9145a0c4d164abb8e2de7afd0e2a9 Mon Sep 17 00:00:00 2001
From: Jonathan Pryor <jonpryor@vt.edu>
Date: Tue, 6 Sep 2022 17:05:23 -0400
Subject: [PATCH 2/2] Allow CGManifest.json to verify

---
 tools/java-source-utils/CGManifest.json | 49 +++++++++++++------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/tools/java-source-utils/CGManifest.json b/tools/java-source-utils/CGManifest.json
index c9f6ea763..b05c7e02d 100644
--- a/tools/java-source-utils/CGManifest.json
+++ b/tools/java-source-utils/CGManifest.json
@@ -1,27 +1,28 @@
 {
-  "$schema": "https://json.schemastore.org/component-detection-manifest.json",
-  "Registrations": [
-    {
-      "Component": {
-        "Type": "maven",
-        "Maven": {
-          "GroupId": "com.github.javaparser",
-          "ArtifactId": "javaparser-core",
-          "Version": "3.16.1"
+    "$schema": "https://json.schemastore.org/component-detection-manifest.json",
+    "version": 1,
+    "registrations": [
+        {
+            "component": {
+                "type": "maven",
+                "maven": {
+                    "groupId": "com.github.javaparser",
+                    "artifactId": "javaparser-core",
+                    "version": "3.16.1"
+                }
+            },
+            "developmentDependency":false
+        },
+        {
+            "component": {
+                "type": "maven",
+                "maven": {
+                    "groupId": "com.github.javaparser",
+                    "artifactId": "javaparser-symbol-solver-core",
+                    "version": "3.16.1"
+                }
+            },
+            "developmentDependency":false
         }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "maven",
-        "Maven": {
-          "GroupId": "com.github.javaparser",
-          "ArtifactId": "javaparser-symbol-solver-core",
-          "Version": "3.16.1"
-        }
-      },
-      "DevelopmentDependency": false
-    }
-  ]
+    ]
 }