Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[improve][build] Revert "Upgrade jackson version to 2.15.0 for CVE-2022-1471 (#20177)" #20182

Merged
merged 1 commit into from
Apr 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions distribution/server/src/assemble/LICENSE.bin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -246,17 +246,17 @@ 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.15.0.jar
- com.fasterxml.jackson.core-jackson-core-2.15.0.jar
- com.fasterxml.jackson.core-jackson-databind-2.15.0.jar
- com.fasterxml.jackson.dataformat-jackson-dataformat-yaml-2.15.0.jar
- com.fasterxml.jackson.jaxrs-jackson-jaxrs-base-2.15.0.jar
- com.fasterxml.jackson.jaxrs-jackson-jaxrs-json-provider-2.15.0.jar
- com.fasterxml.jackson.module-jackson-module-jaxb-annotations-2.15.0.jar
- com.fasterxml.jackson.module-jackson-module-jsonSchema-2.15.0.jar
- com.fasterxml.jackson.datatype-jackson-datatype-jdk8-2.15.0.jar
- com.fasterxml.jackson.datatype-jackson-datatype-jsr310-2.15.0.jar
- com.fasterxml.jackson.module-jackson-module-parameter-names-2.15.0.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
- com.fasterxml.jackson.datatype-jackson-datatype-jdk8-2.14.2.jar
- com.fasterxml.jackson.datatype-jackson-datatype-jsr310-2.14.2.jar
- com.fasterxml.jackson.module-jackson-module-parameter-names-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
Expand Down
22 changes: 11 additions & 11 deletions distribution/shell/src/assemble/LICENSE.bin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -311,17 +311,17 @@ 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.15.0.jar
- jackson-core-2.15.0.jar
- jackson-databind-2.15.0.jar
- jackson-dataformat-yaml-2.15.0.jar
- jackson-jaxrs-base-2.15.0.jar
- jackson-jaxrs-json-provider-2.15.0.jar
- jackson-module-jaxb-annotations-2.15.0.jar
- jackson-module-jsonSchema-2.15.0.jar
- jackson-datatype-jdk8-2.15.0.jar
- jackson-datatype-jsr310-2.15.0.jar
- jackson-module-parameter-names-2.15.0.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
- jackson-datatype-jdk8-2.14.2.jar
- jackson-datatype-jsr310-2.14.2.jar
- jackson-module-parameter-names-2.14.2.jar
* Conscrypt -- conscrypt-openjdk-uber-2.5.2.jar
* Gson
- gson-2.8.9.jar
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ flexible messaging model and an intuitive client API.</description>
<bouncycastle.version>1.69</bouncycastle.version>
<bouncycastle.bcpkix-fips.version>1.0.6</bouncycastle.bcpkix-fips.version>
<bouncycastle.bc-fips.version>1.0.2.3</bouncycastle.bc-fips.version>
<jackson.version>2.15.0</jackson.version>
<jackson.version>2.14.2</jackson.version>
<reflections.version>0.10.2</reflections.version>
<swagger.version>1.6.2</swagger.version>
<puppycrawl.checkstyle.version>8.37</puppycrawl.checkstyle.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
import static com.google.common.base.Preconditions.checkArgument;
import static java.lang.String.format;
import static java.util.Objects.requireNonNull;
import com.fasterxml.jackson.databind.AnnotationIntrospector;
import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
import com.fasterxml.jackson.databind.util.EnumResolver;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
Expand Down Expand Up @@ -56,6 +58,8 @@ public final class FieldParser {
private static final Map<String, Method> CONVERTERS = new HashMap<>();
private static final Map<Class<?>, Class<?>> WRAPPER_TYPES = new HashMap<>();

private static final AnnotationIntrospector ANNOTATION_INTROSPECTOR = new JacksonAnnotationIntrospector();

static {
// Preload converters and wrapperTypes.
initConverters();
Expand Down Expand Up @@ -96,8 +100,7 @@ public static <T> T convert(Object from, Class<T> to) {

if (to.isEnum()) {
// Converting string to enum
EnumResolver r = EnumResolver.constructUsingToString(
ObjectMapperFactory.getMapper().getObjectMapper().getDeserializationConfig(), to);
EnumResolver r = EnumResolver.constructUsingToString((Class<Enum<?>>) to, ANNOTATION_INTROSPECTOR);
T value = (T) r.findEnum((String) from);
if (value == null) {
throw new RuntimeException("Invalid value '" + from + "' for enum " + to);
Expand Down
28 changes: 14 additions & 14 deletions pulsar-sql/presto-distribution/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -207,19 +207,19 @@ This projects includes binary packages with the following licenses:
The Apache Software License, Version 2.0

* Jackson
- jackson-annotations-2.15.0.jar
- jackson-core-2.15.0.jar
- jackson-databind-2.15.0.jar
- jackson-dataformat-smile-2.15.0.jar
- jackson-datatype-guava-2.15.0.jar
- jackson-datatype-jdk8-2.15.0.jar
- jackson-datatype-joda-2.15.0.jar
- jackson-datatype-jsr310-2.15.0.jar
- jackson-dataformat-yaml-2.15.0.jar
- jackson-jaxrs-base-2.15.0.jar
- jackson-jaxrs-json-provider-2.15.0.jar
- jackson-module-jaxb-annotations-2.15.0.jar
- jackson-module-jsonSchema-2.15.0.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
Expand Down Expand Up @@ -456,7 +456,7 @@ The Apache Software License, Version 2.0
* Snappy
- snappy-java-1.1.8.4.jar
* Jackson
- jackson-module-parameter-names-2.15.0.jar
- jackson-module-parameter-names-2.14.2.jar
* Java Assist
- javassist-3.25.0-GA.jar
* Java Native Access
Expand Down