Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CMR-10173: Update UMM-C for Web Unitification round 2 #2184

Merged
merged 14 commits into from
Nov 1, 2024
Merged

CMR-10173: Update UMM-C for Web Unitification round 2 #2184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9174681
add copy of 1.18.1 as 1.18.2
jmaeng72 Oct 24, 2024
1845d8d
adding enums
jmaeng72 Oct 25, 2024
be169a6
update migration func to substitute correct enums
jmaeng72 Oct 25, 2024
be47588
fix migrate and migrate unit tests
jmaeng72 Oct 28, 2024
5209bc5
update translations
jmaeng72 Oct 29, 2024
80fb07d
fix formatting and remove print
jmaeng72 Oct 29, 2024
834b333
update translation maps
jmaeng72 Oct 29, 2024
3f758f6
update to migrate collectionprogress down to planned instead of complete
jmaeng72 Oct 29, 2024
43180f1
add debugging lines to failing tests
jmaeng72 Oct 30, 2024
0cd68cd
update code lists for associated doi types
jmaeng72 Oct 30, 2024
be2e183
remove TODO comment
jmaeng72 Oct 30, 2024
78800dd
update test data with 1.18.2
jmaeng72 Oct 30, 2024
cfb7d21
update collection progress superseded to become complete during migra…
jmaeng72 Nov 1, 2024
a9443fa
Merge branch 'master' of https://github.com/nasa/Common-Metadata-Repo…
jmaeng72 Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common-app-lib/src/cmr/common_app/config.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.1"})
{:default "1.18.2"})

