Skip to content

Commit eb53e47

Browse files
adliusadlius
committed
Merge branch 'hotfix/25.17.10'
2 parents 6c49b78 + 00f8bce commit eb53e47

12 files changed

Lines changed: 83 additions & 66 deletions

‎osf/metadata/definitions/datacite/datacite-v4.xsd‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- this file retrieved on 2024-02-02 from https://schema.datacite.org/meta/kernel-4.5/metadata.xsd -->
2+
<!-- this file retrieved on 2025-11-13 from https://schema.datacite.org/meta/kernel-4.6/metadata.xsd -->
33
<!-- Revision history
44
2010-08-26 Complete revision according to new common specification by the metadata work group after review. AJH, DTIC
55
2010-11-17 Revised to current state of kernel review, FZ, TIB
@@ -9,12 +9,13 @@
99
2013-07-24 v3.0: namespace: kernel-3.0; delete LastMetadataUpdate & MetadateVersionNumber; additions to controlled lists "contributorType", "dateType", "descriptionType", "relationType", "relatedIdentifierType" & "resourceType"; deletion of "StartDate" & "EndDate" from list "dateType" and "Film" from "resourceType"; allow arbitrary order of elements; allow optional wrapper elements to be empty; include xml:lang attribute for title, subject & description; include attribute schemeURI for nameIdentifier of creator, contributor & subject; added new attributes "relatedMetadataScheme", "schemeURI" & "schemeType" to relatedIdentifier; included new property "geoLocation"
1010
2014-08-20 v3.1: additions to controlled lists "relationType", contributorType" and "relatedIdentifierType"; introduction of new child element "affiliation" to "creator" and "contributor"
1111
2016-09-19 v4.0: namespace: kernel-4.0; makes "resourceType" required field, added optional "givenName" and "familyName" to creator and contributor, added "funderReference", added "valueURI" for subject, added "geoLocationPolygon"
12-
2017-10-23 v4.1: Addition of dateType value "Other", relationType values "Describes", "IsDescribedBy", "HasVersion", "IsVersionOf", "Requires", "IsRequiredBy", resourceType value "DataPaper", new subproperties "dateInformation", "inPolygonPoint", new attribute "nameType", optional attribute "resourceTypeGeneral" for relatedIdentifier
12+
2017-10-23 v4.1: Addition of dateType value "Other", relationType values "Describes", "IsDescribedBy", "HasVersion", "IsVersionOf", "Requires", "IsRequiredBy", resourceType value "DataPaper", new subproperties "dateInformation", "inPolygonPoint", new attribute "nameType", optional attribute "resourceTypeGeneral" for relatedIdentifier
1313
2018-09-08 v4.1.1 Make schema 4.1 backwards compatible to 4.0 by allowing geolocation elements in any order
1414
2019-02-14 v4.2: Addition of dateType value "Withdrawn", relationType values "Obsoletes", "isObsoletedBy", addition of new subproperties for Rights: rightsIdentifier, rightsIdentifierScheme, schemeURI, addition of the XML language attribute to the properties Creator, Contributor and Publisher for organizational names, don't check format of DOI
15-
2019-07-13 v4.3: Addition of new subproperties for Affiliation: "affiliationIdentifier", "affiliationIdentifierScheme", "schemeURI", addition of new sub-property for funderIdentifier: "schemeURI", addition of new funderIdentifierScheme: "ROR", added documentation for nameIdentifier
16-
2021-03-08 v4.4: Addition of new property relatedItem, relationType value "isPublishedIn", subject subproperty "classificationCode", controlled list "numberType", additional 13 properties for controlled list "resourceType"
17-
2024-01-22 v4.5: Addition of new subproperties for publisher: "publisherIdentifier", "publisherIdentifierScheme", and "schemeURI"; addition of new resourceTypeGeneral values "Instrument" and "StudyRegistration"; addition of new relationType values "Collects" and "IsCollectedBy".-->
15+
2019-07-13 v4.3: Addition of new subproperties for Affiliation: "affiliationIdentifier", "affiliationIdentifierScheme", "schemeURI", addition of new sub-property for funderIdentifier: "schemeURI", addition of new funderIdentifierScheme: "ROR", added documentation for nameIdentifier
16+
2021-03-08 v4.4: Addition of new property relatedItem, relationType value "isPublishedIn", subject subproperty "classificationCode", controlled list "numberType", additional 13 properties for controlled list "resourceType"
17+
2024-01-22 v4.5: Addition of new subproperties for publisher: "publisherIdentifier", "publisherIdentifierScheme", and "schemeURI"; addition of new resourceTypeGeneral values "Instrument" and "StudyRegistration"; addition of new relationType values "Collects" and "IsCollectedBy".
18+
2024-12-05 v4.6: Addition of new resourceTypeGeneral values "Award" and "Project"; addiition of new relatedIdentifierType values "CSTR" and "RRID"; addition of new contributorType "Translator"; addition of new relationTypes "HasTranslation" and "IsTranslationOf"; addition of new dateType "Coverage". -->
1819
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://datacite.org/schema/kernel-4" targetNamespace="http://datacite.org/schema/kernel-4" elementFormDefault="qualified" xml:lang="EN">
1920
<xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="include/xml.xsd" />
2021
<xs:include schemaLocation="include/datacite-titleType-v4.xsd" />
@@ -466,7 +467,7 @@ Use the complete title of a license and include version information if applicabl
466467
<xs:sequence>
467468
<xs:element name="creator" minOccurs="0" maxOccurs="unbounded">
468469
<xs:annotation>
469-
<xs:documentation>The institution or person responsible for creating the
470+
<xs:documentation>The institution or person responsible for creating the
470471
related resource. To supply multiple creators, repeat this property.
471472
</xs:documentation>
472473
</xs:annotation>
@@ -564,8 +565,8 @@ Use the complete title of a license and include version information if applicabl
564565
<xs:sequence>
565566
<xs:element name="contributor" minOccurs="0" maxOccurs="unbounded">
566567
<xs:annotation>
567-
<xs:documentation>The institution or person responsible for collecting,
568-
managing, distributing, or otherwise contributing to the development of
568+
<xs:documentation>The institution or person responsible for collecting,
569+
managing, distributing, or otherwise contributing to the development of
569570
the resource.</xs:documentation>
570571
</xs:annotation>
571572
<xs:complexType>
@@ -638,27 +639,27 @@ Use the complete title of a license and include version information if applicabl
638639
<!-- pattern for iso8601 dateTime -->
639640
<xs:pattern value="(-)?[0-9]{4}(-[0-9]{2})?(-[0-9]{2})?(T([0-9]{2}:){2}[0-9]{2}Z)?" />
640641

