diff options
author | Wojtek Kosior <koszko@koszko.org> | 2022-02-28 21:56:40 +0100 |
---|---|---|
committer | Wojtek Kosior <koszko@koszko.org> | 2022-03-01 09:46:22 +0100 |
commit | 09634f3446866f712a022327683b1149d8f46bf0 (patch) | |
tree | 3549c5f530bb4a971872ba54f3ff5cba2e27a664 | |
parent | 5ef63e81ddd7299bfb738cae643bc48560b68a17 (diff) | |
download | hydrilla-json-schemas-series-1.x.tar.gz hydrilla-json-schemas-series-1.x.zip |
fix local reference in common_definitions schemav1.0.1series-1.x
* common_definitions-1.0.1.schema.json: change "$ref" line
* <all files>: rename to version 1.0.1
* api_mapping_description-1.0.1.schema.json, api_query_result-1.0.1.schema.json, api_resource_description-1.0.1.schema.json, api_source_description-1.0.1.schema.json, package_source-1.0.1.schema.json: update regular expression pattern for validation of "$schema" property
* <all json files>: update version in "$id" property
-rw-r--r-- | api_mapping_description-1.0.1.schema.json (renamed from api_mapping_description-1.schema.json) | 8 | ||||
-rw-r--r-- | api_mapping_description-1.0.1.schema.json.license (renamed from api_mapping_description-1.schema.json.license) | 0 | ||||
-rw-r--r-- | api_query_result-1.0.1.schema.json (renamed from api_query_result-1.schema.json) | 8 | ||||
-rw-r--r-- | api_query_result-1.0.1.schema.json.license (renamed from api_query_result-1.schema.json.license) | 0 | ||||
-rw-r--r-- | api_resource_description-1.0.1.schema.json (renamed from api_resource_description-1.schema.json) | 10 | ||||
-rw-r--r-- | api_resource_description-1.0.1.schema.json.license (renamed from api_resource_description-1.schema.json.license) | 0 | ||||
-rw-r--r-- | api_source_description-1.0.1.schema.json (renamed from api_source_description-1.schema.json) | 16 | ||||
-rw-r--r-- | api_source_description-1.0.1.schema.json.license (renamed from api_source_description-1.schema.json.license) | 0 | ||||
-rw-r--r-- | common_definitions-1.0.1.schema.json (renamed from common_definitions-1.schema.json) | 4 | ||||
-rw-r--r-- | common_definitions-1.0.1.schema.json.license (renamed from common_definitions-1.schema.json.license) | 0 | ||||
-rw-r--r-- | package_source-1.0.1.schema.json (renamed from package_source-1.schema.json) | 16 | ||||
-rw-r--r-- | package_source-1.0.1.schema.json.license (renamed from package_source-1.schema.json.license) | 0 |
12 files changed, 31 insertions, 31 deletions
diff --git a/api_mapping_description-1.schema.json b/api_mapping_description-1.0.1.schema.json index e37dd00..880a5c4 100644 --- a/api_mapping_description-1.schema.json +++ b/api_mapping_description-1.0.1.schema.json @@ -1,12 +1,12 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://hydrilla.koszko.org/schemas/api_mapping_description-1.schema.json", + "$id": "https://hydrilla.koszko.org/schemas/api_mapping_description-1.0.1.schema.json", "title": "Mapping description", "description": "Definition of a Hydrilla mapping, as served through HTTP API", "allOf": [{ - "$ref": "./common_definitions-1.schema.json#/definitions/mapping_definition_base" + "$ref": "./common_definitions-1.0.1.schema.json#/definitions/mapping_definition_base" }, { - "$ref": "./common_definitions-1.schema.json#/definitions/item_definition" + "$ref": "./common_definitions-1.0.1.schema.json#/definitions/item_definition" }, { "type": "object", "required": ["$schema"], @@ -14,7 +14,7 @@ "$schema": { "description": "Mark this instance as conforming to mapping description schema 1.x", "type": "string", - "pattern": "^https://hydrilla\\.koszko\\.org/schemas/api_mapping_description-1\\.([1-9][0-9]*\\.)*schema\\.json$" + "pattern": "^https://hydrilla\\.koszko\\.org/schemas/api_mapping_description-1\\.(([1-9][0-9]*|0)\\.)*schema\\.json$" } } }] diff --git a/api_mapping_description-1.schema.json.license b/api_mapping_description-1.0.1.schema.json.license index f41d511..f41d511 100644 --- a/api_mapping_description-1.schema.json.license +++ b/api_mapping_description-1.0.1.schema.json.license diff --git a/api_query_result-1.schema.json b/api_query_result-1.0.1.schema.json index 7de8f76..89c5428 100644 --- a/api_query_result-1.schema.json +++ b/api_query_result-1.0.1.schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://hydrilla.koszko.org/schemas/api_query_result-1.schema.json", + "$id": "https://hydrilla.koszko.org/schemas/api_query_result-1.0.1.schema.json", "title": "Query result", "description": "Object with a list of references to mappings that contain payloads for requested URL", "type": "object", @@ -9,17 +9,17 @@ "$schema": { "description": "Mark this instance as conforming to query result schema 1.x", "type": "string", - "pattern": "^https://hydrilla\\.koszko\\.org/schemas/api_query_result-1\\.([1-9][0-9]*\\.)*schema\\.json$" + "pattern": "^https://hydrilla\\.koszko\\.org/schemas/api_query_result-1\\.(([1-9][0-9]*|0)\\.)*schema\\.json$" }, "mappings": { "description": "References to mappings using at least one pattern that matches the requested URL", "type": "array", "items": { - "$ref": "./common_definitions-1.schema.json#/definitions/item_ref" + "$ref": "./common_definitions-1.0.1.schema.json#/definitions/item_ref" } }, "generated_by": { - "$ref": "./common_definitions-1.schema.json#/definitions/generated_by" + "$ref": "./common_definitions-1.0.1.schema.json#/definitions/generated_by" } } } diff --git a/api_query_result-1.schema.json.license b/api_query_result-1.0.1.schema.json.license index f41d511..f41d511 100644 --- a/api_query_result-1.schema.json.license +++ b/api_query_result-1.0.1.schema.json.license diff --git a/api_resource_description-1.schema.json b/api_resource_description-1.0.1.schema.json index b6a32cd..7459394 100644 --- a/api_resource_description-1.schema.json +++ b/api_resource_description-1.0.1.schema.json @@ -1,12 +1,12 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://hydrilla.koszko.org/schemas/api_resource_description-1.schema.json", + "$id": "https://hydrilla.koszko.org/schemas/api_resource_description-1.0.1.schema.json", "title": "Resource description", "description": "Definition of a Hydrilla resource, as served through HTTP API", "allOf": [{ - "$ref": "./common_definitions-1.schema.json#/definitions/resource_definition_base" + "$ref": "./common_definitions-1.0.1.schema.json#/definitions/resource_definition_base" }, { - "$ref": "./common_definitions-1.schema.json#/definitions/item_definition" + "$ref": "./common_definitions-1.0.1.schema.json#/definitions/item_definition" }, { "type": "object", "required": ["$schema"], @@ -14,11 +14,11 @@ "$schema": { "description": "Mark this instance as conforming to resource description schema 1.x", "type": "string", - "pattern": "^https://hydrilla\\.koszko\\.org/schemas/api_resource_description-1\\.([1-9][0-9]*\\.)*schema\\.json$" + "pattern": "^https://hydrilla\\.koszko\\.org/schemas/api_resource_description-1\\.(([1-9][0-9]*|0)\\.)*schema\\.json$" }, "scripts": { "description": "Which files are resource's scripts and need to be installed", - "$ref": "./common_definitions-1.schema.json#/definitions/file_ref_list_sha256", + "$ref": "./common_definitions-1.0.1.schema.json#/definitions/file_ref_list_sha256", "default": [] } } diff --git a/api_resource_description-1.schema.json.license b/api_resource_description-1.0.1.schema.json.license index f41d511..f41d511 100644 --- a/api_resource_description-1.schema.json.license +++ b/api_resource_description-1.0.1.schema.json.license diff --git a/api_source_description-1.schema.json b/api_source_description-1.0.1.schema.json index 7016b6d..0744d1a 100644 --- a/api_source_description-1.schema.json +++ b/api_source_description-1.0.1.schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://hydrilla.koszko.org/schemas/api_source_description-1.schema.json", + "$id": "https://hydrilla.koszko.org/schemas/api_source_description-1.0.1.schema.json", "title": "Source description", "description": "Built description of a Hydrilla source package", "type": "object", @@ -16,14 +16,14 @@ "$schema": { "description": "Mark this instance as conforming to source description schema 1.x", "type": "string", - "pattern": "^https://hydrilla\\.koszko\\.org/schemas/api_source_description-1\\.([1-9][0-9]*\\.)*schema\\.json$" + "pattern": "^https://hydrilla\\.koszko\\.org/schemas/api_source_description-1\\.(([1-9][0-9]*|0)\\.)*schema\\.json$" }, "source_name": { - "$ref": "./common_definitions-1.schema.json#/definitions/source_name" + "$ref": "./common_definitions-1.0.1.schema.json#/definitions/source_name" }, "source_copyright": { "description": "Which files indicate license terms of the source package", - "$ref": "./common_definitions-1.schema.json#/definitions/file_ref_list_sha256" + "$ref": "./common_definitions-1.0.1.schema.json#/definitions/file_ref_list_sha256" }, "source_archives": { "description": "What archive extensions are available for this package's sources", @@ -35,7 +35,7 @@ "required": ["sha256"], "properties": { "sha256": { - "$ref": "./common_definitions-1.schema.json#/definitions/sha256" + "$ref": "./common_definitions-1.0.1.schema.json#/definitions/sha256" } } }, @@ -50,17 +50,17 @@ "type": "string" }, "comment": { - "$ref": "./common_definitions-1.schema.json#/definitions/comment" + "$ref": "./common_definitions-1.0.1.schema.json#/definitions/comment" }, "definitions": { "description": "References to site resources and pattern->payload mappings", "type": "array", "items": { - "$ref": "./common_definitions-1.schema.json#/definitions/typed_item_ref" + "$ref": "./common_definitions-1.0.1.schema.json#/definitions/typed_item_ref" } }, "generated_by": { - "$ref": "./common_definitions-1.schema.json#/definitions/generated_by" + "$ref": "./common_definitions-1.0.1.schema.json#/definitions/generated_by" } } } diff --git a/api_source_description-1.schema.json.license b/api_source_description-1.0.1.schema.json.license index f41d511..f41d511 100644 --- a/api_source_description-1.schema.json.license +++ b/api_source_description-1.0.1.schema.json.license diff --git a/common_definitions-1.schema.json b/common_definitions-1.0.1.schema.json index f88a9cd..b803188 100644 --- a/common_definitions-1.schema.json +++ b/common_definitions-1.0.1.schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://hydrilla.koszko.org/schemas/common_definitions-1.schema.json", + "$id": "https://hydrilla.koszko.org/schemas/common_definitions-1.0.1.schema.json", "title": "Common definitions", "description": "Definitions used by other Hydrilla schemas", "definitions": { @@ -92,7 +92,7 @@ "type": "string" }, "version": { - "$ref": "#definitions/version" + "$ref": "#/definitions/version" } } }, diff --git a/common_definitions-1.schema.json.license b/common_definitions-1.0.1.schema.json.license index f41d511..f41d511 100644 --- a/common_definitions-1.schema.json.license +++ b/common_definitions-1.0.1.schema.json.license diff --git a/package_source-1.schema.json b/package_source-1.0.1.schema.json index e7e0064..2f9482e 100644 --- a/package_source-1.schema.json +++ b/package_source-1.0.1.schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://hydrilla.koszko.org/schemas/package_source-1.schema.json", + "$id": "https://hydrilla.koszko.org/schemas/package_source-1.0.1.schema.json", "title": "Package source", "description": "Definition of a Hydrilla source package", "type": "object", @@ -15,36 +15,36 @@ "$schema": { "description": "Mark this instance as conforming to package source schema 1.x", "type": "string", - "pattern": "^https://hydrilla\\.koszko\\.org/schemas/package_source-1\\.([1-9][0-9]*\\.)*schema\\.json$" + "pattern": "^https://hydrilla\\.koszko\\.org/schemas/package_source-1\\.(([1-9][0-9]*|0)\\.)*schema\\.json$" }, "source_name": { - "$ref": "./common_definitions-1.schema.json#/definitions/source_name" + "$ref": "./common_definitions-1.0.1.schema.json#/definitions/source_name" }, "copyright": { "description": "Which files from the source package indicate its license terms and should be included in the distribution packages", - "$ref": "./common_definitions-1.schema.json#/definitions/file_ref_list" + "$ref": "./common_definitions-1.0.1.schema.json#/definitions/file_ref_list" }, "upstream_url": { "description": "Where this software/work initially comes from", "type": "string" }, "comment": { - "$ref": "./common_definitions-1.schema.json#/definitions/comment" + "$ref": "./common_definitions-1.0.1.schema.json#/definitions/comment" }, "definitions": { "description": "Definitions of site resources and pattern->payload mappings", "type": "array", "items": { "anyOf": [{ - "$ref": "./common_definitions-1.schema.json#/definitions/resource_definition_base" + "$ref": "./common_definitions-1.0.1.schema.json#/definitions/resource_definition_base" }, { - "$ref": "./common_definitions-1.schema.json#/definitions/mapping_definition_base" + "$ref": "./common_definitions-1.0.1.schema.json#/definitions/mapping_definition_base" }] } }, "additional_files": { "description": "Files which should be included in the source archive produced by Hydrilla builder in addition to script and copyright files", - "$ref": "./common_definitions-1.schema.json#/definitions/file_ref_list", + "$ref": "./common_definitions-1.0.1.schema.json#/definitions/file_ref_list", "default": [] }, "reuse_generate_spdx_report": { diff --git a/package_source-1.schema.json.license b/package_source-1.0.1.schema.json.license index f41d511..f41d511 100644 --- a/package_source-1.schema.json.license +++ b/package_source-1.0.1.schema.json.license |