open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1035 from DataDog/tyler/jackson-upgrade 

Upgrade Jackson to 2.10.0
This commit is contained in:
Tyler Benson 2019-10-09 16:59:23 +02:00 committed by GitHub
parent 7dbad68fe4 a6200f96c3
commit 5fecfa3617
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dd-java-agent/agent-jmxfetch/agent-jmxfetch.gradle
View File

@ -4,7 +4,7 @@ plugins {
apply from: "${rootDir}/gradle/java.gradle" apply from: "${rootDir}/gradle/java.gradle"
dependencies { dependencies {
compile('com.datadoghq:jmxfetch:0.32.0') { compile('com.datadoghq:jmxfetch:0.32.1') {
exclude group: 'org.slf4j', module: 'slf4j-log4j12' exclude group: 'org.slf4j', module: 'slf4j-log4j12'
exclude group: 'log4j', module: 'log4j' exclude group: 'log4j', module: 'log4j'
} }

2
gradle/dependencies.gradle
View File

@ -9,7 +9,7 @@ ext {
guava : "20.0", // Last version to support Java 7 guava : "20.0", // Last version to support Java 7
// When upgrading for security fixes, ensure corresponding change is reflected in jmxfetch. // When upgrading for security fixes, ensure corresponding change is reflected in jmxfetch.
jackson : "2.9.9.3", // https://nvd.nist.gov/vuln/detail/CVE-2019-14379 jackson : "2.10.0", // https://nvd.nist.gov/vuln/detail/CVE-2019-16942 et al
spock : "1.3-groovy-$spockGroovyVer", spock : "1.3-groovy-$spockGroovyVer",
groovy : groovyVer, groovy : groovyVer,