Resolve merge conflicts of individual code.json files

Signed-off-by: Natalia Luzuriaga <natalia.luzuriaga@cms.hhs.gov>

Author: natalialuzuriaga

agency-indexes/DoE/kokkos_spack.json

@@ -4,28 +4,27 @@
     },
     "date": {
         "created": "2020-05-14",
-        "metadataLastUpdated": "2020-05-14"
+        "metadataLastUpdated": "2022-07-28"
     },
-    "description": "A flexible package manager that supports multiple versions, configurations, platforms, and compilers.",
-    "laborHours": 133364.8,
+    "description": "The most up-to-date location for Spack packages for Kokkos and Kokkos Kernels.",
+    "laborHours": 0.0,
     "languages": [],
-    "name": "kokkos/spack",
+    "name": "Kokkos Spack",
     "organization": "Office of Scientific and Technical Information (OSTI)",
     "permissions": {
         "exemptionText": null,
         "licenses": [
             {
-                "URL": "https://github.com/kokkos/spack/blob/develop/COPYRIGHT",
-                "name": "Other"
+                "URL": "https://api.github.com/licenses/bsd-3-clause",
+                "name": "BSD-3-Clause"
             }
         ],
         "usageType": "openSource"
     },
-    "repositoryURL": "https://github.com/kokkos/spack",
+    "repositoryURL": "https://gitlab.osti.gov/osti-public/kokkos-spack",
     "status": "Development",
     "tags": [
         "DOE CODE",
         "Office of Scientific and Technical Information (OSTI)"
-    ],
-    "vcs": "git"
+    ]
 }

agency-indexes/DoE/magpie.json

@@ -1,31 +1,31 @@
 {
     "contact": {
-        "email": "christopher.kowalczyk@inl.gov"
+        "email": "holdensanchez2@llnl.gov"
     },
     "date": {
-        "created": "2018-04-24",
-        "metadataLastUpdated": "2023-03-15"
+        "created": "2018-07-30",
+        "metadataLastUpdated": "2020-02-05"
     },
-    "description": "Mesoscale Atomistic Glue Program for Integrated Execution",
-    "laborHours": 14333.6,
+    "description": "Magpie contains a number of scripts for running Big Data software in HPC environments, including Hadoop and Spark. There is support for Lustre, Slurm, Moab, Torque. and LSF.\n",
+    "laborHours": 52607.2,
     "languages": [],
-    "name": "magpie",
-    "organization": "Idaho National Laboratory (INL)",
+    "name": "Magpie",
+    "organization": "Lawrence Livermore National Laboratory (LLNL)",
     "permissions": {
         "exemptionText": null,
         "licenses": [
             {
-                "URL": "https://api.github.com/licenses/lgpl-2.1",
-                "name": "LGPL-2.1"
+                "URL": "https://api.github.com/licenses/gpl-2.0",
+                "name": "GPL-2.0"
             }
         ],
         "usageType": "openSource"
     },
-    "repositoryURL": "https://github.com/idaholab/magpie",
+    "repositoryURL": "https://github.com/LLNL/magpie",
     "status": "Production",
     "tags": [
         "DOE CODE",
-        "Idaho National Laboratory (INL)"
+        "Lawrence Livermore National Laboratory (LLNL)"
     ],
     "vcs": "git"
 }

agency-indexes/HHS/artemis.json

@@ -1,37 +1,37 @@
 {
-    "contact": {
-        "URL": "https://github.com/CDCgov",
-        "email": "cdcinfo@cdc.gov"
-    },
-    "date": {
-        "created": "2017-12-25",
-        "lastModified": "2020-10-15"
+    "name": "Artemis",
+    "description": "ACF Project led by Joanna Chan",
+    "status": "Development",
+    "permissions": {
+        "usageType": "openSource",
+        "licenses": null
     },
-    "description": "An application to assist Utah CDC's Newborn Screening Program",
-    "downloadURL": "https://api.github.com/repos/CDCgov/artemis/downloads",
-    "homepageURL": "https://github.com/CDCgov/artemis",
-    "laborHours": 0,
+    "organization": "Department of Health and Human Services",
+    "homepageURL": "https://github.com/HHS/Artemis",
+    "downloadURL": "https://api.github.com/repos/HHS/Artemis/downloads",
+    "repositoryURL": "https://github.com/HHS/Artemis.git",
+    "vcs": "git",
+    "laborHours": 0.0,
     "languages": [
-        "Ruby",
-        "HTML",
-        "CSS",
-        "JavaScript",
-        "Dockerfile"
+        "Jupyter Notebook",
+        "Python",
+        "Jinja",
+        "Shell"
     ],
-    "name": "artemis",
-    "organization": "Centers for Disease Control and Prevention",
-    "permissions": {
-        "licenses": [
-            {
-                "name": "NOASSERTION"
-            }
-        ],
-        "usageType": "openSource"
+    "date": {
+        "created": "2021-06-08",
+        "lastModified": "2022-01-10",
+        "metadataLastUpdated": "2022-03-22"
     },
-    "repositoryURL": "git://github.com/CDCgov/artemis.git",
-    "status": "Development",
     "tags": [
-        "github"
+        "ACF",
+        "Project",
+        "led",
+        "Joanna",
+        "Chan"
     ],
-    "vcs": "git"
+    "contact": {
+        "email": "HHS_GitHub_Service_Desk@hhs.gov",
+        "name": "U.S. Department of Health & Human Services"
+    }
 }