Skip to content

Commit d20d8a4

Browse files
manusamanusa
committed
Merge branch '5.4.x' into 5.7.x
# 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-flowcontrol/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
2 parents 6dacce1 + ec38c86 commit d20d8a4

File tree

4 files changed

+184
-150
lines changed

4 files changed

+184
-150
lines changed

‎CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,26 @@
88
#### New Features
99
#### _**Note**_: Breaking changes in the API
1010

11+
### 5.4.2 (2022-01-05)
12+
13+
#### Bugs
14+
* Fix #3653: SnakeYAML uses only standard Java types
15+
16+
### 5.3.2 (2022-01-05)
17+
18+
#### Bugs
19+
* Fix #3653: SnakeYAML uses only standard Java types
20+
21+
### 5.1.2 (2022-01-05)
22+
23+
#### Bugs
24+
* Fix #3653: SnakeYAML uses only standard Java types
25+
26+
### 5.0.3 (2022-01-05)
27+
28+
#### Bugs
29+
* Fix #3653: SnakeYAML uses only standard Java types
30+
1131
### 5.7.3 (2021-09-09)
1232

1333
#### Bugs

0 commit comments

Comments
 (0)