Merge branch 'master' of https://github.com/nasa/Common-Metadata-Repo…

…sitory into CMR-10310-2
nasa · Feb 5, 2025 · 36985aa · 36985aa
2 parents 85eec19 + d04c0e6
commit 36985aa
Show file tree

Hide file tree

Showing 10 changed files with 3,690 additions and 88 deletions.
diff --git a/common-app-lib/src/cmr/common_app/config.clj b/common-app-lib/src/cmr/common_app/config.clj
@@ -8,7 +8,7 @@
 (defconfig collection-umm-version
   "Defines the latest collection umm version accepted by ingest - it's the latest official version.
    This environment variable needs to be manually set when newer UMM version becomes official"
-  {:default "1.18.2"})
+  {:default "1.18.3"})
 
 (defconfig launchpad-token-enforced
   "Flag for whether or not launchpad token is enforced."

diff --git a/schemas/resources/schemas/collection-draft/v1.0.0/metadata.json b/schemas/resources/schemas/collection-draft/v1.0.0/metadata.json
@@ -264,8 +264,8 @@
         "DOI" : "10.1234/DOIID",
         "Authority" : "https://doi.org/"
       },
-      "ShortName" : "Mapping Short Name 1.18.2",
-      "EntryTitle" : "Mapping Example for UMM-C 1.18.2",
+      "ShortName" : "Mapping Short Name 1.18.3",
+      "EntryTitle" : "Mapping Example for UMM-C 1.18.3",
       "PublicationReferences" : [ {
         "OnlineResource" : {
           "Linkage" : "http://www.yahoo.com",
@@ -814,9 +814,9 @@
         "LongName" : "MUSES"
       } ],
       "MetadataSpecification" : {
-        "URL" : "https://cdn.earthdata.nasa.gov/umm/collection/v1.18.2",
+        "URL" : "https://cdn.earthdata.nasa.gov/umm/collection/v1.18.3",
         "Name" : "UMM-C",
-        "Version" : "1.18.2"
+        "Version" : "1.18.3"
       },
       "ArchiveAndDistributionInformation" : {
         "FileArchiveInformation" : [ {

diff --git a/system-int-test/test/cmr/system_int_test/ingest/collection/collection_ingest_test.clj b/system-int-test/test/cmr/system_int_test/ingest/collection/collection_ingest_test.clj
@@ -5,7 +5,7 @@
   (:require
    [clojure.java.io :as io]
    [clojure.string :as string]
-   [clojure.test :refer :all]
+   [clojure.test :refer [are deftest is testing use-fixtures]]
    [cmr.access-control.test.util :as test-util]
    [cmr.common-app.config :as common-config]
    [cmr.common-app.test.side-api :as side]
@@ -792,7 +792,7 @@
   (testing "Ingest of a json collection with invalid mimetypes. This verifies that we validate mimetypes against kms."
     (let [coll-metadata (slurp (io/resource "CMR-7647/CMR-7647.json"))
           {:keys [status errors]} (ingest/ingest-concept
-                                   (ingest/concept :collection "PROV1" "foo" :umm-json coll-metadata)
+                                   (ingest/concept :collection "PROV1" "foo" {:format :umm-json :version "1.18.2"} coll-metadata)
                                    {:validate-keywords false})]
       (is (= 422 status))
       (is (= [["Related URL Content Type, Type, and Subtype [ContactPerson1: BadURLContentType1>HOME PAGE>] are not a valid set together."]

diff --git a/system-int-test/test/cmr/system_int_test/ingest/collection/collection_translation_test.clj b/system-int-test/test/cmr/system_int_test/ingest/collection/collection_translation_test.clj
@@ -121,7 +121,8 @@
       (is (= 200 status))))
 
   (testing (format "Translating umm-json to iso19115 produces the right codelist")
-    (let [input-format :umm-json
+    (let [input-format {:format :umm-json
+                        :version "1.18.2"}
           output-format :iso19115
           options {:skip-sanitize-umm-c false}
           input-json (slurp (io/resource "CMR-7557/test_data.json"))

diff --git a/umm-spec-lib/resources/json-schemas/collection/umm/v1.18.3/umm-c-json-schema.json b/umm-spec-lib/resources/json-schemas/collection/umm/v1.18.3/umm-c-json-schema.json