641-
<!--
642-
The following pattern is for year (yyyy) or year-month (yyyy-mm)
642+
<!--
643+
The following pattern is for year (yyyy) or year-month (yyyy-mm)
643644
The last or last two digits of year may be '?' meaning "one year in that range but not sure which year", for example 19?? means some year from 1990 to 1999. Similarly month may be '??' so that 2004-?? "means some month in 2004". And the entire string may end with '?' or '~' for "uncertain" or "approximate".
644645
Hyphen must separate year and month.
645646
-->
646647
<xs:pattern value="\d{2}(\d{2}|\?\?|\d(\d|\?))(-(\d{2}|\?\?))?~?\??" />
647-
<!--
648-
The following pattern is for yearMonthDay - yyyymmdd, where 'dd' may be '??' so '200412??' means "some day during the month of 12/2004".
649-
The whole string may be followed by '?' or '~' to mean "questionable" or "approximate". Hyphens are not allowed for this pattern.
648+
<!--
649+
The following pattern is for yearMonthDay - yyyymmdd, where 'dd' may be '??' so '200412??' means "some day during the month of 12/2004".
650+
The whole string may be followed by '?' or '~' to mean "questionable" or "approximate". Hyphens are not allowed for this pattern.
650651
-->
651652
<xs:pattern value="\d{6}(\d{2}|\?\?)~?\??" />
652-
<!--
653+
<!--
653654
654-
The following pattern is for date and time with T separator:'yyyymmddThhmmss'.
655-
Hyphens in date and colons in time not allowed for this pattern.
655+
The following pattern is for date and time with T separator:'yyyymmddThhmmss'.
656+
Hyphens in date and colons in time not allowed for this pattern.
656657
-->
657658
<xs:pattern value="\d{8}T\d{6}" />
658-
<!--
659+
<!--
659660
660661
The following pattern is for a date range. in years: 'yyyy/yyyy'; or year/month: yyyy-mm/yyyy-mm, or year/month/day: yyyy-mm-dd/yyyy-mm-dd. Beginning or end of range value may be 'unknown'. End of range value may be 'open'.
661-
Hyphens mandatory when month is present.
662+
Hyphens mandatory when month is present.
662663
-->
663664
<xs:pattern value="((-)?(\d{4}(-\d{2})?(-\d{2})?)|unknown)/((-)?(\d{4}(-\d{2})?(-\d{2})?)|unknown|open)" />
664665
</xs:restriction>