(defconfig launchpad-token-enforced
"Flag for whether or not launchpad token is enforced."
Expand Down
4 changes: 2 additions & 2 deletions ingest-app/resources/CMR-7557/test_data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,8 @@
} ]
},
"MetadataSpecification": {
"URL": "https://cdn.earthdata.nasa.gov/umm/collection/v1.18.1",
"URL": "https://cdn.earthdata.nasa.gov/umm/collection/v1.18.2",
"Name": "UMM-C",
"Version": "1.18.1"
"Version": "1.18.2"
}
}
4 changes: 2 additions & 2 deletions ingest-app/resources/CMR-7647/CMR-7647.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,9 +621,9 @@
} ]
} ],
"MetadataSpecification" : {
"URL" : "https://cdn.earthdata.nasa.gov/umm/collection/v1.18.1",
"URL" : "https://cdn.earthdata.nasa.gov/umm/collection/v1.18.2",
"Name" : "UMM-C",
"Version" : "1.18.1"
"Version" : "1.18.2"
},
"ArchiveAndDistributionInformation" : {
"FileDistributionInformation" : [ {
Expand Down
8 changes: 4 additions & 4 deletions schemas/resources/schemas/collection-draft/v1.0.0/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,8 +264,8 @@
"DOI" : "10.1234/DOIID",
"Authority" : "https://doi.org/"
},
"ShortName" : "Mapping Short Name 1.18.1",
"EntryTitle" : "Mapping Example for UMM-C 1.18.1",
"ShortName" : "Mapping Short Name 1.18.2",
"EntryTitle" : "Mapping Example for UMM-C 1.18.2",
"PublicationReferences" : [ {
"OnlineResource" : {
"Linkage" : "http://www.yahoo.com",
Expand Down Expand Up @@ -814,9 +814,9 @@
"LongName" : "MUSES"
} ],
"MetadataSpecification" : {
"URL" : "https://cdn.earthdata.nasa.gov/umm/collection/v1.18.1",
"URL" : "https://cdn.earthdata.nasa.gov/umm/collection/v1.18.2",
"Name" : "UMM-C",
"Version" : "1.18.1"
"Version" : "1.18.2"
},
"ArchiveAndDistributionInformation" : {
"FileArchiveInformation" : [ {
Expand Down
5 changes: 5 additions & 0 deletions umm-lib/resources/schema/dif10/UmmCommon_1.2.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,9 @@ technical contact
<xs:enumeration value="PLANNED"/>
<xs:enumeration value="IN WORK"/>
<xs:enumeration value="COMPLETE"/>
<xs:enumeration value="PREPRINT"/>
<xs:enumeration value="INREVIEW"/>
<xs:enumeration value="SUPERSEDED"/>
jmaeng72 marked this conversation as resolved.
Show resolved Hide resolved
</xs:restriction>
</xs:simpleType>

Expand Down Expand Up @@ -580,6 +583,8 @@ technical contact
<xs:enumeration value="Parent Dataset"/>
<xs:enumeration value="Related Dataset"/>
<xs:enumeration value="Other"/>
<xs:enumeration value="IsPreviousVersionOf"/>
<xs:enumeration value="IsNewVersionOf"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="AssociatedDOITypeOtherEnum">
Expand Down
2 changes: 2 additions & 0 deletions umm-lib/resources/schema/echo10/MetadataCommon.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -817,6 +817,8 @@
<xs:enumeration value="Parent Dataset"/>
<xs:enumeration value="Related Dataset"/>
<xs:enumeration value="Other"/>
<xs:enumeration value="IsPreviousVersionOf"/>
<xs:enumeration value="IsNewVersionOf"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
Expand Down
12 changes: 12 additions & 0 deletions umm-lib/resources/schema/iso_mends/resources/Codelist/eosCodelists.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,18 @@
<gml:identifier codeSpace="gov.nasa.esdis.umm">Other</gml:identifier>
</gmx:CodeDefinition>
</gmx:codeEntry>
<gmx:codeEntry>
<gmx:CodeDefinition gml:id="EOS_AssociationTypeCode_isPreviousVersionOf">
<gml:description>This collection has been superseded by the Associated DOI.</gml:description>
<gml:identifier codeSpace="gov.nasa.esdis.umm">Is_Previous_Version_Of</gml:identifier>
</gmx:CodeDefinition>
</gmx:codeEntry>
<gmx:codeEntry>
<gmx:CodeDefinition gml:id="EOS_AssociationTypeCode_isNewVersionOf">
<gml:description>The collection supersedes the Associated DOI. </gml:description>
<gml:identifier codeSpace="gov.nasa.esdis.umm">Is_New_Version_Of</gml:identifier>
</gmx:CodeDefinition>
</gmx:codeEntry>
<gmx:codeEntry>
<gmx:CodeDefinition gml:id="EOS_AssociationTypeCode_doiPreviousVersion">
<gml:description>part of a set of larger works that is identified by a digital object identifier.</gml:description>
Expand Down
12 changes: 12 additions & 0 deletions umm-lib/resources/schema/iso_smap/resources/Codelist/eosCodelists.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,18 @@
<gml:identifier codeSpace="gov.nasa.esdis.umm">Other</gml:identifier>
</gmx:CodeDefinition>
</gmx:codeEntry>
<gmx:codeEntry>
<gmx:CodeDefinition gml:id="EOS_AssociationTypeCode_isPreviousVersionOf">
<gml:description>This collection has been superseded by the Associated DOI.</gml:description>
<gml:identifier codeSpace="gov.nasa.esdis.umm">Is_Previous_Version_Of</gml:identifier>
</gmx:CodeDefinition>
</gmx:codeEntry>
<gmx:codeEntry>
<gmx:CodeDefinition gml:id="EOS_AssociationTypeCode_isNewVersionOf">
<gml:description>The collection supersedes the Associated DOI. </gml:description>
<gml:identifier codeSpace="gov.nasa.esdis.umm">Is_New_Version_Of</gml:identifier>
</gmx:CodeDefinition>
</gmx:codeEntry>
<gmx:codeEntry>
<gmx:CodeDefinition gml:id="EOS_AssociationTypeCode_doiPreviousVersion">
<gml:description>part of a set of larger works that is identified by a digital object identifier.</gml:description>
Expand Down
Loading