From a97c582f4a04b403ba33521f452b4f8ac57a6d05 Mon Sep 17 00:00:00 2001
From: Arsenios Chatzigeorgiou <49944135+arschat@users.noreply.github.com>
Date: Fri, 16 Feb 2024 09:31:25 +0000
Subject: [PATCH 1/9] Add organ_donor field in donor_organism

---
 docs/jsonBrowser/type.md                         | 1 +
 json_schema/type/biomaterial/donor_organism.json | 7 +++++++
 json_schema/update_log.csv                       | 1 +
 3 files changed, 9 insertions(+)

diff --git a/docs/jsonBrowser/type.md b/docs/jsonBrowser/type.md
index c6b8b98d8..1ab52e6e0 100644
--- a/docs/jsonBrowser/type.md
+++ b/docs/jsonBrowser/type.md
@@ -435,6 +435,7 @@ height | Height of organism in Height unit. | string | no |  | Height |  | 160;
 height_unit | The unit in which Height is expressed. | object | no | [See module  length_unit_ontology](module.md#length-unit-ontology) | Height unit |  | 
 weight | Weight of organism in Weight unit. | string | no |  | Weight |  | 60; 40-60
 weight_unit | The unit in which Weight is expressed. | object | no | [See module  mass_unit_ontology](module.md#mass-unit-ontology) | Weight unit |  | 
+organ_donor | Whether organism has donated their organs. | boolean | no |  | Organ donor |  | yes; no
 
 ## Organoid
 _Information about an organoid biomaterial._
diff --git a/json_schema/type/biomaterial/donor_organism.json b/json_schema/type/biomaterial/donor_organism.json
index 6bab6b746..a23f5d08e 100644
--- a/json_schema/type/biomaterial/donor_organism.json
+++ b/json_schema/type/biomaterial/donor_organism.json
@@ -178,6 +178,13 @@
             "type": "object",
             "$ref": "module/ontology/mass_unit_ontology.json",
             "user_friendly": "Weight unit"
+        },
+        "organ_donor": {
+            "description": "Whether organism has donated their organs.",
+            "type": "boolean",
+            "user_friendly": "Organ donor",
+            "guidelines": "Should be one of: yes, or no.",
+            "example": "yes; no"
         }
     }
 }
diff --git a/json_schema/update_log.csv b/json_schema/update_log.csv
index 3231ff199..75f7ec18f 100644
--- a/json_schema/update_log.csv
+++ b/json_schema/update_log.csv
@@ -1 +1,2 @@
 Schema,Change type,Change message,Version,Date
+type/biomaterial/donor_organism,minor,Added organ_donor field in donor_organism Fixes#1547",,
\ No newline at end of file

From 4a09fcb8c178e690f3adb01c495122fb45f61b60 Mon Sep 17 00:00:00 2001
From: Arsenios Chatzigeorgiou <49944135+arschat@users.noreply.github.com>
Date: Fri, 1 Mar 2024 13:53:42 +0000
Subject: [PATCH 2/9] Changed organ_donor description

---
 docs/jsonBrowser/type.md                         | 2 +-
 json_schema/type/biomaterial/donor_organism.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/jsonBrowser/type.md b/docs/jsonBrowser/type.md