‎osf/metadata/definitions/datacite/include/datacite-contributorType-v4.xsd‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- this file retrieved on 2024-02-02 from https://schema.datacite.org/meta/kernel-4.5/include/datacite-contributorType-v4.xsd -->
2+
<!-- this file retrieved on 2025-11-13 from https://schema.datacite.org/meta/kernel-4.6/include/datacite-contributorType-v4.xsd -->
33
<!-- Version 1.0 - Created 2011-01-13 - FZ, TIB, Germany
44
2013-05 v3.0: Addition of ID to simpleType element, added values "ResearchGroup" & "Other"
55
2014-08-20 v3.1: Addition of value "DataCurator"
6-
2015-05-14 v4.0 dropped value "Funder", use new "funderReference" -->
6+
2015-05-14 v4.0 dropped value "Funder", use new "funderReference"
7+
2024-12-05 v4.6: Addition of value "Translator" -->
78
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://datacite.org/schema/kernel-4" targetNamespace="http://datacite.org/schema/kernel-4" elementFormDefault="qualified">
89
<xs:simpleType name="contributorType" id="contributorType">
910
<xs:annotation>
@@ -30,6 +31,7 @@
3031
<xs:enumeration value="Researcher" />
3132
<xs:enumeration value="Sponsor" />
3233
<xs:enumeration value="Supervisor" />
34+
<xs:enumeration value="Translator"/>
3335
<xs:enumeration value="WorkPackageLeader" />
3436
</xs:restriction>
3537
</xs:simpleType>

‎osf/metadata/definitions/datacite/include/datacite-dateType-v4.xsd‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- this file retrieved on 2024-02-02 from https://schema.datacite.org/meta/kernel-4.5/include/datacite-dateType-v4.xsd -->
2+
<!-- this file retrieved on 2025-11-13 from https://schema.datacite.org/meta/kernel-4.6/include/datacite-dateType-v4.xsd -->
33
<!-- Version 1.0 - Created 2011-01-13 - FZ, TIB, Germany
44
2013-05 v3.0: Addition of ID to simpleType element; addition of value "Collected"; deleted "StartDate" & "EndDate"
55
2017-10-23 v4.1: Addition of value "Other"
6-
2019-02-14 v4.2: Addition of value "Withdrawn"-->
6+
2019-02-14 v4.2: Addition of value "Withdrawn"
7+
2024-12-05 v4.6: Addition of value "Coverage" -->
78
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://datacite.org/schema/kernel-4" targetNamespace="http://datacite.org/schema/kernel-4" elementFormDefault="qualified">
89
<xs:simpleType name="dateType" id="dateType">
910
<xs:annotation>
@@ -14,6 +15,7 @@
1415
<xs:enumeration value="Available" />
1516
<xs:enumeration value="Collected" />
1617
<xs:enumeration value="Copyrighted" />
18+
<xs:enumeration value="Coverage"/>
1719
<xs:enumeration value="Created" />
1820
<xs:enumeration value="Issued" />
1921
<xs:enumeration value="Other" />

‎osf/metadata/definitions/datacite/include/datacite-descriptionType-v4.xsd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- this file retrieved on 2024-02-02 from https://schema.datacite.org/meta/kernel-4.5/include/datacite-descriptionType-v4.xsd -->
2+
<!-- this file retrieved on 2025-11-13 from https://schema.datacite.org/meta/kernel-4.6/include/datacite-descriptionType-v4.xsd -->
33
<!-- Version 1.0 - Created 2011-01-13 - FZ, TIB, Germany
44
2013-05 v3.0: Addition of ID to simpleType element, addition of value "Methods"
55
2015-02-12 v4.0: Addition of value "TechnicalInfo"-->

