Skip to content

Commit 5d1c50c

Browse files
manusamanusa
committed
Merge branch '5.8.x' into 5.11.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/certmanager/client/pom.xml # extensions/certmanager/examples/pom.xml # extensions/certmanager/mock/pom.xml # extensions/certmanager/model-v1/pom.xml # extensions/certmanager/model-v1alpha2/pom.xml # extensions/certmanager/model-v1alpha3/pom.xml # extensions/certmanager/model-v1beta1/pom.xml # extensions/certmanager/pom.xml # extensions/certmanager/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-clusterautoscaling/pom.xml # kubernetes-model-generator/openshift-model-console/pom.xml # kubernetes-model-generator/openshift-model-machine/pom.xml # kubernetes-model-generator/openshift-model-machineconfig/pom.xml # kubernetes-model-generator/openshift-model-miscellaneous/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-storageversionmigrator/pom.xml # kubernetes-model-generator/openshift-model-tuned/pom.xml # kubernetes-model-generator/openshift-model-whereabouts/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 e6a7b25 + a927ae6 commit 5d1c50c

File tree

4 files changed

+68
-20
lines changed

4 files changed

+68
-20
lines changed

‎CHANGELOG.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,36 @@
1212

1313
#### _**Note**_: Breaking changes in the API
1414

15+
### 5.8.1 (2022-01-05)
16+
17+
#### Bugs
18+
* Fix #3653: SnakeYAML uses only standard Java types
19+
20+
### 5.7.4 (2022-01-05)
21+
22+
#### Bugs
23+
* Fix #3653: SnakeYAML uses only standard Java types
24+
25+
### 5.4.2 (2022-01-05)
26+
27+
#### Bugs
28+
* Fix #3653: SnakeYAML uses only standard Java types
29+
30+
### 5.3.2 (2022-01-05)
31+
32+
#### Bugs
33+
* Fix #3653: SnakeYAML uses only standard Java types
34+
35+
### 5.1.2 (2022-01-05)
36+
37+
#### Bugs
38+
* Fix #3653: SnakeYAML uses only standard Java types
39+
40+
### 5.0.3 (2022-01-05)
41+
42+
#### Bugs
43+
* Fix #3653: SnakeYAML uses only standard Java types
44+
1545
### 5.11.1 (2021-12-24)
1646

1747
### Bugs

