Skip to content

Commit

Permalink
Merge branch '5.0.x' into 5.1.x
Browse files Browse the repository at this point in the history 
# Conflicts:
#	CHANGELOG.md
#	README.md
#	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-settings/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
manusa committed Jan 5, 2022
2 parents 93e11ec + 0fa9285 commit 1ee9a8e
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 20 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
## CHANGELOG

### 5.0.3 (2022-01-05)

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

### 5.1.1 (2021-02-24)

#### Bugs
Expand Down
2 changes: 2 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,7 @@ class ExampleTest {
|---------------------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|-----------|-----------|-----------|-----------|
| kubernetes-client 5.1.1 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | - |
| kubernetes-client 5.1.0 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | - |
| kubernetes-client 5.0.3 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | - |
| kubernetes-client 5.0.2 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | - |
| kubernetes-client 5.0.1 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | - |
| kubernetes-client 5.0.0 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | - |
Expand Down Expand Up @@ -454,6 +455,7 @@ class ExampleTest {
|---------------------------|------------|-----------|-----------|------------|------------|------------|-----------|-----------|
| openshift-client 5.1.1 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - |
| openshift-client 5.1.0 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - |
| openshift-client 5.0.3 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - |
| openshift-client 5.0.2 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - |
| openshift-client 5.0.1 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - |
| openshift-client 5.0.0 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - |
Expand Down
3 changes: 2 additions & 1 deletion kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/Serialization.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import io.fabric8.kubernetes.api.model.KubernetesResource;
import io.fabric8.kubernetes.client.KubernetesClientException;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.SafeConstructor;

import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
Expand Down Expand Up @@ -296,7 +297,7 @@ private static String readSpecFileFromInputStream(InputStream inputStream) {
}

private static <T> T unmarshalYaml(InputStream is, TypeReference<T> type) throws JsonProcessingException {
final Yaml yaml = new Yaml();
final Yaml yaml = new Yaml(new SafeConstructor());
Map<String, Object> obj = yaml.load(is);
String objAsJsonStr = JSON_MAPPER.writeValueAsString(obj);
return unmarshalJsonStr(objAsJsonStr, type);
Expand Down
43 changes: 24 additions & 19 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,14 @@

<distributionManagement>
<snapshotRepository>
<id>oss-sonatype-staging</id>
<id>ossrh</id>
<name>Sonatype OSS Repository (Snapshots)</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>oss-sonatype-staging</id>
<name>Sonatype Staging Repository</name>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
<id>ossrh</id>
<name>Sonatype OSS Repository</name>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>

Expand Down Expand Up @@ -144,6 +145,7 @@
<jandex.version>2.2.3.Final</jandex.version>
<jacoco-maven-plugin.version>0.8.6</jacoco-maven-plugin.version>
<sonar-maven-plugin.version>3.8.0.2131</sonar-maven-plugin.version>
<nexus-staging-maven-plugin>1.6.8</nexus-staging-maven-plugin>

<!-- Other options -->
<maven.compiler.source>1.8</maven.compiler.source>
Expand Down Expand Up @@ -759,17 +761,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.8</version>
<extensions>true</extensions>
<configuration>
<serverId>oss-sonatype-staging</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>
</plugins>
</build>

Expand All @@ -785,10 +776,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>${maven.gpg.plugin.version}</version>
<configuration>
<passphrase>4uds0n</passphrase>
<useAgent>true</useAgent>
</configuration>
<executions>
<execution>
<id>sign-artifacts</id>
Expand All @@ -798,6 +785,24 @@
</goals>
</execution>
</executions>
<configuration>
<gpgArguments>
<arg>--batch</arg>
<arg>--pinentry-mode</arg>
<arg>loopback</arg>
</gpgArguments>
</configuration>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>${nexus-staging-maven-plugin}</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>false</autoReleaseAfterClose>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down

0 comments on commit 1ee9a8e

Please sign in to comment.