Merge pull request #553 from openMetadataInitiative/lzehl_switchRP-PRVconnection

apdavison · web-flow · commit 1e38197062fe · 2025-11-07T17:44:31.000+01:00
switch connection between RP and RPVs
diff --git a/schemas/products/dataset.schema.tpl.json b/schemas/products/dataset.schema.tpl.json
@@ -20,15 +20,6 @@
         "core:DOI",
         "core:IdentifiersDotOrgID"
       ]
-    },
-    "hasVersion": {
-      "type": "array",
-      "minItems": 1,
-      "uniqueItems": true,
-      "_instruction": "Add all versions of this dataset.",
-      "_linkedTypes": [
-        "core:DatasetVersion"
-      ]
     }
   }
 }
diff --git a/schemas/products/datasetVersion.schema.tpl.json b/schemas/products/datasetVersion.schema.tpl.json
@@ -75,7 +75,13 @@
         "https://openminds.ebrains.eu/sands/CommonCoordinateSpaceVersion"
       ]
     },
-    "isAlternativeVersionOf": {
+    "isPrecededBy": {
+      "_instruction": "Add the dataset version preceding this dataset version.",
+      "_linkedTypes": [
+        "core:DatasetVersion"
+      ]
+    },
+    "isVariantOf": {
       "type": "array",
       "minItems": 1,
       "uniqueItems": true,
@@ -84,10 +90,10 @@
         "core:DatasetVersion"
       ]
     },
-    "isNewVersionOf": {
-      "_instruction": "Add the dataset version preceding this dataset version.",
+    "isVersionOf": {
+      "_instruction": "Add the version-independent information about this dataset.",
       "_linkedTypes": [
-        "core:DatasetVersion"
+        "core:Dataset"
       ]
     },
     "license": {
@@ -97,6 +103,7 @@
         "core:WebResource"
       ]
     },
+
     "preparationDesign": {
       "type": "array",
       "minItems": 1,
diff --git a/schemas/products/metaDataModel.schema.tpl.json b/schemas/products/metaDataModel.schema.tpl.json
@@ -20,15 +20,6 @@
         "core:DOI",
         "core:SWHID"
       ]
-    },
-    "hasVersion": {
-      "type": "array",
-      "minItems": 1,
-      "uniqueItems": true,
-      "_instruction": "Add all versions of this (meta)data model.",
-      "_linkedTypes": [
-        "core:MetaDataModelVersion"
-      ]
     }
   }
 }
diff --git a/schemas/products/metaDataModelVersion.schema.tpl.json b/schemas/products/metaDataModelVersion.schema.tpl.json
@@ -22,7 +22,13 @@
         "core:SWHID"
       ]
     },
-    "isAlternativeVersionOf": {
+    "isPrecededBy": {
+      "_instruction": "Add the (meta)data model version preceding this (meta)data model version.",
+      "_linkedTypes": [
+        "core:MetaDataModelVersion"
+      ]
+    },
+    "isVariantOf": {
       "type": "array",
       "minItems": 1,
       "uniqueItems": true,
@@ -31,10 +37,10 @@
         "core:MetaDataModelVersion"
       ]
     },
-    "isNewVersionOf": {
-      "_instruction": "Add the (meta)data version preceding this (meta)data model version.",
+    "isVersionOf": {
+      "_instruction": "Add the version-independent information about this (meta)data model.",
       "_linkedTypes": [
-        "core:MetaDataModelVersion"
+        "core:MetaDataModel"
       ]
     },
     "license": {
diff --git a/schemas/products/model.schema.tpl.json b/schemas/products/model.schema.tpl.json
@@ -30,15 +30,6 @@
         "core:SWHID"
       ]
     },
-    "hasVersion": {
-      "type": "array",
-      "minItems": 1,
-      "uniqueItems": true,
-      "_instruction": "Add all versions of this computational model.",
-      "_linkedTypes": [
-        "core:ModelVersion"
-      ]
-    },
     "scope": {
       "_instruction": "Add the scope of this computational model.",
       "_linkedTypes": [
diff --git a/schemas/products/modelVersion.schema.tpl.json b/schemas/products/modelVersion.schema.tpl.json
@@ -56,19 +56,25 @@
         "core:WebResource"
       ]
     },
