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

Include specific unixsocket lib version into shared jar

This commit is contained in:
Nikolay Martynov 2020-04-17 09:56:26 -04:00
parent ad0960a922
commit 00ac902a8f
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dd-trace-ot/dd-trace-ot.gradle
View File

@ -45,7 +45,7 @@ dependencies {
compile deps.okhttp compile deps.okhttp
compile group: 'org.msgpack', name: 'msgpack-core', version: '0.8.20' compile group: 'org.msgpack', name: 'msgpack-core', version: '0.8.20'
compile group: 'com.squareup.moshi', name: 'moshi', version: '1.9.2' compile group: 'com.squareup.moshi', name: 'moshi', version: '1.9.2'
compile group: 'com.github.jnr', name: 'jnr-unixsocket', version: '0.28' compile group: 'com.github.jnr', name: 'jnr-unixsocket', version: "${versions.jnr_unixsocket}"
compile group: 'com.lmax', name: 'disruptor', version: '3.4.2' compile group: 'com.lmax', name: 'disruptor', version: '3.4.2'
// We have autoservices defined in test subtree, looks like we need this to be able to properly rebuild this // We have autoservices defined in test subtree, looks like we need this to be able to properly rebuild this

30
gradle/dependencies.gradle
View File

@ -3,22 +3,23 @@ def spockGroovyVer = groovyVer.replaceAll(/\.\d+$/, '')
ext { ext {
versions = [ versions = [
opentracing: '0.32.0', opentracing : '0.32.0',
slf4j : "1.7.29", slf4j : "1.7.29",
guava : "20.0", // Last version to support Java 7 guava : "20.0", // Last version to support Java 7
okhttp : "3.12.8", // 3.12.x is last version to support Java7) okhttp : "3.12.8", // 3.12.x is last version to support Java7)
spock : "1.3-groovy-$spockGroovyVer", spock : "1.3-groovy-$spockGroovyVer",
groovy : groovyVer, groovy : groovyVer,
junit5 : "5.5.2", junit5 : "5.5.2",
logback : "1.2.3", logback : "1.2.3",
lombok : "1.18.10", lombok : "1.18.10",
bytebuddy : "1.10.6", bytebuddy : "1.10.6",
scala : "2.11.12", // Last version to support Java 7 (2.12+ require Java 8+) scala : "2.11.12", // Last version to support Java 7 (2.12+ require Java 8+)
kotlin : "1.3.61", kotlin : "1.3.61",
coroutines : "1.3.0", coroutines : "1.3.0",
dogstatsd : "2.9.0" dogstatsd : "2.9.0",
jnr_unixsocket: "0.28"
] ]
deps = [ deps = [
@ -69,6 +70,7 @@ ext {
// Shared between agent tooling and instrumentation and JMXFetch // Shared between agent tooling and instrumentation and JMXFetch
shared : [ shared : [
dependencies.create(group: 'com.datadoghq', name: 'java-dogstatsd-client', version: "${versions.dogstatsd}"), dependencies.create(group: 'com.datadoghq', name: 'java-dogstatsd-client', version: "${versions.dogstatsd}"),
dependencies.create(group: 'com.github.jnr', name: 'jnr-unixsocket', version: "${versions.jnr_unixsocket}"),
dependencies.create(group: 'com.google.guava', name: 'guava', version: "${versions.guava}") dependencies.create(group: 'com.google.guava', name: 'guava', version: "${versions.guava}")
], ],