Skip to content

Commit 7570614

Browse files
eugene-cheverdaeugene-cheverda
committed
[fix][sec] Update dependencies to use snakeyaml 2.0 against 3.0
1 parent e42faff commit 7570614

5 files changed

Lines changed: 44 additions & 43 deletions

File tree

‎distribution/server/src/assemble/LICENSE.bin.txt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -246,17 +246,17 @@ The Apache Software License, Version 2.0
246246
* JCommander -- com.beust-jcommander-1.82.jar
247247
* High Performance Primitive Collections for Java -- com.carrotsearch-hppc-0.9.1.jar
248248
* Jackson
249-
- com.fasterxml.jackson.core-jackson-annotations-2.14.2.jar
250-
- com.fasterxml.jackson.core-jackson-core-2.14.2.jar
251-
- com.fasterxml.jackson.core-jackson-databind-2.14.2.jar
252-
- com.fasterxml.jackson.dataformat-jackson-dataformat-yaml-2.14.2.jar
253-
- com.fasterxml.jackson.jaxrs-jackson-jaxrs-base-2.14.2.jar
254-
- com.fasterxml.jackson.jaxrs-jackson-jaxrs-json-provider-2.14.2.jar
255-
- com.fasterxml.jackson.module-jackson-module-jaxb-annotations-2.14.2.jar
256-
- com.fasterxml.jackson.module-jackson-module-jsonSchema-2.14.2.jar
257-
- com.fasterxml.jackson.datatype-jackson-datatype-jdk8-2.14.2.jar
258-
- com.fasterxml.jackson.datatype-jackson-datatype-jsr310-2.14.2.jar
259-
- com.fasterxml.jackson.module-jackson-module-parameter-names-2.14.2.jar
249+
- com.fasterxml.jackson.core-jackson-annotations-2.15.0.jar
250+
- com.fasterxml.jackson.core-jackson-core-2.15.0.jar
251+
- com.fasterxml.jackson.core-jackson-databind-2.15.0.2.jar
252+
- com.fasterxml.jackson.dataformat-jackson-dataformat-yaml-2.15.0.jar
253+
- com.fasterxml.jackson.jaxrs-jackson-jaxrs-base-2.15.0.jar
254+
- com.fasterxml.jackson.jaxrs-jackson-jaxrs-json-provider-2.15.0.jar
255+
- com.fasterxml.jackson.module-jackson-module-jaxb-annotations-2.15.0.jar
256+
- com.fasterxml.jackson.module-jackson-module-jsonSchema-2.15.0.jar
257+
- com.fasterxml.jackson.datatype-jackson-datatype-jdk8-2.15.0.jar
258+
- com.fasterxml.jackson.datatype-jackson-datatype-jsr310-2.15.0.jar
259+
- com.fasterxml.jackson.module-jackson-module-parameter-names-2.15.0.jar
260260
* Caffeine -- com.github.ben-manes.caffeine-caffeine-2.9.1.jar
261261
* Conscrypt -- org.conscrypt-conscrypt-openjdk-uber-2.5.2.jar
262262
* Proto Google Common Protos -- com.google.api.grpc-proto-google-common-protos-2.0.1.jar
@@ -321,7 +321,7 @@ The Apache Software License, Version 2.0
321321
- io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.18.Final-linux-x86_64.jar
322322
- io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.18.Final-linux-aarch_64.jar
323323
* Prometheus client
324-
- io.prometheus.jmx-collector-0.16.1.jar
324+
- io.prometheus.jmx-collector-0.18.0.jar
325325
- io.prometheus-simpleclient-0.16.0.jar
326326
- io.prometheus-simpleclient_caffeine-0.16.0.jar
327327
- io.prometheus-simpleclient_common-0.16.0.jar

‎distribution/shell/src/assemble/LICENSE.bin.txt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -311,17 +311,17 @@ This projects includes binary packages with the following licenses:
311311
The Apache Software License, Version 2.0
312312
* JCommander -- jcommander-1.82.jar
313313
* Jackson
314-
- jackson-annotations-2.14.2.jar
315-
- jackson-core-2.14.2.jar
316-
- jackson-databind-2.14.2.jar
317-
- jackson-dataformat-yaml-2.14.2.jar
318-
- jackson-jaxrs-base-2.14.2.jar
319-
- jackson-jaxrs-json-provider-2.14.2.jar
320-
- jackson-module-jaxb-annotations-2.14.2.jar
321-
- jackson-module-jsonSchema-2.14.2.jar
322-
- jackson-datatype-jdk8-2.14.2.jar
323-
- jackson-datatype-jsr310-2.14.2.jar
324-
- jackson-module-parameter-names-2.14.2.jar
314+
- jackson-annotations-2.15.0.jar
315+
- jackson-core-2.15.0.jar
316+
- jackson-databind-2.15.0.2.jar
317+
- jackson-dataformat-yaml-2.15.0.jar
318+
- jackson-jaxrs-base-2.15.0.jar
319+
- jackson-jaxrs-json-provider-2.15.0.jar
320+
- jackson-module-jaxb-annotations-2.15.0.jar
321+
- jackson-module-jsonSchema-2.15.0.jar
322+
- jackson-datatype-jdk8-2.15.0.jar
323+
- jackson-datatype-jsr310-2.15.0.jar
324+
- jackson-module-parameter-names-2.15.0.jar
325325
* Conscrypt -- conscrypt-openjdk-uber-2.5.2.jar
326326
* Gson
327327
- gson-2.8.9.jar

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ flexible messaging model and an intuitive client API.</description>
154154
<bouncycastle.version>1.69</bouncycastle.version>
155155
<bouncycastle.bcpkix-fips.version>1.0.6</bouncycastle.bcpkix-fips.version>
156156
<bouncycastle.bc-fips.version>1.0.2.3</bouncycastle.bc-fips.version>
157-
<jackson.version>2.14.2</jackson.version>
157+
<jackson.version>2.15.0</jackson.version>
158158
<reflections.version>0.10.2</reflections.version>
159159
<swagger.version>1.6.10</swagger.version>
160160
<puppycrawl.checkstyle.version>8.37</puppycrawl.checkstyle.version>
@@ -203,7 +203,7 @@ flexible messaging model and an intuitive client API.</description>
203203
<hbase.version>2.4.15</hbase.version>
204204
<guava.version>31.0.1-jre</guava.version>
205205
<jcip.version>1.0</jcip.version>
206-
<prometheus-jmx.version>0.16.1</prometheus-jmx.version>
206+
<prometheus-jmx.version>0.18.0</prometheus-jmx.version>
207207
<confluent.version>6.2.8</confluent.version>
208208
<aircompressor.version>0.20</aircompressor.version>
209209
<asynchttpclient.version>2.12.1</asynchttpclient.version>