index 1ab52e6e0..fcd9f1a16 100644
--- a/docs/jsonBrowser/type.md
+++ b/docs/jsonBrowser/type.md
@@ -435,7 +435,7 @@ height | Height of organism in Height unit. | string | no |  | Height |  | 160;
 height_unit | The unit in which Height is expressed. | object | no | [See module  length_unit_ontology](module.md#length-unit-ontology) | Height unit |  | 
 weight | Weight of organism in Weight unit. | string | no |  | Weight |  | 60; 40-60
 weight_unit | The unit in which Weight is expressed. | object | no | [See module  mass_unit_ontology](module.md#mass-unit-ontology) | Weight unit |  | 
-organ_donor | Whether organism has donated their organs. | boolean | no |  | Organ donor |  | yes; no
+organ_donor | Whether biomaterial was collected after extraction for organ transplantation. | boolean | no |  | Organ donor |  | yes; no
 
 ## Organoid
 _Information about an organoid biomaterial._
diff --git a/json_schema/type/biomaterial/donor_organism.json b/json_schema/type/biomaterial/donor_organism.json
index a23f5d08e..a910d548e 100644
--- a/json_schema/type/biomaterial/donor_organism.json
+++ b/json_schema/type/biomaterial/donor_organism.json
@@ -180,7 +180,7 @@
             "user_friendly": "Weight unit"
         },
         "organ_donor": {
-            "description": "Whether organism has donated their organs.",
+            "description": "Whether biomaterial was collected after extraction for organ transplantation.",
             "type": "boolean",
             "user_friendly": "Organ donor",
             "guidelines": "Should be one of: yes, or no.",

From b4ca9eac3925a01b75964dd575b677605047c56d Mon Sep 17 00:00:00 2001
From: Arsenios Chatzigeorgiou <49944135+arschat@users.noreply.github.com>
Date: Wed, 6 Mar 2024 18:10:37 +0000
Subject: [PATCH 3/9] Revert "Merge branch 'master' of
 github.com:HumanCellAtlas/metadata-schema into ac-organ-donor-Issue1547"

This reverts commit 37983bf375913fca2255c392fae7480ba9d28620, reversing
changes made to 4a09fcb8c178e690f3adb01c495122fb45f61b60.
---
 changelog.md                          |  5 +----
 docs/jsonBrowser/required_fields.md   |  1 -
 docs/jsonBrowser/type.md              |  1 -
 json_schema/property_migrations.json  |  7 -------
 json_schema/type/project/project.json | 15 +--------------
 json_schema/versions.json             |  4 ++--
 6 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/changelog.md b/changelog.md
index fa9396d64..28b2299d3 100644
--- a/changelog.md
+++ b/changelog.md
@@ -6,11 +6,8 @@ Starting after v5.0.0 release, updates will be declared for schemas independentl
 and (starting with v4.0.0) this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). Unreleased changes may be indicated under the `Unreleased` heading.
 
 ## [Unreleased](https://github.com/HumanCellAtlas/metadata-schema/tree/staging)
-## [Released](https://github.com/HumanCellAtlas/metadata-schema/)
 
-### [type/project/project.json - v18.0.0] - 2024-03-04
-### Added
-Added data_use_restriction field
+## [Released](https://github.com/HumanCellAtlas/metadata-schema/)
 
 ### [type/protocol/analysis/analysis_protocol.json - v10.2.0] - 2024-02-05
 ### Added
diff --git a/docs/jsonBrowser/required_fields.md b/docs/jsonBrowser/required_fields.md
index 9a69dd26c..8889b1603 100644
--- a/docs/jsonBrowser/required_fields.md
+++ b/docs/jsonBrowser/required_fields.md
@@ -147,7 +147,6 @@ Property name | Description | Type | Object reference? | User friendly name | Al
 schema_type | The type of the metadata schema entity. | string |  |  | project | 
 project_core | Core project-level information. | object | [See core  project_core](core.md#project-core) | Project core |  | 
 funders | Funding source(s) supporting the project. | array | [See module  funder](module.md#funder) | Funding source(s) |  | 
-data_use_restriction | Data use restrictions that apply to the project. | string |  | Data use restriction | NRES, GRU, GRU-NCU | GRU
 ### Specimen from organism
 Property name | Description | Type | Object reference? | User friendly name | Allowed values | Example 
 --- | --- | --- | --- | --- | --- | --- 
diff --git a/docs/jsonBrowser/type.md b/docs/jsonBrowser/type.md
index 0adf57a9e..fcd9f1a16 100644
--- a/docs/jsonBrowser/type.md
+++ b/docs/jsonBrowser/type.md
@@ -327,7 +327,6 @@ insdc_study_accessions | An International Nucleotide Sequence Database Collabora
 biostudies_accessions | A BioStudies study accession. | array | no |  | BioStudies accession |  | S-EXMP1; S-HCAS33
 funders | Funding source(s) supporting the project. | array | yes | [See module  funder](module.md#funder) | Funding source(s) |  | 
 estimated_cell_count | An estimated number of cells in this project | integer | no |  | Estimated cell count |  | 10000; 2100000
-data_use_restriction | Data use restrictions that apply to the project. | string | yes |  | Data use restriction | NRES, GRU, GRU-NCU | GRU
 
 ## Specimen from organism
 _Information about the specimen that was collected from the donor organism._
diff --git a/json_schema/property_migrations.json b/json_schema/property_migrations.json
index fbdfbdd22..9e94837b8 100644
--- a/json_schema/property_migrations.json
+++ b/json_schema/property_migrations.json
@@ -1,12 +1,5 @@
 {
     "migrations": [
-        {
-            "source_schema": "project",
-            "property": "data_use_restriction",
-            "effective_from": "18.0.0",
-            "reason": "Data access is now recorded as a mandatory field",
-            "type": "new required property"
-        },
         {
             "source_schema": "cell_line",
             "property": "timecourse",
diff --git a/json_schema/type/project/project.json b/json_schema/type/project/project.json
index 895d99c73..4213b4aa5 100644
--- a/json_schema/type/project/project.json
+++ b/json_schema/type/project/project.json
@@ -6,8 +6,7 @@
         "describedBy",
         "schema_type",
         "project_core",
-        "funders",
-        "data_use_restriction"
+        "funders"
     ],
     "title": "Project",
     "name": "project",
@@ -165,18 +164,6 @@
             "type": "integer",
             "example": "10000; 2100000",
             "user_friendly": "Estimated cell count"
-        },
-        "data_use_restriction": {
-            "description": "Data use restrictions that apply to the project.",
-            "type": "string",
-            "enum": [
-                "NRES",
-                "GRU",
-                "GRU-NCU"
-            ],
-            "user_friendly": "Data use restriction",
-            "guidelines": "Must be one of: NRES, GRU, GRU-NCU. The use restriction codes are based on the DUO ontology where NRES corresponds to DUO:0000004, GRU corresponds to DUO:0000042, GRU-NCU corresponds to a combination of DUO:0000042 and DUO:0000046",
-            "example": "GRU"
         }
     }
 }
diff --git a/json_schema/versions.json b/json_schema/versions.json
index 9cc9a4d8d..8f47b78e5 100644
--- a/json_schema/versions.json
+++ b/json_schema/versions.json
@@ -1,5 +1,5 @@
 {
-    "last_update_date": "2024-03-04T14:00:53Z",
+    "last_update_date": "2024-02-05T16:10:39Z",
     "version_numbers": {
         "core": {
             "biomaterial": {
@@ -110,7 +110,7 @@
                 "process": "9.2.0"
             },
             "project": {
-                "project": "18.0.0"
+                "project": "17.1.1"
             },
             "protocol": {
                 "analysis": {

From 233ac30ba56724413e85912cd43587489bd789ac Mon Sep 17 00:00:00 2001
From: Arsenios Chatzigeorgiou <49944135+arschat@users.noreply.github.com>
Date: Fri, 8 Mar 2024 11:34:51 +0000
Subject: [PATCH 4/9] Moved field to specimen_from_organism

---
 docs/jsonBrowser/type.md                                 | 2 +-
 json_schema/type/biomaterial/donor_organism.json         | 7 -------
 json_schema/type/biomaterial/specimen_from_organism.json | 7 +++++++
 json_schema/update_log.csv                               | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/jsonBrowser/type.md b/docs/jsonBrowser/type.md
index fcd9f1a16..e104ce2ca 100644
--- a/docs/jsonBrowser/type.md
+++ b/docs/jsonBrowser/type.md
@@ -347,6 +347,7 @@ state_of_specimen | State of the specimen at the time of collection. | object |
 preservation_storage | Information about how a specimen was preserved and/or stored over a period of time. | object | no | [See module  preservation_storage](module.md#preservation-storage) | Preservation/Storage |  | 
 collection_time | When the biomaterial was collected. | string | no |  | Time of collection |  | 2016-01-21T00:00:00Z; 2016-03
 purchased_specimen | Information about a purchased specimen. | object | no | [See module  purchased_reagents](module.md#purchased-reagents) | Purchased specimen |  | 
+organ_donor | Whether biomaterial was collected after extraction for organ transplantation. | boolean | no |  | Organ donor |  | yes; no
 
 ## Cell suspension
 _Information about the suspension of cells or nuclei derived from the collected or cultured specimen._
@@ -435,7 +436,6 @@ height | Height of organism in Height unit. | string | no |  | Height |  | 160;
 height_unit | The unit in which Height is expressed. | object | no | [See module  length_unit_ontology](module.md#length-unit-ontology) | Height unit |  | 
 weight | Weight of organism in Weight unit. | string | no |  | Weight |  | 60; 40-60
 weight_unit | The unit in which Weight is expressed. | object | no | [See module  mass_unit_ontology](module.md#mass-unit-ontology) | Weight unit |  | 
-organ_donor | Whether biomaterial was collected after extraction for organ transplantation. | boolean | no |  | Organ donor |  | yes; no
 
 ## Organoid
 _Information about an organoid biomaterial._
diff --git a/json_schema/type/biomaterial/donor_organism.json b/json_schema/type/biomaterial/donor_organism.json
index a910d548e..6bab6b746 100644
--- a/json_schema/type/biomaterial/donor_organism.json
+++ b/json_schema/type/biomaterial/donor_organism.json
@@ -178,13 +178,6 @@
             "type": "object",
             "$ref": "module/ontology/mass_unit_ontology.json",
             "user_friendly": "Weight unit"
-        },
-        "organ_donor": {
-            "description": "Whether biomaterial was collected after extraction for organ transplantation.",
-            "type": "boolean",
-            "user_friendly": "Organ donor",
-            "guidelines": "Should be one of: yes, or no.",
-            "example": "yes; no"
         }
     }
 }
diff --git a/json_schema/type/biomaterial/specimen_from_organism.json b/json_schema/type/biomaterial/specimen_from_organism.json
index 38350753e..a0d381c54 100644
--- a/json_schema/type/biomaterial/specimen_from_organism.json
+++ b/json_schema/type/biomaterial/specimen_from_organism.json
@@ -115,6 +115,13 @@
             "type": "object",
             "$ref": "module/process/purchased_reagents.json",
             "user_friendly": "Purchased specimen"
+        },
+        "organ_donor": {
+            "description": "Whether biomaterial was collected after extraction for organ transplantation.",
+            "type": "boolean",
+            "user_friendly": "Organ donor",
+            "guidelines": "Should be one of: yes, or no.",
+            "example": "yes; no"
         }
     }
 }
diff --git a/json_schema/update_log.csv b/json_schema/update_log.csv
index 75f7ec18f..bb2bb31a9 100644
--- a/json_schema/update_log.csv
+++ b/json_schema/update_log.csv
@@ -1,2 +1,2 @@
 Schema,Change type,Change message,Version,Date
-type/biomaterial/donor_organism,minor,Added organ_donor field in donor_organism Fixes#1547",,
\ No newline at end of file
+type/biomaterial/specimen_from_organism,minor,Added organ_donor field in specimen_from_organism Fixes#1547",,
\ No newline at end of file

From 772594348a1212f2601542c8f69a5483172a6de6 Mon Sep 17 00:00:00 2001
From: Arsenios Chatzigeorgiou <49944135+arschat@users.noreply.github.com>
Date: Fri, 8 Mar 2024 11:37:44 +0000
Subject: [PATCH 5/9] Changed description to specimen specific

---
 docs/jsonBrowser/type.md                                 | 2 +-
 json_schema/type/biomaterial/specimen_from_organism.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/jsonBrowser/type.md b/docs/jsonBrowser/type.md
index e104ce2ca..ee1f9180d 100644
--- a/docs/jsonBrowser/type.md
+++ b/docs/jsonBrowser/type.md
@@ -347,7 +347,7 @@ state_of_specimen | State of the specimen at the time of collection. | object |
 preservation_storage | Information about how a specimen was preserved and/or stored over a period of time. | object | no | [See module  preservation_storage](module.md#preservation-storage) | Preservation/Storage |  | 
 collection_time | When the biomaterial was collected. | string | no |  | Time of collection |  | 2016-01-21T00:00:00Z; 2016-03
 purchased_specimen | Information about a purchased specimen. | object | no | [See module  purchased_reagents](module.md#purchased-reagents) | Purchased specimen |  | 
-organ_donor | Whether biomaterial was collected after extraction for organ transplantation. | boolean | no |  | Organ donor |  | yes; no
+organ_donor | Was the specimen collected after extraction for organ transplantation? | boolean | no |  | Organ donor |  | yes; no
 
 ## Cell suspension
 _Information about the suspension of cells or nuclei derived from the collected or cultured specimen._
diff --git a/json_schema/type/biomaterial/specimen_from_organism.json b/json_schema/type/biomaterial/specimen_from_organism.json
index a0d381c54..4dc5eb47f 100644
--- a/json_schema/type/biomaterial/specimen_from_organism.json
+++ b/json_schema/type/biomaterial/specimen_from_organism.json
@@ -117,7 +117,7 @@
             "user_friendly": "Purchased specimen"
         },
         "organ_donor": {
-            "description": "Whether biomaterial was collected after extraction for organ transplantation.",
+            "description": "Was the specimen collected after extraction for organ transplantation?",
             "type": "boolean",
             "user_friendly": "Organ donor",
             "guidelines": "Should be one of: yes, or no.",

From 2a50d73b27f1298076a7674fb502c75f429dd20b Mon Sep 17 00:00:00 2001
From: Arsenios Chatzigeorgiou <49944135+arschat@users.noreply.github.com>
Date: Tue, 12 Mar 2024 13:00:08 +0000
Subject: [PATCH 6/9] Reorder organ_donor field in specimen_from_organism
 schema

---
 docs/jsonBrowser/type.md                           |  2 +-
 .../type/biomaterial/specimen_from_organism.json   | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/jsonBrowser/type.md b/docs/jsonBrowser/type.md
index ee1f9180d..c10085bea 100644
--- a/docs/jsonBrowser/type.md
+++ b/docs/jsonBrowser/type.md
@@ -341,13 +341,13 @@ biomaterial_core | Core biomaterial-level information. | object | yes | [See cor
 genus_species | The scientific binomial name for the species of the specimen. | array | no | [See module  species_ontology](module.md#species-ontology) | Genus species |  | 
 organ | The organ that the biomaterial came from. | object | yes | [See module  organ_ontology](module.md#organ-ontology) | Organ |  | 
 organ_parts | A term for a specific part of the organ that the biomaterial came from. | array | no | [See module  organ_part_ontology](module.md#organ-part-ontology) | Organ part |  | 
+organ_donor | Was the specimen collected after extraction for organ transplantation? | boolean | no |  | Organ donor |  | yes; no
 diseases | Short description of known disease(s) of the specimen. | array | no | [See module  disease_ontology](module.md#disease-ontology) | Known disease(s) |  | 
 adjacent_diseases | Short description of the disease(s) adjacent to the specimen's collection site (e.g. breast cancer). | array | no | [See module  disease_ontology](module.md#disease-ontology) | Adjacent disease(s) |  | 
 state_of_specimen | State of the specimen at the time of collection. | object | no | [See module  state_of_specimen](module.md#state-of-specimen) | State of specimen |  | 
 preservation_storage | Information about how a specimen was preserved and/or stored over a period of time. | object | no | [See module  preservation_storage](module.md#preservation-storage) | Preservation/Storage |  | 
 collection_time | When the biomaterial was collected. | string | no |  | Time of collection |  | 2016-01-21T00:00:00Z; 2016-03
 purchased_specimen | Information about a purchased specimen. | object | no | [See module  purchased_reagents](module.md#purchased-reagents) | Purchased specimen |  | 
-organ_donor | Was the specimen collected after extraction for organ transplantation? | boolean | no |  | Organ donor |  | yes; no
 
 ## Cell suspension
 _Information about the suspension of cells or nuclei derived from the collected or cultured specimen._
diff --git a/json_schema/type/biomaterial/specimen_from_organism.json b/json_schema/type/biomaterial/specimen_from_organism.json
index 4dc5eb47f..5bf612f8b 100644
--- a/json_schema/type/biomaterial/specimen_from_organism.json
+++ b/json_schema/type/biomaterial/specimen_from_organism.json
@@ -65,6 +65,13 @@
             "guidelines": "The term organ part is very broadly defined here.",
             "user_friendly": "Organ part"
         },
+        "organ_donor": {
+            "description": "Was the specimen collected after extraction for organ transplantation?",
+            "type": "boolean",
+            "user_friendly": "Organ donor",
+            "guidelines": "Should be one of: yes, or no.",
+            "example": "yes; no"
+        },
         "diseases": {
             "description": "Short description of known disease(s) of the specimen.",
             "type": "array",
@@ -115,13 +122,6 @@
             "type": "object",
             "$ref": "module/process/purchased_reagents.json",
             "user_friendly": "Purchased specimen"
-        },
-        "organ_donor": {
-            "description": "Was the specimen collected after extraction for organ transplantation?",
-            "type": "boolean",
-            "user_friendly": "Organ donor",
-            "guidelines": "Should be one of: yes, or no.",
-            "example": "yes; no"
         }
     }
 }

From aa3f3102f3ba92dbd743627a1dadf743f7991fae Mon Sep 17 00:00:00 2001
From: Arsenios Chatzigeorgiou <49944135+arschat@users.noreply.github.com>
Date: Tue, 12 Mar 2024 18:59:40 +0000
Subject: [PATCH 7/9] Changed field name to transplant_organ

---
 docs/jsonBrowser/type.md                                 | 2 +-
 json_schema/type/biomaterial/specimen_from_organism.json | 4 ++--
 json_schema/update_log.csv                               | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/jsonBrowser/type.md b/docs/jsonBrowser/type.md
index c10085bea..efd3ce456 100644
--- a/docs/jsonBrowser/type.md
+++ b/docs/jsonBrowser/type.md
@@ -341,7 +341,7 @@ biomaterial_core | Core biomaterial-level information. | object | yes | [See cor
 genus_species | The scientific binomial name for the species of the specimen. | array | no | [See module  species_ontology](module.md#species-ontology) | Genus species |  | 
 organ | The organ that the biomaterial came from. | object | yes | [See module  organ_ontology](module.md#organ-ontology) | Organ |  | 
 organ_parts | A term for a specific part of the organ that the biomaterial came from. | array | no | [See module  organ_part_ontology](module.md#organ-part-ontology) | Organ part |  | 
-organ_donor | Was the specimen collected after extraction for organ transplantation? | boolean | no |  | Organ donor |  | yes; no
+transplant_organ | Was the specimen collected after extraction for organ transplantation? | boolean | no |  | Transplant organ |  | yes; no
 diseases | Short description of known disease(s) of the specimen. | array | no | [See module  disease_ontology](module.md#disease-ontology) | Known disease(s) |  | 
 adjacent_diseases | Short description of the disease(s) adjacent to the specimen's collection site (e.g. breast cancer). | array | no | [See module  disease_ontology](module.md#disease-ontology) | Adjacent disease(s) |  | 
 state_of_specimen | State of the specimen at the time of collection. | object | no | [See module  state_of_specimen](module.md#state-of-specimen) | State of specimen |  | 
diff --git a/json_schema/type/biomaterial/specimen_from_organism.json b/json_schema/type/biomaterial/specimen_from_organism.json
index 5bf612f8b..6d5e6edeb 100644
--- a/json_schema/type/biomaterial/specimen_from_organism.json
+++ b/json_schema/type/biomaterial/specimen_from_organism.json
@@ -65,10 +65,10 @@
             "guidelines": "The term organ part is very broadly defined here.",
             "user_friendly": "Organ part"
         },
-        "organ_donor": {
+        "transplant_organ": {
             "description": "Was the specimen collected after extraction for organ transplantation?",
             "type": "boolean",
-            "user_friendly": "Organ donor",
+            "user_friendly": "Transplant organ",
             "guidelines": "Should be one of: yes, or no.",
             "example": "yes; no"
         },
diff --git a/json_schema/update_log.csv b/json_schema/update_log.csv
index bb2bb31a9..50f5b8dde 100644
--- a/json_schema/update_log.csv
+++ b/json_schema/update_log.csv
@@ -1,2 +1,2 @@
 Schema,Change type,Change message,Version,Date
-type/biomaterial/specimen_from_organism,minor,Added organ_donor field in specimen_from_organism Fixes#1547",,
\ No newline at end of file
+type/biomaterial/specimen_from_organism,minor,Added transplant_organ field in specimen_from_organism Fixes#1547",,
\ No newline at end of file

From 9da321f6bae7acef07eb8d6edefed1a837a4eac3 Mon Sep 17 00:00:00 2001
From: Arsenios Chatzigeorgiou <49944135+arschat@users.noreply.github.com>
Date: Fri, 22 Mar 2024 11:02:08 +0000
Subject: [PATCH 8/9] Ran release_prepare.py script.

---
 changelog.md               | 4 ++++
 json_schema/update_log.csv | 1 -
 json_schema/versions.json  | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/changelog.md b/changelog.md
index 86c44a927..755988b27 100644
--- a/changelog.md
+++ b/changelog.md
@@ -7,6 +7,10 @@ and (starting with v4.0.0) this project adheres to [Semantic Versioning](http://
 
 ## [Unreleased](https://github.com/HumanCellAtlas/metadata-schema/tree/staging)
 
+### [type/biomaterial/specimen_from_organism.json - v10.9.0] - 2024-03-22
+### Added
+Added transplant_organ field in specimen_from_organism Fixes#1547"
+
 ## [Released](https://github.com/HumanCellAtlas/metadata-schema/)
 
 ### [type/project/project.json - v19.0.0] - 2024-03-15
diff --git a/json_schema/update_log.csv b/json_schema/update_log.csv
index 50f5b8dde..3231ff199 100644
--- a/json_schema/update_log.csv
+++ b/json_schema/update_log.csv
@@ -1,2 +1 @@
 Schema,Change type,Change message,Version,Date
-type/biomaterial/specimen_from_organism,minor,Added transplant_organ field in specimen_from_organism Fixes#1547",,
\ No newline at end of file
diff --git a/json_schema/versions.json b/json_schema/versions.json
index cfe177c84..268ee8021 100644
--- a/json_schema/versions.json
+++ b/json_schema/versions.json
@@ -1,5 +1,5 @@
 {
-    "last_update_date": "2024-03-15T11:43:55Z",
+    "last_update_date": "2024-03-22T11:00:33Z",
     "version_numbers": {
         "core": {
             "biomaterial": {
@@ -94,7 +94,7 @@
                 "donor_organism": "16.0.0",
                 "imaged_specimen": "3.5.0",
                 "organoid": "11.5.0",
-                "specimen_from_organism": "10.8.0"
+                "specimen_from_organism": "10.9.0"
             },
             "file": {
                 "analysis_file": "7.0.0",

From 34dd920a28dca13e980b760c3605e0fc65ca825a Mon Sep 17 00:00:00 2001
From: Arsenios Chatzigeorgiou <49944135+arschat@users.noreply.github.com>
Date: Fri, 22 Mar 2024 11:16:10 +0000
Subject: [PATCH 9/9] Solve conflicts with staging

---
 docs/jsonBrowser/required_fields.md   | 1 +
 docs/jsonBrowser/type.md              | 2 +-
 json_schema/property_migrations.json  | 7 +++++++
 json_schema/type/project/project.json | 3 ++-
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/docs/jsonBrowser/required_fields.md b/docs/jsonBrowser/required_fields.md
index 8889b1603..9a69dd26c 100644
--- a/docs/jsonBrowser/required_fields.md
+++ b/docs/jsonBrowser/required_fields.md
@@ -147,6 +147,7 @@ Property name | Description | Type | Object reference? | User friendly name | Al
 schema_type | The type of the metadata schema entity. | string |  |  | project | 
 project_core | Core project-level information. | object | [See core  project_core](core.md#project-core) | Project core |  | 
 funders | Funding source(s) supporting the project. | array | [See module  funder](module.md#funder) | Funding source(s) |  | 
+data_use_restriction | Data use restrictions that apply to the project. | string |  | Data use restriction | NRES, GRU, GRU-NCU | GRU
 ### Specimen from organism
 Property name | Description | Type | Object reference? | User friendly name | Allowed values | Example 
 --- | --- | --- | --- | --- | --- | --- 
diff --git a/docs/jsonBrowser/type.md b/docs/jsonBrowser/type.md
index 10cb73e48..445e57a5f 100644
--- a/docs/jsonBrowser/type.md
+++ b/docs/jsonBrowser/type.md
@@ -327,7 +327,7 @@ insdc_study_accessions | An International Nucleotide Sequence Database Collabora
 biostudies_accessions | A BioStudies study accession. | array | no |  | BioStudies accession |  | S-EXMP1; S-HCAS33
 funders | Funding source(s) supporting the project. | array | yes | [See module  funder](module.md#funder) | Funding source(s) |  | 
 estimated_cell_count | An estimated number of cells in this project | integer | no |  | Estimated cell count |  | 10000; 2100000
-data_use_restriction | Data use restrictions that apply to the project. | string | no |  | Data use restriction | NRES, GRU, GRU-NCU | GRU
+data_use_restriction | Data use restrictions that apply to the project. | string | yes |  | Data use restriction | NRES, GRU, GRU-NCU | GRU
 duos_id | A DUOS dataset id. | string | no |  | DUOS ID |  | DUOS-000108; DUOS-000114
 
 ## Specimen from organism
diff --git a/json_schema/property_migrations.json b/json_schema/property_migrations.json
index 9e94837b8..fbdfbdd22 100644
--- a/json_schema/property_migrations.json
+++ b/json_schema/property_migrations.json
@@ -1,5 +1,12 @@
 {
     "migrations": [
+        {
+            "source_schema": "project",
+            "property": "data_use_restriction",
+            "effective_from": "18.0.0",
+            "reason": "Data access is now recorded as a mandatory field",
+            "type": "new required property"
+        },
         {
             "source_schema": "cell_line",
             "property": "timecourse",
diff --git a/json_schema/type/project/project.json b/json_schema/type/project/project.json
index 53dcfec56..b9f283828 100644
--- a/json_schema/type/project/project.json
+++ b/json_schema/type/project/project.json
@@ -6,7 +6,8 @@
         "describedBy",
         "schema_type",
         "project_core",
-        "funders"
+        "funders",
+        "data_use_restriction"
     ],
     "title": "Project",
     "name": "project",