‎osf/metadata/definitions/datacite/include/datacite-funderIdentifierType-v4.xsd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- this file retrieved on 2024-02-02 from https://schema.datacite.org/meta/kernel-4.5/include/datacite-funderIdentifierType-v4.xsd -->
2+
<!-- this file retrieved on 2025-11-13 from https://schema.datacite.org/meta/kernel-4.6/include/datacite-funderIdentifierType-v4.xsd -->
33
<!-- Version 1.0 - Created 2016-05-14 -->
44
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://datacite.org/schema/kernel-4" targetNamespace="http://datacite.org/schema/kernel-4" elementFormDefault="qualified">
55
<xs:simpleType name="funderIdentifierType" id="funderIdentifierType">

‎osf/metadata/definitions/datacite/include/datacite-nameType-v4.xsd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- this file retrieved on 2024-02-02 from https://schema.datacite.org/meta/kernel-4.5/include/datacite-nameType-v4.xsd -->
2+
<!-- this file retrieved on 2025-11-13 from https://schema.datacite.org/meta/kernel-4.6/include/datacite-nameType-v4.xsd -->
33
<!-- Version 4.1 - Created 2017-10-23 -->
44
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://datacite.org/schema/kernel-4" targetNamespace="http://datacite.org/schema/kernel-4" elementFormDefault="qualified">
55
<xs:simpleType name="nameType" id="nameType">

‎osf/metadata/definitions/datacite/include/datacite-numberType-v4.xsd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- this file retrieved on 2024-02-02 from https://schema.datacite.org/meta/kernel-4.5/include/datacite-numberType-v4.xsd -->
2+
<!-- this file retrieved on 2025-11-13 from https://schema.datacite.org/meta/kernel-4.6/include/datacite-numberType-v4.xsd -->
33
<!-- Version 4.4 - Created 2021-03-05 -->
44
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://datacite.org/schema/kernel-4" targetNamespace="http://datacite.org/schema/kernel-4" elementFormDefault="qualified">
55
<xs:simpleType name="numberType" id="numberType">

‎osf/metadata/definitions/datacite/include/datacite-relatedIdentifierType-v4.xsd‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- this file retrieved on 2024-02-02 from https://schema.datacite.org/meta/kernel-4.5/include/datacite-relatedIdentifierType-v4.xsd -->
2+
<!-- this file retrieved on 2025-11-13 from https://schema.datacite.org/meta/kernel-4.6/include/datacite-relatedIdentifierType-v4.xsd -->
33
<!-- Version 1.0 - Created 2011-01-13 - FZ, TIB, Germany
44
2013-05 v3.0: Addition of ID to simpleType element; addition of value "PMID"
55
2014-08-20 v3.1: Addition of values "arxiv" and "bibcode"
6-
2015-02-12 v4.0 Addition of value "IGSN"
7-
2019-02-14 v4.2 Addition of value "w3id" -->
6+
2015-02-12 v4.0: Addition of value "IGSN"
7+
2019-02-14 v4.2: Addition of value "w3id"
8+
2024-12-05 v4.5: Addition of values "CSTR", "RRID" -->
89
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://datacite.org/schema/kernel-4" targetNamespace="http://datacite.org/schema/kernel-4" elementFormDefault="qualified">
910
<xs:simpleType name="relatedIdentifierType" id="relatedIdentifierType">
1011
<xs:annotation>
@@ -14,6 +15,7 @@
1415
<xs:enumeration value="ARK" />
1516
<xs:enumeration value="arXiv" />
1617
<xs:enumeration value="bibcode" />
18+
<xs:enumeration value="CSTR"/>
1719
<xs:enumeration value="DOI" />
1820
<xs:enumeration value="EAN13" />
1921
<xs:enumeration value="EISSN" />
@@ -26,6 +28,7 @@
2628
<xs:enumeration value="LSID" />
2729
<xs:enumeration value="PMID" />
2830
<xs:enumeration value="PURL" />
31+
<xs:enumeration value="RRID"/>
2932
<xs:enumeration value="UPC" />
3033
<xs:enumeration value="URL" />
3134
<xs:enumeration value="URN" />

