This is an automated email from the ASF dual-hosted git repository.
technoboy pushed a commit to branch branch-2.11
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.11 by this push:
new ad9b9a74929 [improve][build] Upgrade snakeyaml version to 2.0 (#20120)
ad9b9a74929 is described below
commit ad9b9a749293e3e74dc1283b669501af2e7095e1
Author: Jiwei Guo <[email protected]>
AuthorDate: Tue Apr 18 14:51:14 2023 +0800
[improve][build] Upgrade snakeyaml version to 2.0 (#20120)
---
buildtools/pom.xml | 2 +-
distribution/server/src/assemble/LICENSE.bin.txt | 26 +++++++++----------
distribution/shell/src/assemble/LICENSE.bin.txt | 18 ++++++-------
pom.xml | 6 ++---
.../auth/KubernetesSecretsTokenAuthProvider.java | 9 ++++---
.../runtime/kubernetes/KubernetesRuntime.java | 9 ++++---
.../kubernetes/KubernetesRuntimeFactory.java | 2 +-
.../KubernetesSecretsTokenAuthProviderTest.java | 2 +-
.../kubernetes/KubernetesRuntimeFactoryTest.java | 6 ++---
pulsar-functions/secrets/pom.xml | 14 ++++++++++
pulsar-sql/presto-distribution/LICENSE | 30 +++++++++++-----------
src/owasp-dependency-check-suppressions.xml | 8 ------
12 files changed, 70 insertions(+), 62 deletions(-)
diff --git a/buildtools/pom.xml b/buildtools/pom.xml
index e3d5fecfd62..9ed54c24276 100644
--- a/buildtools/pom.xml
+++ b/buildtools/pom.xml
@@ -49,7 +49,7 @@
<guice.version>4.2.3</guice.version>
<guava.version>31.0.1-jre</guava.version>
<ant.version>1.10.12</ant.version>
- <snakeyaml.version>1.32</snakeyaml.version>
+ <snakeyaml.version>2.0</snakeyaml.version>
<mockito.version>3.12.4</mockito.version>
<!-- required for running tests on JDK11+ -->
<test.additional.args>
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt
b/distribution/server/src/assemble/LICENSE.bin.txt
index 3efeeb0e5da..998e26d48cd 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -312,18 +312,18 @@ The Apache Software License, Version 2.0
* JCommander -- com.beust-jcommander-1.82.jar
* High Performance Primitive Collections for Java --
com.carrotsearch-hppc-0.9.1.jar
* Jackson
- - com.fasterxml.jackson.core-jackson-annotations-2.13.4.jar
- - com.fasterxml.jackson.core-jackson-core-2.13.4.jar
- - com.fasterxml.jackson.core-jackson-databind-2.13.4.2.jar
- - com.fasterxml.jackson.dataformat-jackson-dataformat-yaml-2.13.4.jar
- - com.fasterxml.jackson.jaxrs-jackson-jaxrs-base-2.13.4.jar
- - com.fasterxml.jackson.jaxrs-jackson-jaxrs-json-provider-2.13.4.jar
- - com.fasterxml.jackson.module-jackson-module-jaxb-annotations-2.13.4.jar
- - com.fasterxml.jackson.module-jackson-module-jsonSchema-2.13.4.jar
+ - com.fasterxml.jackson.core-jackson-annotations-2.14.2.jar
+ - com.fasterxml.jackson.core-jackson-core-2.14.2.jar
+ - com.fasterxml.jackson.core-jackson-databind-2.14.2.jar
+ - com.fasterxml.jackson.dataformat-jackson-dataformat-yaml-2.14.2.jar
+ - com.fasterxml.jackson.jaxrs-jackson-jaxrs-base-2.14.2.jar
+ - com.fasterxml.jackson.jaxrs-jackson-jaxrs-json-provider-2.14.2.jar
+ - com.fasterxml.jackson.module-jackson-module-jaxb-annotations-2.14.2.jar
+ - com.fasterxml.jackson.module-jackson-module-jsonSchema-2.14.2.jar
* Caffeine -- com.github.ben-manes.caffeine-caffeine-2.9.1.jar
* Conscrypt -- org.conscrypt-conscrypt-openjdk-uber-2.5.2.jar
* Proto Google Common Protos --
com.google.api.grpc-proto-google-common-protos-2.0.1.jar
- * Bitbucket -- org.bitbucket.b_c-jose4j-0.7.6.jar
+ * Bitbucket -- org.bitbucket.b_c-jose4j-0.9.3.jar
* Gson
- com.google.code.gson-gson-2.8.9.jar
- io.gsonfire-gson-fire-1.8.5.jar
@@ -454,7 +454,7 @@ The Apache Software License, Version 2.0
- org.eclipse.jetty.websocket-websocket-servlet-9.4.48.v20220622.jar
- org.eclipse.jetty-jetty-alpn-conscrypt-server-9.4.48.v20220622.jar
- org.eclipse.jetty-jetty-alpn-server-9.4.48.v20220622.jar
- * SnakeYaml -- org.yaml-snakeyaml-1.32.jar
+ * SnakeYaml -- org.yaml-snakeyaml-2.0.jar
* RocksDB - org.rocksdb-rocksdbjni-6.29.4.1.jar
* Google Error Prone Annotations -
com.google.errorprone-error_prone_annotations-2.5.1.jar
* Apache Thrift - org.apache.thrift-libthrift-0.14.2.jar
@@ -505,9 +505,9 @@ The Apache Software License, Version 2.0
* Apache Yetus
- org.apache.yetus-audience-annotations-0.12.0.jar
* Kubernetes Client
- - io.kubernetes-client-java-12.0.1.jar
- - io.kubernetes-client-java-api-12.0.1.jar
- - io.kubernetes-client-java-proto-12.0.1.jar
+ - io.kubernetes-client-java-18.0.0.jar
+ - io.kubernetes-client-java-api-18.0.0.jar
+ - io.kubernetes-client-java-proto-18.0.0.jar
* Dropwizard
- io.dropwizard.metrics-metrics-core-4.1.12.1.jar
- io.dropwizard.metrics-metrics-graphite-4.1.12.1.jar
diff --git a/distribution/shell/src/assemble/LICENSE.bin.txt
b/distribution/shell/src/assemble/LICENSE.bin.txt
index e78c4cc9a76..b65759e2937 100644
--- a/distribution/shell/src/assemble/LICENSE.bin.txt
+++ b/distribution/shell/src/assemble/LICENSE.bin.txt
@@ -311,14 +311,14 @@ This projects includes binary packages with the following
licenses:
The Apache Software License, Version 2.0
* JCommander -- jcommander-1.82.jar
* Jackson
- - jackson-annotations-2.13.4.jar
- - jackson-core-2.13.4.jar
- - jackson-databind-2.13.4.2.jar
- - jackson-dataformat-yaml-2.13.4.jar
- - jackson-jaxrs-base-2.13.4.jar
- - jackson-jaxrs-json-provider-2.13.4.jar
- - jackson-module-jaxb-annotations-2.13.4.jar
- - jackson-module-jsonSchema-2.13.4.jar
+ - jackson-annotations-2.14.2.jar
+ - jackson-core-2.14.2.jar
+ - jackson-databind-2.14.2.jar
+ - jackson-dataformat-yaml-2.14.2.jar
+ - jackson-jaxrs-base-2.14.2.jar
+ - jackson-jaxrs-json-provider-2.14.2.jar
+ - jackson-module-jaxb-annotations-2.14.2.jar
+ - jackson-module-jsonSchema-2.14.2.jar
* Conscrypt -- conscrypt-openjdk-uber-2.5.2.jar
* Gson
- gson-2.8.9.jar
@@ -398,7 +398,7 @@ The Apache Software License, Version 2.0
- websocket-api-9.4.48.v20220622.jar
- websocket-client-9.4.48.v20220622.jar
- websocket-common-9.4.48.v20220622.jar
- * SnakeYaml -- snakeyaml-1.32.jar
+ * SnakeYaml -- snakeyaml-2.0.jar
* Google Error Prone Annotations - error_prone_annotations-2.5.1.jar
* Javassist -- javassist-3.25.0-GA.jar
* Apache Avro
diff --git a/pom.xml b/pom.xml
index c1c5b186c8e..cce05cd1bf3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,7 +136,7 @@ flexible messaging model and an intuitive client
API.</description>
<log4j2.version>2.18.0</log4j2.version>
<bouncycastle.version>1.69</bouncycastle.version>
<bouncycastlefips.version>1.0.2</bouncycastlefips.version>
- <jackson.version>2.13.4.20221013</jackson.version>
+ <jackson.version>2.14.2</jackson.version>
<reflections.version>0.9.11</reflections.version>
<swagger.version>1.6.2</swagger.version>
<puppycrawl.checkstyle.version>8.37</puppycrawl.checkstyle.version>
@@ -211,7 +211,7 @@ flexible messaging model and an intuitive client
API.</description>
<jakarta.xml.bind.version>2.3.3</jakarta.xml.bind.version>
<jakarta.validation.version>2.0.2</jakarta.validation.version>
<jna.version>4.2.0</jna.version>
- <kubernetesclient.version>12.0.1</kubernetesclient.version>
+ <kubernetesclient.version>18.0.0</kubernetesclient.version>
<okhttp3.version>4.9.3</okhttp3.version>
<!-- use okio version that matches the okhttp3 version -->
<okio.version>2.8.0</okio.version>
@@ -223,7 +223,7 @@ flexible messaging model and an intuitive client
API.</description>
<apache-http-client.version>4.5.13</apache-http-client.version>
<apache-httpcomponents.version>4.4.15</apache-httpcomponents.version>
<jetcd.version>0.5.11</jetcd.version>
- <snakeyaml.version>1.32</snakeyaml.version>
+ <snakeyaml.version>2.0</snakeyaml.version>
<ant.version>1.10.12</ant.version>
<seancfoley.ipaddress.version>5.3.3</seancfoley.ipaddress.version>
<disruptor.version>3.4.3</disruptor.version>
diff --git
a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/auth/KubernetesSecretsTokenAuthProvider.java
b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/auth/KubernetesSecretsTokenAuthProvider.java
index 253874349fb..d8523685905 100644
---
a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/auth/KubernetesSecretsTokenAuthProvider.java
+++
b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/auth/KubernetesSecretsTokenAuthProvider.java
@@ -206,7 +206,7 @@ public class KubernetesSecretsTokenAuthProvider implements
KubernetesFunctionAut
.supplier(() -> {
try {
coreClient.readNamespacedSecret(secretName,
kubeNamespace,
- null, null, null);
+ null);
} catch (ApiException e) {
// statefulset is gone
@@ -305,12 +305,13 @@ public class KubernetesSecretsTokenAuthProvider
implements KubernetesFunctionAut
.data(buildSecretMap(token));
try {
- coreClient.createNamespacedSecret(kubeNamespace,
v1Secret, null, null, null);
+ coreClient.createNamespacedSecret(kubeNamespace,
v1Secret, null, null, null, null);
} catch (ApiException e) {
if (e.getCode() == HTTP_CONFLICT) {
try {
coreClient
- .replaceNamespacedSecret(secretName,
kubeNamespace, v1Secret, null, null, null);
+ .replaceNamespacedSecret(secretName,
kubeNamespace, v1Secret,
+ null, null, null, null);
return
Actions.ActionResult.builder().success(true).build();
} catch (ApiException e1) {
@@ -366,7 +367,7 @@ public class KubernetesSecretsTokenAuthProvider implements
KubernetesFunctionAut
.metadata(new
V1ObjectMeta().name(getSecretName(id)))
.data(buildSecretMap(token));
try {
- coreClient.createNamespacedSecret(kubeNamespace,
v1Secret, null, null, null);
+ coreClient.createNamespacedSecret(kubeNamespace,
v1Secret, null, null, null, null);
} catch (ApiException e) {
// already exists
if (e.getCode() == HTTP_CONFLICT) {
diff --git
a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntime.java
b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntime.java
index 02af86c7334..a40feb09253 100644
---
a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntime.java
+++
b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntime.java
@@ -468,7 +468,7 @@ public class KubernetesRuntime implements Runtime {
.supplier(() -> {
final V1Service response;
try {
- response =
coreClient.createNamespacedService(jobNamespace, service, null, null, null);
+ response =
coreClient.createNamespacedService(jobNamespace, service, null, null, null,
null);
} catch (ApiException e) {
// already exists
if (e.getCode() == HTTP_CONFLICT) {
@@ -557,7 +557,8 @@ public class KubernetesRuntime implements Runtime {
.supplier(() -> {
final V1StatefulSet response;
try {
- response =
appsClient.createNamespacedStatefulSet(jobNamespace, statefulSet, null, null,
null);
+ response =
appsClient.createNamespacedStatefulSet(jobNamespace, statefulSet,
+ null, null, null, null);
} catch (ApiException e) {
// already exists
if (e.getCode() == HTTP_CONFLICT) {
@@ -654,7 +655,7 @@ public class KubernetesRuntime implements Runtime {
V1StatefulSet response;
try {
response =
appsClient.readNamespacedStatefulSet(statefulSetName, jobNamespace,
- null, null, null);
+ null);
} catch (ApiException e) {
// statefulset is gone
if (e.getCode() == HTTP_NOT_FOUND) {
@@ -802,7 +803,7 @@ public class KubernetesRuntime implements Runtime {
V1Service response;
try {
response =
coreClient.readNamespacedService(serviceName, jobNamespace,
- null, null, null);
+ null);
} catch (ApiException e) {
// service is gone
diff --git
a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeFactory.java
b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeFactory.java
index aa000e789c2..3b1c0937a0a 100644
---
a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeFactory.java
+++
b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeFactory.java
@@ -403,7 +403,7 @@ public class KubernetesRuntimeFactory implements
RuntimeFactory {
KubernetesRuntimeFactory
kubernetesRuntimeFactory) {
try {
V1ConfigMap v1ConfigMap =
- coreClient.readNamespacedConfigMap(changeConfigMap,
changeConfigMapNamespace, null, true, false);
+ coreClient.readNamespacedConfigMap(changeConfigMap,
changeConfigMapNamespace, null);
Map<String, String> data = v1ConfigMap.getData();
if (data != null) {
overRideKubernetesConfig(data, kubernetesRuntimeFactory);
diff --git
a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/auth/KubernetesSecretsTokenAuthProviderTest.java
b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/auth/KubernetesSecretsTokenAuthProviderTest.java
index 38dd91426b4..714434d625c 100644
---
a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/auth/KubernetesSecretsTokenAuthProviderTest.java
+++
b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/auth/KubernetesSecretsTokenAuthProviderTest.java
@@ -103,7 +103,7 @@ public class KubernetesSecretsTokenAuthProviderTest {
@Test
public void testCacheAuthData() throws ApiException {
CoreV1Api coreV1Api = mock(CoreV1Api.class);
- doReturn(new
V1Secret()).when(coreV1Api).createNamespacedSecret(anyString(), any(),
anyString(), anyString(), anyString());
+ doReturn(new
V1Secret()).when(coreV1Api).createNamespacedSecret(anyString(), any(),
anyString(), anyString(), anyString(), anyString());
KubernetesSecretsTokenAuthProvider kubernetesSecretsTokenAuthProvider
= new KubernetesSecretsTokenAuthProvider();
kubernetesSecretsTokenAuthProvider.initialize(coreV1Api, null, (fd)
-> "default");
Function.FunctionDetails funcDetails =
Function.FunctionDetails.newBuilder().setTenant("test-tenant").setNamespace("test-ns").setName("test-func").build();
diff --git
a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeFactoryTest.java
b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeFactoryTest.java
index 2347f6e726c..b9c95d5a24e 100644
---
a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeFactoryTest.java
+++
b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeFactoryTest.java
@@ -469,9 +469,9 @@ public class KubernetesRuntimeFactoryTest {
KubernetesRuntimeFactory kubernetesRuntimeFactory =
getKuberentesRuntimeFactory();
CoreV1Api coreV1Api = Mockito.mock(CoreV1Api.class);
V1ConfigMap v1ConfigMap = new V1ConfigMap();
-
Mockito.doReturn(v1ConfigMap).when(coreV1Api).readNamespacedConfigMap(any(),
any(), any(), any(), any());
+
Mockito.doReturn(v1ConfigMap).when(coreV1Api).readNamespacedConfigMap(any(),
any(), any());
KubernetesRuntimeFactory.fetchConfigMap(coreV1Api, changeConfigMap,
changeConfigNamespace, kubernetesRuntimeFactory);
- Mockito.verify(coreV1Api,
Mockito.times(1)).readNamespacedConfigMap(eq(changeConfigMap),
eq(changeConfigNamespace), eq(null), eq(true), eq(false));
+ Mockito.verify(coreV1Api,
Mockito.times(1)).readNamespacedConfigMap(eq(changeConfigMap),
eq(changeConfigNamespace), eq(null));
KubernetesRuntimeFactory expected = getKuberentesRuntimeFactory();
assertEquals(kubernetesRuntimeFactory, expected);
@@ -480,7 +480,7 @@ public class KubernetesRuntimeFactoryTest {
configs.put("imagePullPolicy", "test_imagePullPolicy2");
v1ConfigMap.setData(configs);
KubernetesRuntimeFactory.fetchConfigMap(coreV1Api, changeConfigMap,
changeConfigNamespace, kubernetesRuntimeFactory);
- Mockito.verify(coreV1Api,
Mockito.times(2)).readNamespacedConfigMap(eq(changeConfigMap),
eq(changeConfigNamespace), eq(null), eq(true), eq(false));
+ Mockito.verify(coreV1Api,
Mockito.times(2)).readNamespacedConfigMap(eq(changeConfigMap),
eq(changeConfigNamespace), eq(null));
assertEquals(kubernetesRuntimeFactory.getPulsarDockerImageName(),
"test_dockerImage2");
assertEquals(kubernetesRuntimeFactory.getImagePullPolicy(),
"test_imagePullPolicy2");
diff --git a/pulsar-functions/secrets/pom.xml b/pulsar-functions/secrets/pom.xml
index 813a0a19179..08a7cc9138e 100644
--- a/pulsar-functions/secrets/pom.xml
+++ b/pulsar-functions/secrets/pom.xml
@@ -35,6 +35,20 @@
<groupId>io.kubernetes</groupId>
<artifactId>client-java</artifactId>
<version>${kubernetesclient.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>bcpkix-jdk18on</artifactId>
+ <groupId>org.bouncycastle</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>bcutil-jdk18on</artifactId>
+ <groupId>org.bouncycastle</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>bcprov-jdk18on</artifactId>
+ <groupId>org.bouncycastle</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/pulsar-sql/presto-distribution/LICENSE
b/pulsar-sql/presto-distribution/LICENSE
index 301a837b207..5783834a023 100644
--- a/pulsar-sql/presto-distribution/LICENSE
+++ b/pulsar-sql/presto-distribution/LICENSE
@@ -207,19 +207,19 @@ This projects includes binary packages with the following
licenses:
The Apache Software License, Version 2.0
* Jackson
- - jackson-annotations-2.13.4.jar
- - jackson-core-2.13.4.jar
- - jackson-databind-2.13.4.2.jar
- - jackson-dataformat-smile-2.13.4.jar
- - jackson-datatype-guava-2.13.4.jar
- - jackson-datatype-jdk8-2.13.4.jar
- - jackson-datatype-joda-2.13.4.jar
- - jackson-datatype-jsr310-2.13.4.jar
- - jackson-dataformat-yaml-2.13.4.jar
- - jackson-jaxrs-base-2.13.4.jar
- - jackson-jaxrs-json-provider-2.13.4.jar
- - jackson-module-jaxb-annotations-2.13.4.jar
- - jackson-module-jsonSchema-2.13.4.jar
+ - jackson-annotations-2.14.2.jar
+ - jackson-core-2.14.2.jar
+ - jackson-databind-2.14.2.jar
+ - jackson-dataformat-smile-2.14.2.jar
+ - jackson-datatype-guava-2.14.2.jar
+ - jackson-datatype-jdk8-2.14.2.jar
+ - jackson-datatype-joda-2.14.2.jar
+ - jackson-datatype-jsr310-2.14.2.jar
+ - jackson-dataformat-yaml-2.14.2.jar
+ - jackson-jaxrs-base-2.14.2.jar
+ - jackson-jaxrs-json-provider-2.14.2.jar
+ - jackson-module-jaxb-annotations-2.14.2.jar
+ - jackson-module-jsonSchema-2.14.2.jar
* Guava
- guava-31.0.1-jre.jar
- listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
@@ -417,7 +417,7 @@ The Apache Software License, Version 2.0
* RocksDB JNI
- rocksdbjni-6.29.4.1.jar
* SnakeYAML
- - snakeyaml-1.32.jar
+ - snakeyaml-2.0.jar
* Bean Validation API
- validation-api-2.0.1.Final.jar
* Objectsize
@@ -468,7 +468,7 @@ The Apache Software License, Version 2.0
* Snappy
- snappy-java-1.1.8.4.jar
* Jackson
- - jackson-module-parameter-names-2.13.4.jar
+ - jackson-module-parameter-names-2.14.2.jar
* Java Assist
- javassist-3.25.0-GA.jar
* Java Native Access
diff --git a/src/owasp-dependency-check-suppressions.xml
b/src/owasp-dependency-check-suppressions.xml
index 9ed8e55a51e..9e66c32f517 100644
--- a/src/owasp-dependency-check-suppressions.xml
+++ b/src/owasp-dependency-check-suppressions.xml
@@ -37,14 +37,6 @@
<vulnerabilityName regex="true">.*</vulnerabilityName>
</suppress>
- <suppress>
- <notes><![CDATA[
- file name: snakeyaml-1.32.jar
- ]]></notes>
- <sha1>e80612549feb5c9191c498de628c1aa80693cf0b</sha1>
- <cve>CVE-2022-1471</cve>
- </suppress>
-
<!-- influxdb dependencies -->
<suppress>
<notes><