-    "isAlternativeVersionOf": {
+    "isPrecededBy": {
+      "_instruction": "Add the model version preceding this model version.",
+      "_linkedTypes": [
+        "core:ModelVersion"
+      ]
+    },
+    "isVariantOf": {
       "type": "array",
       "minItems": 1,
       "uniqueItems": true,
-      "_instruction": "Add all computational model versions that can be used alternatively to this computational model version.",
+      "_instruction": "Add all model versions that can be used alternatively to this model version.",
       "_linkedTypes": [
         "core:ModelVersion"
       ]
     },
-    "isNewVersionOf": {
-      "_instruction": "Add the computational model version preceding this computational model version.",
+    "isVersionOf": {
+      "_instruction": "Add the version-independent information about this model.",
       "_linkedTypes": [
-        "core:ModelVersion"
+        "core:Model"
       ]
     },
     "license": {
diff --git a/schemas/products/researchProduct.schema.tpl.json b/schemas/products/researchProduct.schema.tpl.json
@@ -5,7 +5,6 @@
   "required": [
     "description",    
     "fullName",
-    "hasVersion",
     "shortName"
   ],
   "properties": {
diff --git a/schemas/products/researchProductVersion.schema.tpl.json b/schemas/products/researchProductVersion.schema.tpl.json
@@ -5,6 +5,7 @@
   "required": [
     "accessibility",
     "fullDocumentation",
+    "isVersionOf",
     "releaseDate",
     "shortName",
     "versionIdentifier",
diff --git a/schemas/products/software.schema.tpl.json b/schemas/products/software.schema.tpl.json
@@ -21,15 +21,6 @@
         "core:RRID",
         "core:SWHID"
       ]
-    },
-    "hasVersion": {
-      "type": "array",
-      "minItems": 1,
-      "uniqueItems": true,
-      "_instruction": "Add all versions of this software tool.",
-      "_linkedTypes": [
-        "core:SoftwareVersion"
-      ]
     }
   }
 }
diff --git a/schemas/products/softwareVersion.schema.tpl.json b/schemas/products/softwareVersion.schema.tpl.json
@@ -79,7 +79,13 @@
         "core:ContentType"
       ]
     },
-    "isAlternativeVersionOf": {
+    "isPrecededBy": {
+      "_instruction": "Add the software version preceding this software version.",
+      "_linkedTypes": [
+        "core:SoftwareVersion"
+      ]
+    },
+    "isVariantOf": {
       "type": "array",
       "minItems": 1,
       "uniqueItems": true,
@@ -88,10 +94,10 @@
         "core:SoftwareVersion"
       ]
     },
-    "isNewVersionOf": {
-      "_instruction": "Add the software version preceding this software version.",
+    "isVersionOf": {
+      "_instruction": "Add the version-independent information about this software.",
       "_linkedTypes": [
-        "core:SoftwareVersion"
+        "core:Software"
       ]
     },
     "language": {
diff --git a/schemas/products/webService.schema.tpl.json b/schemas/products/webService.schema.tpl.json
@@ -13,15 +13,6 @@
       "_linkedCategories": [
         "legalPerson"
       ]
-    },
-    "hasVersion": {
-      "type": "array",
-      "minItems": 1,
-      "uniqueItems": true,
-      "_instruction": "Add all versions of this web service.",
-      "_linkedTypes": [
-        "core:WebServiceVersion"
-      ]
     }
   }
 }
diff --git a/schemas/products/webServiceVersion.schema.tpl.json b/schemas/products/webServiceVersion.schema.tpl.json
@@ -29,7 +29,13 @@
         "core:ContentType"
       ]
     },
-    "isAlternativeVersionOf": {
+    "isPrecededBy": {
+      "_instruction": "Add the web service version preceding this web service version.",
+      "_linkedTypes": [
+        "core:WebServiceVersion"
+      ]
+    },
+    "isVariantOf": {
       "type": "array",
       "minItems": 1,
       "uniqueItems": true,
@@ -38,10 +44,10 @@
         "core:WebServiceVersion"
       ]
     },
-    "isNewVersionOf": {
-      "_instruction": "Add the web service version preceding this web service version.",
+    "isVersionOf": {
+      "_instruction": "Add the version-independent information about this web service.",
       "_linkedTypes": [
-        "core:WebServiceVersion"
+        "core:WebService"
       ]
     },
     "outputFormat": {

Original file line number	Diff line number	Diff line change
`@@ -20,15 +20,6 @@`
`20`	`20`	`"core:DOI",`
`21`	`21`	`"core:IdentifiersDotOrgID"`
`22`	`22`	`]`
`23`		`- },`
`24`		`- "hasVersion": {`
`25`		`- "type": "array",`
`26`		`- "minItems": 1,`
`27`		`- "uniqueItems": true,`
`28`		`- "_instruction": "Add all versions of this dataset.",`
`29`		`- "_linkedTypes": [`
`30`		`- "core:DatasetVersion"`
`31`		`- ]`
`32`	`23`	`}`
`33`	`24`	`}`
`34`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,15 +21,6 @@`
`21`	`21`	`"core:RRID",`
`22`	`22`	`"core:SWHID"`
`23`	`23`	`]`
`24`		`- },`
`25`		`- "hasVersion": {`
`26`		`- "type": "array",`
`27`		`- "minItems": 1,`
`28`		`- "uniqueItems": true,`
`29`		`- "_instruction": "Add all versions of this software tool.",`
`30`		`- "_linkedTypes": [`
`31`		`- "core:SoftwareVersion"`
`32`		`- ]`
`33`	`24`	`}`
`34`	`25`	`}`
`35`	`26`	`}`