‎osf/metadata/definitions/datacite/include/datacite-relationType-v4.xsd‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- this file retrieved on 2024-02-02 from https://schema.datacite.org/meta/kernel-4.5/include/datacite-relationType-v4.xsd -->
2+
<!-- this file retrieved on 2025-11-13 from https://schema.datacite.org/meta/kernel-4.6/include/datacite-relationType-v4.xsd -->
33
<!--
44
2011-01-13 v1.0 - FZ, TIB, Germany
55
2013-05 v3.0: Addition of ID to simpleType element, addition of values "IsIdenticalTo", "HasMetadata" & "IsMetadataFor"
66
2014-08-20 v3.1: Addition of values "Reviews" & "IsReviewedBy" and "IsDerivedFrom" & "IsSourceOf"
7-
2017-10-23 v.4.1: Addition of values "Describes", "IsDescribedBy", "HasVersion", "IsVersionOf", "Requires", "IsRequiredBy"
8-
2019-02-14 v.4.2: Addition of values "Obsoletes", "IsObsoletedBy"
9-
2021-03-05 v.4.4: Addition of value "IsPublishedIn" -->
7+
2017-10-23 v4.1: Addition of values "Describes", "IsDescribedBy", "HasVersion", "IsVersionOf", "Requires", "IsRequiredBy"
8+
2019-02-14 v4.2: Addition of values "Obsoletes", "IsObsoletedBy"
9+
2021-03-05 v4.4: Addition of value "IsPublishedIn"
10+
2024-01-22 v4.5: Addition of values "Collects, "IsCollectedBy"
11+
2024-12-05 v4.6: Addition of values "HasTranslation", "IsTranslationOf" -->
1012
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://datacite.org/schema/kernel-4" targetNamespace="http://datacite.org/schema/kernel-4" elementFormDefault="qualified">
1113
<xs:simpleType name="relationType" id="relationType">
1214
<xs:annotation>
@@ -49,6 +51,8 @@
4951
<xs:enumeration value="IsObsoletedBy" />
5052
<xs:enumeration value="Collects" />
5153
<xs:enumeration value="IsCollectedBy" />
54+
<xs:enumeration value="HasTranslation"/>
55+
<xs:enumeration value="IsTranslationOf"/>
5256
</xs:restriction>
5357
</xs:simpleType>
5458
</xs:schema>

‎osf/metadata/definitions/datacite/include/datacite-resourceType-v4.xsd‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- this file retrieved on 2024-02-02 from https://schema.datacite.org/meta/kernel-4.5/include/datacite-resourceType-v4.xsd -->
2+
<!-- this file retrieved on 2025-11-13 from https://schema.datacite.org/meta/kernel-4.6/include/datacite-resourceType-v4.xsd -->
33
<!-- Version 1.0 - Created 2011-01-13 - FZ, TIB, Germany
44
2013-05 v3.0: Addition of ID to simpleType element; added values "Audiovisual", "Workflow" & "Other"; deleted value "Film"
55
2017-10-23 v4.1: Addition of value "DataPaper"
66
2020-01-14 v4.4: Addition of values "Book", "Book Chapter", "ComputationalNotebook", "ConferencePaper", "ConferenceProceeding".
7-
"Dissertation", "Journal", "JournalArticle", "OutputManagementPlan", "PeerReview", "Preprint", "Report" -->
7+
"Dissertation", "Journal", "JournalArticle", "OutputManagementPlan", "PeerReview", "Preprint", "Report"
8+
2024-12-05 v4.6: Addition of values "Award", "Project" -->
89
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://datacite.org/schema/kernel-4" targetNamespace="http://datacite.org/schema/kernel-4" elementFormDefault="qualified">
910
<xs:simpleType name="resourceType" id="resourceType">
1011
<xs:annotation>
1112
<xs:documentation>The general type of a resource.</xs:documentation>
1213
</xs:annotation>
1314
<xs:restriction base="xs:string">
1415
<xs:enumeration value="Audiovisual" />
16+
<xs:enumeration value="Award"/>
1517
<xs:enumeration value="Book" />
1618
<xs:enumeration value="BookChapter" />
1719
<xs:enumeration value="Collection" />
@@ -32,6 +34,7 @@
3234
<xs:enumeration value="PeerReview" />
3335
<xs:enumeration value="PhysicalObject" />
3436
<xs:enumeration value="Preprint" />
37+
<xs:enumeration value="Project"/>
3538
<xs:enumeration value="Report" />
3639
<xs:enumeration value="Service" />
3740
<xs:enumeration value="Software" />

0 commit comments

Comments
 (0)