Skip to content

Bump Jackson to 2.12.6.20220326 (CVE-2020-36518) #12411

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.

Sign up for GitHub

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

Closed
jihoonson wants to merge 3 commits into from
Closed

Bump Jackson to 2.12.6.20220326 (CVE-2020-36518) #12411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
776b2d2
Bump Jackson to 2.13.2 (CVE-2020-36518)
jihoonson Apr 7, 2022
67d2467
bump to 2.12.6.20220326
jihoonson Apr 7, 2022
f830fd3
fix license; fix kafkaEmitter test
jihoonson Apr 8, 2022
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
4 changes: 2 additions & 2 deletions core/src/main/java/org/apache/druid/guice/GuiceAnnotationIntrospector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ public Object findInjectableValueId(AnnotatedMember m)
if (m instanceof AnnotatedMethod) {
throw new IAE("Annotated methods don't work very well yet...");
}
return Key.get(m.getGenericType());
return Key.get(m.getRawType());
Copy link
Copy Markdown
Member

@FrankChen021 FrankChen021 Apr 12, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change confuses me. The javadoc of getGenericType says that getType should be used to replace it. But according to the CI test result of #12373 , using of getType here seems that it does not work correctly.

}
return Key.get(m.getGenericType(), guiceAnnotation);
return Key.get(m.getRawType(), guiceAnnotation);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions ...-contrib/kafka-emitter/src/test/java/org/apache/druid/emitter/kafka/KafkaEmitterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@

package org.apache.druid.emitter.kafka;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import org.apache.druid.jackson.DefaultObjectMapper;
import org.apache.druid.java.util.common.DateTimes;
import org.apache.druid.java.util.emitter.core.Event;
import org.apache.druid.java.util.emitter.service.AlertEvent;
Expand Down Expand Up @@ -85,7 +85,7 @@ public void testKafkaEmitter() throws InterruptedException
final KafkaProducer<String, String> producer = mock(KafkaProducer.class);
final KafkaEmitter kafkaEmitter = new KafkaEmitter(
new KafkaEmitterConfig("", "metrics", "alerts", requestTopic, "test-cluster", null),
new ObjectMapper()
new DefaultObjectMapper()
Copy link
Copy Markdown
Member

@xvrl xvrl Apr 12, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any particular reason this change is required?

)
{
@Override
Expand Down
4 changes: 2 additions & 2 deletions licenses.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ name: Jackson
license_category: binary
module: java-core
license_name: Apache License version 2.0
version: 2.10.5
version: 2.12.6
libraries:
- com.fasterxml.jackson.core: jackson-annotations
- com.fasterxml.jackson.core: jackson-core
Expand Down Expand Up @@ -278,7 +278,7 @@ name: Jackson
license_category: binary
module: java-core
license_name: Apache License version 2.0
version: 2.10.5.1
version: 2.12.6.1
libraries:
- com.fasterxml.jackson.core: jackson-databind
notice: |
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
<hamcrest.version>1.3</hamcrest.version>
<jetty.version>9.4.40.v20210413</jetty.version>
<jersey.version>1.19.4</jersey.version>
<jackson.version>2.10.5.20201202</jackson.version>
<jackson.version>2.12.6.20220326</jackson.version>
<codehaus.jackson.version>1.9.13</codehaus.jackson.version>
<log4j.version>2.17.1</log4j.version>
<mysql.version>5.1.48</mysql.version>
Expand Down
8 changes: 4 additions & 4 deletions server/src/test/java/org/apache/druid/client/cache/CacheConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,22 +130,22 @@ public void testValidationInsaneError()
throw new IllegalStateException("Should have already failed");
}

@Test(expected = ProvisionException.class)
@Test
public void testTRUE()
{
properties.put(PROPERTY_PREFIX + ".populateCache", "TRUE");
configProvider.inject(properties, configurator);
CacheConfig config = configProvider.get().get();
throw new IllegalStateException("Should have already failed");
Assert.assertTrue(config.isPopulateCache());
}

@Test(expected = ProvisionException.class)
@Test
public void testFALSE()
{
properties.put(PROPERTY_PREFIX + ".populateCache", "FALSE");
configProvider.inject(properties, configurator);
CacheConfig config = configProvider.get().get();
throw new IllegalStateException("Should have already failed");
Assert.assertFalse(config.isPopulateCache());
}


Expand Down