Skip to content

Commit

Permalink
update json-schema draft
Browse files Browse the repository at this point in the history 
http://json-schema.org/draft-05/schema# is a 404... updating to latest version of schema.
  • Loading branch information
@AustinRedenbaugh @manusa
AustinRedenbaugh authored and manusa committed Feb 13, 2023
1 parent a1b2616 commit 6023042
Show file tree
Hide file tree
Showing 104 changed files with 484 additions and 455 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
### 6.5-SNAPSHOT

#### Bugs
* Fix #4784: json-schema draft-05 is a (404). Updating to draft-07 (`http://json-schema.org/draft-07/schema#`)
* Fix #4791: handle the `NullPointerException` in `Thread.currentThread().getContextClassLoader()`
* Fix #4832: NO_PROXY can match cidr with bit suffix <10
* Fix #4851: adding buffer cloning to ensure buffers cannot be modified after sending
Expand Down
2 changes: 1 addition & 1 deletion extensions/camel-k/model-v1/src/main/resources/schema/camel-k-schema-v1.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "http://fabric8.io/camel-k/v1/CamelKSchema#",
"$schema": "http://json-schema.org/draft-05/schema#",
"$schema": "http://json-schema.org/draft-07/schema#",
"definitions": {
"github_com_apache_camel-k_pkg_apis_camel_v1_Artifact": {
"type": "object",
Expand Down
2 changes: 1 addition & 1 deletion extensions/camel-k/model-v1alpha1/src/main/resources/schema/camel-k-schema-v1alpha1.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "http://fabric8.io/camel-k/v1alpha1/CamelKSchema#",
"$schema": "http://json-schema.org/draft-05/schema#",
"$schema": "http://json-schema.org/draft-07/schema#",
"definitions": {
"github_com_apache_camel-k_pkg_apis_camel_v1alpha1_AuthorizationSpec": {
"type": "object",
Expand Down
2 changes: 1 addition & 1 deletion extensions/certmanager/model-v1/src/main/resources/schema/certmanager-schema.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "http://fabric8.io/jetstack/CertManagerSchema#",
"$schema": "http://json-schema.org/draft-05/schema#",
"$schema": "http://json-schema.org/draft-07/schema#",
"definitions": {
"github_com_cert-manager_cert-manager_pkg_apis_acme_v1_ACMEAuthorization": {
"type": "object",
Expand Down
2 changes: 1 addition & 1 deletion extensions/certmanager/model-v1alpha2/src/main/resources/schema/certmanager-schema.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "http://fabric8.io/jetstack/CertManagerSchema#",
"$schema": "http://json-schema.org/draft-05/schema#",
"$schema": "http://json-schema.org/draft-07/schema#",
"definitions": {
"github_com_jetstack_cert-manager_pkg_apis_acme_v1alpha2_ACMEAuthorization": {
"type": "object",
Expand Down
2 changes: 1 addition & 1 deletion extensions/certmanager/model-v1alpha3/src/main/resources/schema/certmanager-schema.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "http://fabric8.io/jetstack/CertManagerSchema#",
"$schema": "http://json-schema.org/draft-05/schema#",
"$schema": "http://json-schema.org/draft-07/schema#",
"definitions": {
"github_com_jetstack_cert-manager_pkg_apis_acme_v1alpha3_ACMEAuthorization": {
"type": "object",
Expand Down
2 changes: 1 addition & 1 deletion extensions/certmanager/model-v1beta1/src/main/resources/schema/certmanager-schema.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "http://fabric8.io/jetstack/CertManagerSchema#",
"$schema": "http://json-schema.org/draft-05/schema#",
"$schema": "http://json-schema.org/draft-07/schema#",
"definitions": {
"github_com_jetstack_cert-manager_pkg_apis_acme_v1beta1_ACMEAuthorization": {
"type": "object",
Expand Down
2 changes: 1 addition & 1 deletion extensions/chaosmesh/model/src/main/resources/schema/chaosmesh-schema.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "http://fabric8.io/csi/ChaosMeshSchema#",
"$schema": "http://json-schema.org/draft-05/schema#",
"$schema": "http://json-schema.org/draft-07/schema#",
"definitions": {
"github_com_chaos-mesh_chaos-mesh_api_v1alpha1_AWSChaos": {
"type": "object",
Expand Down
2 changes: 1 addition & 1 deletion extensions/istio/model-v1alpha3/src/main/resources/schema/istio-schema.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "http://fabric8.io/istio/IstioSchema#",
"$schema": "http://json-schema.org/draft-05/schema#",
"$schema": "http://json-schema.org/draft-07/schema#",
"definitions": {
"github_com_gogo_protobuf_types_ListValue": {
"type": "object",
Expand Down
2 changes: 1 addition & 1 deletion extensions/istio/model-v1beta1/src/main/resources/schema/istio-schema.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "http://fabric8.io/istio/IstioSchema#",
"$schema": "http://json-schema.org/draft-05/schema#",
"$schema": "http://json-schema.org/draft-07/schema#",
"definitions": {
"istio_io_api_analysis_v1alpha1_AnalysisMessageBase": {
"type": "object",
Expand Down
2 changes: 1 addition & 1 deletion extensions/knative/model/src/main/resources/schema/knative-schema.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "http://fabric8.io/knative/KnativeSchema#",
"$schema": "http://json-schema.org/draft-05/schema#",
"$schema": "http://json-schema.org/draft-07/schema#",
"definitions": {
"knative_dev_eventing-awssqs_pkg_apis_sources_v1alpha1_AwsSqsSource": {
"type": "object",
Expand Down
2 changes: 1 addition & 1 deletion ...anagement/model-agent/src/main/resources/schema/open-cluster-management-agent-schema.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "http://fabric8.io/OpenClusterManagement#Agent",
"$schema": "http://json-schema.org/draft-05/schema#",
"$schema": "http://json-schema.org/draft-07/schema#",
"definitions": {
"github_com_open-cluster-management_klusterlet-addon-controller_pkg_apis_agent_v1_KlusterletAddonAgentConfigSpec": {
"type": "object",
Expand Down
2 changes: 1 addition & 1 deletion ...-management/model-apps/src/main/resources/schema/open-cluster-management-apps-schema.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "http://fabric8.io/OpenClusterManagement#Apps",
"$schema": "http://json-schema.org/draft-05/schema#",
"$schema": "http://json-schema.org/draft-07/schema#",
"definitions": {
"open-cluster-management_io_multicloud-operators-channel_pkg_apis_apps_v1_Channel": {
"type": "object",
Expand Down
2 changes: 1 addition & 1 deletion ...ement/model-cluster/src/main/resources/schema/open-cluster-management-cluster-schema.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "http://fabric8.io/OpenClusterManagement#",
"$schema": "http://json-schema.org/draft-05/schema#",
"$schema": "http://json-schema.org/draft-07/schema#",
"definitions": {
"open-cluster-management_io_api_cluster_v1_ClientConfig": {
"type": "object",
Expand Down
2 changes: 1 addition & 1 deletion ...t/model-discovery/src/main/resources/schema/open-cluster-management-discovery-schema.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "http://fabric8.io/OpenClusterManagement#Discovery",
"$schema": "http://json-schema.org/draft-05/schema#",
"$schema": "http://json-schema.org/draft-07/schema#",
"definitions": {
"github_com_open-cluster-management_discovery_api_v1alpha1_DiscoveredCluster": {
"type": "object",
Expand Down
2 changes: 1 addition & 1 deletion ...observability/src/main/resources/schema/open-cluster-management-observability-schema.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "http://fabric8.io/OpenClusterManagement#PlacementRuleApps",
"$schema": "http://json-schema.org/draft-05/schema#",
"$schema": "http://json-schema.org/draft-07/schema#",
"definitions": {
"github_com_open-cluster-management_multicluster-observability-operator_operators_multiclusterobservability_api_shared_Condition": {
"type": "object",
Expand Down
2 changes: 1 addition & 1 deletion ...ent/model-operator/src/main/resources/schema/open-cluster-management-operator-schema.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "http://fabric8.io/OpenClusterManagement#PlacementRuleApps",
"$schema": "http://json-schema.org/draft-05/schema#",
"$schema": "http://json-schema.org/draft-07/schema#",
"definitions": {
"github_com_open-cluster-management_multiclusterhub-operator_api_v1_BackupConfig": {
"type": "object",
Expand Down
2 changes: 1 addition & 1 deletion ...truleapps/src/main/resources/schema/open-cluster-management-placementruleapps-schema.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "http://fabric8.io/OpenClusterManagement#PlacementRuleApps",
"$schema": "http://json-schema.org/draft-05/schema#",
"$schema": "http://json-schema.org/draft-07/schema#",
"definitions": {
"github_com_open-cluster-management_multicloud-integrations_pkg_apis_apps_v1beta1_ArgoServerSpec": {
"type": "object",
Expand Down
2 changes: 1 addition & 1 deletion ...agement/model-policy/src/main/resources/schema/open-cluster-management-policy-schema.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "http://fabric8.io/OpenClusterManagement#Policy",
"$schema": "http://json-schema.org/draft-05/schema#",
"$schema": "http://json-schema.org/draft-07/schema#",
"definitions": {
"github_com_open-cluster-management_governance-policy-propagator_api_v1_ComplianceHistory": {
"type": "object",
Expand Down
2 changes: 1 addition & 1 deletion ...agement/model-search/src/main/resources/schema/open-cluster-management-search-schema.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "http://fabric8.io/OpenClusterManagement#PlacementRuleApps",
"$schema": "http://json-schema.org/draft-05/schema#",
"$schema": "http://json-schema.org/draft-07/schema#",
"definitions": {
"github_com_open-cluster-management_search-operator_api_v1alpha1_ImageOverrides": {
"type": "object",
Expand Down
2 changes: 1 addition & 1 deletion extensions/service-catalog/model/src/main/resources/schema/servicecatalog-schema.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "http://fabric8.io/knative/ServiceCatalogSchema#",
"$schema": "http://json-schema.org/draft-05/schema#",
"$schema": "http://json-schema.org/draft-07/schema#",
"definitions": {
"github_com_kubernetes-sigs_service-catalog_pkg_apis_servicecatalog_v1beta1_AddKeyTransform": {
"type": "object",
Expand Down
2 changes: 1 addition & 1 deletion ...ions/tekton/model-triggers-v1alpha1/src/main/resources/schema/tekton-schema-triggers.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "http://fabric8.io/tekton/triggers/TektonSchema#",
"$schema": "http://json-schema.org/draft-05/schema#",
"$schema": "http://json-schema.org/draft-07/schema#",
"definitions": {
"github_com_tektoncd_triggers_pkg_apis_triggers_v1alpha1_BitbucketInterceptor": {
"type": "object",
Expand Down
2 changes: 1 addition & 1 deletion ...sions/tekton/model-triggers-v1beta1/src/main/resources/schema/tekton-schema-triggers.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "http://fabric8.io/tekton/triggers/TektonSchema#",
"$schema": "http://json-schema.org/draft-05/schema#",
"$schema": "http://json-schema.org/draft-07/schema#",
"definitions": {
"github_com_tektoncd_triggers_pkg_apis_triggers_v1beta1_ClusterTriggerBinding": {
"type": "object",
Expand Down
2 changes: 1 addition & 1 deletion extensions/tekton/model-v1alpha1/src/main/resources/schema/tekton-schema-v1alpha1.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "http://fabric8.io/tekton/v1alpha1/TektonSchema#",
"$schema": "http://json-schema.org/draft-05/schema#",
"$schema": "http://json-schema.org/draft-07/schema#",
"definitions": {
"github_com_tektoncd_pipeline_pkg_apis_pipeline_pod_Template": {
"type": "object",
Expand Down
2 changes: 1 addition & 1 deletion extensions/tekton/model-v1beta1/src/main/resources/schema/tekton-schema-v1beta1.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "http://fabric8.io/tekton/v1beta1/TektonSchema#",
"$schema": "http://json-schema.org/draft-05/schema#",
"$schema": "http://json-schema.org/draft-07/schema#",
"definitions": {
"github_com_tektoncd_pipeline_pkg_apis_pipeline_pod_Template": {
"type": "object",
Expand Down
2 changes: 1 addition & 1 deletion ...erticalpodautoscaler/model-v1/src/main/resources/schema/verticalpodautoscaler-schema.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "http://fabric8.io/autoscaler/VerticalPodAutoscalerSchema#",
"$schema": "http://json-schema.org/draft-05/schema#",
"$schema": "http://json-schema.org/draft-07/schema#",
"definitions": {
"k8s_io_autoscaler_vertical-pod-autoscaler_pkg_apis_autoscaling_k8s_io_v1_ContainerResourcePolicy": {
"type": "object",
Expand Down
2 changes: 1 addition & 1 deletion extensions/volcano/model-v1beta1/src/main/resources/schema/volcano-schema.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "http://fabric8.io/volcano.sh/VolcanoSchema#",
"$schema": "http://json-schema.org/draft-05/schema#",
"$schema": "http://json-schema.org/draft-07/schema#",
"definitions": {
"volcano_sh_apis_pkg_apis_scheduling_v1beta1_PodGroup": {
"type": "object",
Expand Down
2 changes: 1 addition & 1 deletion extensions/volumesnapshot/model/src/main/resources/schema/volumesnapshot-schema.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "http://fabric8.io/csi/VolumeSnapshotSchema#",
"$schema": "http://json-schema.org/draft-05/schema#",
"$schema": "http://json-schema.org/draft-07/schema#",
"definitions": {
"github_com_kubernetes-csi_external-snapshotter_client_v4_apis_volumesnapshot_v1_VolumeSnapshot": {
"type": "object",
Expand Down
2 changes: 1 addition & 1 deletion generator/pkg/schemagen/generate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ func (g *schemaGenerator) generate(schemaId string, crdLists map[reflect.Type]Cr

s := JSONSchema{
ID: schemaId,
Schema: "http://json-schema.org/draft-05/schema#",
Schema: "http://json-schema.org/draft-07/schema#",
JSONDescriptor: JSONDescriptor{
Type: "object",
},
Expand Down
4 changes: 2 additions & 2 deletions java-generator/core/src/test/resources/kamelet-crd.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ spec:
type: object
definition:
description: JSONSchemaProps is a JSON-Schema following Specification
Draft 4 (http://json-schema.org/).
Draft 7 (http://json-schema.org/).
properties:
$schema:
description: JSONSchemaURL represents a schema url.
Expand Down Expand Up @@ -274,7 +274,7 @@ spec:
type: string
schema:
description: JSONSchemaProps is a JSON-Schema following Specification
Draft 4 (http://json-schema.org/).
Draft 7 (http://json-schema.org/).
properties:
$schema:
description: JSONSchemaURL represents a schema url.
Expand Down
10 changes: 5 additions & 5 deletions java-generator/it/src/it/extensions/src/test/resources/camel-k.crds.1.8.1.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12958,7 +12958,7 @@ spec:
type: string
schema:
description: JSONSchemaProps is a JSON-Schema following
Specification Draft 4 (http://json-schema.org/).
Specification Draft 7 (http://json-schema.org/).
properties:
$schema:
description: JSONSchemaURL represents a schema url.
Expand Down Expand Up @@ -13173,7 +13173,7 @@ spec:
type: string
schema:
description: JSONSchemaProps is a JSON-Schema following
Specification Draft 4 (http://json-schema.org/).
Specification Draft 7 (http://json-schema.org/).
properties:
$schema:
description: JSONSchemaURL represents a schema url.
Expand Down Expand Up @@ -13391,7 +13391,7 @@ spec:
type: string
schema:
description: JSONSchemaProps is a JSON-Schema following
Specification Draft 4 (http://json-schema.org/).
Specification Draft 7 (http://json-schema.org/).
properties:
$schema:
description: JSONSchemaURL represents a schema url.
Expand Down Expand Up @@ -13667,7 +13667,7 @@ spec:
type: object
definition:
description: JSONSchemaProps is a JSON-Schema following Specification
Draft 4 (http://json-schema.org/).
Draft 7 (http://json-schema.org/).
properties:
$schema:
description: JSONSchemaURL represents a schema url.
Expand Down Expand Up @@ -13874,7 +13874,7 @@ spec:
type: string
schema:
description: JSONSchemaProps is a JSON-Schema following Specification
Draft 4 (http://json-schema.org/).
Draft 7 (http://json-schema.org/).
properties:
$schema:
description: JSONSchemaURL represents a schema url.
Expand Down
2 changes: 1 addition & 1 deletion ...nerator/kubernetes-model-admissionregistration/src/main/resources/schema/kube-schema.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "http://fabric8.io/fabric8/v2/Schema#",
"$schema": "http://json-schema.org/draft-05/schema#",
"$schema": "http://json-schema.org/draft-07/schema#",
"$module": "admissionregistration",
"definitions": {
"k8s_io_apimachinery_pkg_api_resource_Quantity": {
Expand Down
Loading

0 comments on commit 6023042

Please sign in to comment.