Skip to content

Commit c4688f6

Browse files
Merge branch 'brapi-V2.1' into 651-merge-json-descriptions-from-v22-to-v21q
2 parents 716a676 + 13838bb commit c4688f6

16 files changed

+35796
-4617
lines changed

.github/workflows/generate-schema.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Java CI with Gradle
1+
name: Build specifications, schemas and comparisions
22

33
on:
44
push:

Specification/BrAPI-Schema/BrAPI-Phenotyping/ObservationUnit.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
"relationshipType": "one-to-many",
9494
"referencedAttribute": "observationUnit",
9595
"items": {
96-
"$ref": "../BrAPI-Phenotyping/ObservationUnit.json#/$defs/Treatment",
96+
"$ref": "../BrAPI-Phenotyping/ObservationUnit.json#/$defs/ObservationTreatment",
9797
"description": "Treatments"
9898
},
9999
"title": "Treatments",
@@ -284,7 +284,7 @@
284284
"primaryModel": false
285285
}
286286
},
287-
"Treatment": {
287+
"ObservationTreatment": {
288288
"properties": {
289289
"factor": {
290290
"description": "The type of treatment/factor. ex. 'fertilizer', 'inoculation', 'irrigation', etc\n\nMIAPPE V1.1 (DM-61) Experimental Factor type - Name/Acronym of the experimental factor.",
@@ -307,7 +307,7 @@
307307
"referencedAttribute": "treatments"
308308
}
309309
},
310-
"title": "Treatment",
310+
"title": "ObservationTreatment",
311311
"description": "The type of treatment/factor. ex. 'fertilizer', 'inoculation', 'irrigation', etc. MIAPPE V1.1 (DM-61) Experimental Factor type - Name/Acronym of the experimental factor.",
312312
"type": "object",
313313
"brapi-metadata": {

0 commit comments

Comments
 (0)