Skip to content

Commit

Permalink
Merge branch '5.3.x' into 5.4.x
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
#	README.md
#	crd-generator/api/pom.xml
#	crd-generator/apt/pom.xml
#	crd-generator/pom.xml
#	extensions/camel-k/client/pom.xml
#	extensions/camel-k/mock/pom.xml
#	extensions/camel-k/model-v1/pom.xml
#	extensions/camel-k/model-v1alpha1/pom.xml
#	extensions/camel-k/pom.xml
#	extensions/camel-k/tests/pom.xml
#	extensions/chaosmesh/client/pom.xml
#	extensions/chaosmesh/examples/pom.xml
#	extensions/chaosmesh/mock/pom.xml
#	extensions/chaosmesh/model/pom.xml
#	extensions/chaosmesh/pom.xml
#	extensions/chaosmesh/tests/pom.xml
#	extensions/knative/client/pom.xml
#	extensions/knative/examples/pom.xml
#	extensions/knative/mock/pom.xml
#	extensions/knative/model/pom.xml
#	extensions/knative/pom.xml
#	extensions/knative/tests/pom.xml
#	extensions/pom.xml
#	extensions/service-catalog/client/pom.xml
#	extensions/service-catalog/examples/pom.xml
#	extensions/service-catalog/mock/pom.xml
#	extensions/service-catalog/model/pom.xml
#	extensions/service-catalog/pom.xml
#	extensions/service-catalog/tests/pom.xml
#	extensions/tekton/client/pom.xml
#	extensions/tekton/examples/pom.xml
#	extensions/tekton/mock/pom.xml
#	extensions/tekton/model-triggers/pom.xml
#	extensions/tekton/model-v1alpha1/pom.xml
#	extensions/tekton/model-v1beta1/pom.xml
#	extensions/tekton/pom.xml
#	extensions/tekton/tests/pom.xml
#	extensions/volumesnapshot/client/pom.xml
#	extensions/volumesnapshot/examples/pom.xml
#	extensions/volumesnapshot/mock/pom.xml
#	extensions/volumesnapshot/model/pom.xml
#	extensions/volumesnapshot/pom.xml
#	extensions/volumesnapshot/tests/pom.xml
#	kubernetes-client/pom.xml
#	kubernetes-examples/pom.xml
#	kubernetes-itests/pom.xml
#	kubernetes-model-generator/kubernetes-model-admissionregistration/pom.xml
#	kubernetes-model-generator/kubernetes-model-apiextensions/pom.xml
#	kubernetes-model-generator/kubernetes-model-apps/pom.xml
#	kubernetes-model-generator/kubernetes-model-autoscaling/pom.xml
#	kubernetes-model-generator/kubernetes-model-batch/pom.xml
#	kubernetes-model-generator/kubernetes-model-certificates/pom.xml
#	kubernetes-model-generator/kubernetes-model-common/pom.xml
#	kubernetes-model-generator/kubernetes-model-coordination/pom.xml
#	kubernetes-model-generator/kubernetes-model-core/pom.xml
#	kubernetes-model-generator/kubernetes-model-discovery/pom.xml
#	kubernetes-model-generator/kubernetes-model-events/pom.xml
#	kubernetes-model-generator/kubernetes-model-extensions/pom.xml
#	kubernetes-model-generator/kubernetes-model-jsonschema2pojo/pom.xml
#	kubernetes-model-generator/kubernetes-model-metrics/pom.xml
#	kubernetes-model-generator/kubernetes-model-networking/pom.xml
#	kubernetes-model-generator/kubernetes-model-node/pom.xml
#	kubernetes-model-generator/kubernetes-model-policy/pom.xml
#	kubernetes-model-generator/kubernetes-model-rbac/pom.xml
#	kubernetes-model-generator/kubernetes-model-scheduling/pom.xml
#	kubernetes-model-generator/kubernetes-model-storageclass/pom.xml
#	kubernetes-model-generator/kubernetes-model/pom.xml
#	kubernetes-model-generator/openshift-model-console/pom.xml
#	kubernetes-model-generator/openshift-model-monitoring/pom.xml
#	kubernetes-model-generator/openshift-model-operator/pom.xml
#	kubernetes-model-generator/openshift-model-operatorhub/pom.xml
#	kubernetes-model-generator/openshift-model/pom.xml
#	kubernetes-model-generator/pom.xml
#	kubernetes-server-mock/pom.xml
#	kubernetes-tests/pom.xml
#	model-annotator/pom.xml
#	openshift-client/pom.xml
#	openshift-server-mock/pom.xml
#	platforms/karaf/features/pom.xml
#	platforms/karaf/itests/pom.xml
#	platforms/karaf/pom.xml
#	platforms/pom.xml
#	pom.xml
#	uberjar/pom.xml
  • Loading branch information
manusa committed Jan 5, 2022
2 parents 0f1e487 + 930aa48 commit 903fb84
Show file tree
Hide file tree
Showing 4 changed files with 166 additions and 138 deletions.
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
## CHANGELOG

### 5.3.2 (2022-01-05)

#### Bugs
* Fix #3653: SnakeYAML uses only standard Java types

### 5.1.2 (2022-01-05)

#### Bugs
* Fix #3653: SnakeYAML uses only standard Java types

### 5.0.3 (2022-01-05)

#### Bugs
* Fix #3653: SnakeYAML uses only standard Java types


### 5.4.1 (2021-06-01)

#### Bugs
Expand Down
Loading

0 comments on commit 903fb84

Please sign in to comment.