‎README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,21 +405,27 @@ class ExampleTest {
405405
| kubernetes-client 5.10.1 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | - | |
406406
| kubernetes-client 5.10.0 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | - | |
407407
| kubernetes-client 5.9.0 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | - | |
408+
| kubernetes-client 5.8.1 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | - | |
408409
| kubernetes-client 5.8.0 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | - | |
410+
| kubernetes-client 5.7.4 | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | - |
409411
| kubernetes-client 5.7.3 | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | - |
410412
| kubernetes-client 5.7.2 | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | - |
411413
| kubernetes-client 5.7.1 | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | - |
412414
| kubernetes-client 5.7.0 | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | - |
413415
| kubernetes-client 5.6.0 | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | - |
414416
| kubernetes-client 5.5.0 | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | - |
417+
| kubernetes-client 5.4.2 | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | - |
415418
| kubernetes-client 5.4.1 | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | - |
416419
| kubernetes-client 5.4.0 | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | - |
420+
| kubernetes-client 5.3.2 | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | - |
417421
| kubernetes-client 5.3.1 | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | - |
418422
| kubernetes-client 5.3.0 | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | - |
419423
| kubernetes-client 5.2.1 | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | - |
420424
| kubernetes-client 5.2.0 | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | - |
425+
| kubernetes-client 5.1.2 | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | - |
421426
| kubernetes-client 5.1.1 | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | - |
422427
| kubernetes-client 5.1.0 | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | - |
428+
| kubernetes-client 5.0.3 | - | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | - |
423429
| kubernetes-client 5.0.2 | - | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | - |
424430
| kubernetes-client 5.0.1 | - | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | - |
425431
| kubernetes-client 5.0.0 | - | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | - |
@@ -481,21 +487,27 @@ class ExampleTest {
481487
| openshift-client 5.10.1 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - |
482488
| openshift-client 5.10.0 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - |
483489
| openshift-client 5.9.0 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - |
490+
| openshift-client 5.8.1 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - |
484491
| openshift-client 5.8.0 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - |
492+
| openshift-client 5.7.4 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - |
485493
| openshift-client 5.7.3 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - |
486494
| openshift-client 5.7.2 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - |
487495
| openshift-client 5.7.1 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - |
488496
| openshift-client 5.7.0 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - |
489497
| openshift-client 5.6.0 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - |
490498
| openshift-client 5.5.0 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - |
499+
| openshift-client 5.4.2 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - |
491500
| openshift-client 5.4.1 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - |
492501
| openshift-client 5.4.0 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - |
502+
| openshift-client 5.3.2 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - |
493503
| openshift-client 5.3.1 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - |
494504
| openshift-client 5.3.0 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - |
495505
| openshift-client 5.2.1 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - |
496506
| openshift-client 5.2.0 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - |
507+
| openshift-client 5.1.2 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - |
497508
| openshift-client 5.1.1 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - |
498509
| openshift-client 5.1.0 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - |
510+
| openshift-client 5.0.3 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - |
499511
| openshift-client 5.0.2 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - |
500512
| openshift-client 5.0.1 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - |
501513
| openshift-client 5.0.0 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - |

‎kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/Serialization.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040

4141
import io.fabric8.kubernetes.client.utils.serialization.UnmatchedFieldTypeModule;
4242
import org.yaml.snakeyaml.Yaml;
43+
import org.yaml.snakeyaml.constructor.SafeConstructor;
4344

4445
public class Serialization {
4546
private Serialization() { }
@@ -365,7 +366,7 @@ private static String readSpecFileFromInputStream(InputStream inputStream) {
365366
}
366367

367368
private static <T> T unmarshalYaml(InputStream is, TypeReference<T> type) throws JsonProcessingException {
368-
final Yaml yaml = new Yaml();
369+
final Yaml yaml = new Yaml(new SafeConstructor());
369370
Map<String, Object> obj = yaml.load(is);
370371
String objAsJsonStr = JSON_MAPPER.writeValueAsString(obj);
371372
return unmarshalJsonStr(objAsJsonStr, type);

‎pom.xml

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,14 @@
6464

6565
<distributionManagement>
6666
<snapshotRepository>
67-
<id>oss-sonatype-staging</id>
67+
<id>ossrh</id>
68+
<name>Sonatype OSS Repository (Snapshots)</name>
6869
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
6970
</snapshotRepository>
7071
<repository>
71-
<id>oss-sonatype-staging</id>
72-
<name>Sonatype Staging Repository</name>
73-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
72+
<id>ossrh</id>
73+
<name>Sonatype OSS Repository</name>
74+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
7475
</repository>
7576
</distributionManagement>
7677

@@ -142,6 +143,7 @@
142143
<jandex.version>2.4.1.Final</jandex.version>
143144
<jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
144145
<sonar-maven-plugin.version>3.9.1.2184</sonar-maven-plugin.version>
146+
<nexus-staging-maven-plugin>1.6.8</nexus-staging-maven-plugin>
145147

146148
<!-- Other options -->
147149
<maven.compiler.source>1.8</maven.compiler.source>
@@ -875,17 +877,6 @@
875877
</execution>
876878
</executions>
877879
</plugin>
878-
<plugin>
879-
<groupId>org.sonatype.plugins</groupId>
880-
<artifactId>nexus-staging-maven-plugin</artifactId>
881-
<version>1.6.8</version>
882-
<extensions>true</extensions>
883-
<configuration>
884-
<serverId>oss-sonatype-staging</serverId>
885-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
886-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
887-
</configuration>
888-
</plugin>
889880
</plugins>
890881
</build>
891882

@@ -901,10 +892,6 @@
901892
<groupId>org.apache.maven.plugins</groupId>
902893
<artifactId>maven-gpg-plugin</artifactId>
903894
<version>${maven.gpg.plugin.version}</version>
904-
<configuration>
905-
<passphrase>4uds0n</passphrase>
906-
<useAgent>true</useAgent>
907-
</configuration>
908895
<executions>
909896
<execution>
910897
<id>sign-artifacts</id>
@@ -914,6 +901,24 @@
914901
</goals>
915902
</execution>
916903
</executions>
904+
<configuration>
905+
<gpgArguments>
906+
<arg>--batch</arg>
907+
<arg>--pinentry-mode</arg>
908+
<arg>loopback</arg>
909+
</gpgArguments>
910+
</configuration>
911+
</plugin>
912+
<plugin>
913+
<groupId>org.sonatype.plugins</groupId>
914+
<artifactId>nexus-staging-maven-plugin</artifactId>
915+
<version>${nexus-staging-maven-plugin}</version>
916+
<extensions>true</extensions>
917+
<configuration>
918+
<serverId>ossrh</serverId>
919+
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
920+
<autoReleaseAfterClose>false</autoReleaseAfterClose>
921+
</configuration>
917922
</plugin>
918923
<plugin>
919924
<groupId>org.apache.maven.plugins</groupId>

0 commit comments

Comments
 (0)