‎pulsar-common/src/main/java/org/apache/pulsar/common/util/FieldParser.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import static com.google.common.base.Preconditions.checkArgument;
2222
import static java.lang.String.format;
2323
import static java.util.Objects.requireNonNull;
24-
import com.fasterxml.jackson.databind.AnnotationIntrospector;
25-
import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
24+
import com.fasterxml.jackson.databind.DeserializationConfig;
25+
import com.fasterxml.jackson.databind.ObjectMapper;
2626
import com.fasterxml.jackson.databind.util.EnumResolver;
2727
import java.lang.reflect.Field;
2828
import java.lang.reflect.Method;
@@ -58,7 +58,8 @@ public final class FieldParser {
5858
private static final Map<String, Method> CONVERTERS = new HashMap<>();
5959
private static final Map<Class<?>, Class<?>> WRAPPER_TYPES = new HashMap<>();
6060

61-
private static final AnnotationIntrospector ANNOTATION_INTROSPECTOR = new JacksonAnnotationIntrospector();
61+
private static final ObjectMapper MAPPER = new ObjectMapper();
62+
private static final DeserializationConfig DESERIALIZATION_CONFIG = MAPPER.getDeserializationConfig();
6263

6364
static {
6465
// Preload converters and wrapperTypes.
@@ -100,7 +101,7 @@ public static <T> T convert(Object from, Class<T> to) {
100101

101102
if (to.isEnum()) {
102103
// Converting string to enum
103-
EnumResolver r = EnumResolver.constructUsingToString((Class<Enum<?>>) to, ANNOTATION_INTROSPECTOR);
104+
EnumResolver r = EnumResolver.constructUsingToString(DESERIALIZATION_CONFIG, (Class<Enum<?>>) to);
104105
T value = (T) r.findEnum((String) from);
105106
if (value == null) {
106107
throw new RuntimeException("Invalid value '" + from + "' for enum " + to);

‎pulsar-sql/presto-distribution/LICENSE‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -207,19 +207,19 @@ This projects includes binary packages with the following licenses:
207207
The Apache Software License, Version 2.0
208208

209209
* Jackson
210-
- jackson-annotations-2.14.2.jar
211-
- jackson-core-2.14.2.jar
212-
- jackson-databind-2.14.2.jar
213-
- jackson-dataformat-smile-2.14.2.jar
214-
- jackson-datatype-guava-2.14.2.jar
215-
- jackson-datatype-jdk8-2.14.2.jar
216-
- jackson-datatype-joda-2.14.2.jar
217-
- jackson-datatype-jsr310-2.14.2.jar
218-
- jackson-dataformat-yaml-2.14.2.jar
219-
- jackson-jaxrs-base-2.14.2.jar
220-
- jackson-jaxrs-json-provider-2.14.2.jar
221-
- jackson-module-jaxb-annotations-2.14.2.jar
222-
- jackson-module-jsonSchema-2.14.2.jar
210+
- jackson-annotations-2.15.0.jar
211+
- jackson-core-2.15.0.jar
212+
- jackson-databind-2.15.0.2.jar
213+
- jackson-dataformat-smile-2.15.0.jar
214+
- jackson-datatype-guava-2.15.0.jar
215+
- jackson-datatype-jdk8-2.15.0.jar
216+
- jackson-datatype-joda-2.15.0.jar
217+
- jackson-datatype-jsr310-2.15.0.jar
218+
- jackson-dataformat-yaml-2.15.0.jar
219+
- jackson-jaxrs-base-2.15.0.jar
220+
- jackson-jaxrs-json-provider-2.15.0.jar
221+
- jackson-module-jaxb-annotations-2.15.0.jar
222+
- jackson-module-jsonSchema-2.15.0.jar
223223
* Guava
224224
- guava-31.0.1-jre.jar
225225
- listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
@@ -456,7 +456,7 @@ The Apache Software License, Version 2.0
456456
* Snappy
457457
- snappy-java-1.1.8.4.jar
458458
* Jackson
459-
- jackson-module-parameter-names-2.14.2.jar
459+
- jackson-module-parameter-names-2.15.0.jar
460460
* Java Assist
461461
- javassist-3.25.0-GA.jar
462462
* Java Native Access

0 commit comments

Comments
 (0)