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 branch 'master' into dougqh/spring-data 

Tweak partially picked from signalfx -- that commit included same other unwanted changes in this file and others (see 636c23ed2c)
This commit is contained in:
dougqh 2019-09-10 17:40:36 -04:00
parent 5f7e0609ed
commit 6d38831252
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dd-java-agent/instrumentation/spring-data/spring-data.gradle
View File

@ -4,7 +4,6 @@ muzzle {
group = 'org.springframework.data'
module = 'spring-data-commons'
versions = "[1.5.0.RELEASE,)"
extraDependency "javax.servlet:javax.servlet.api:3.0.0"
}
}
@ -32,9 +31,9 @@ dependencies {
testCompile project(':dd-java-agent:instrumentation:jdbc')
testCompile group: 'org.spockframework', name: 'spock-spring', version: "$versions.spock"
testCompile group: 'org.springframework', name: 'spring-test', version: '3.0.0.RELEASE'
testCompile group: 'org.springframework.data', name: 'spring-data-jpa', version: '1.0.0.RELEASE'
testCompile group: 'org.springframework.data', name: 'spring-data-jpa', version: '1.2.0.RELEASE'
testCompile group: 'com.mysema.querydsl', name: 'querydsl-jpa', version: '3.7.4'
testCompile group: 'org.hsqldb', name: 'hsqldb', version: '2.0.0'
testCompile group: 'org.eclipse.persistence', name: 'org.eclipse.persistence.jpa', version: '2.7.4'
testCompile group: 'org.hibernate', name: 'hibernate-entitymanager', version: '4.3.0.Final'
latestDepTestCompile group: 'org.springframework', name: 'spring-test', version: '+'
@ -43,3 +42,4 @@ dependencies {
latestDepTestCompile group: 'org.springframework', name: 'spring-aop', version: '+'
latestDepTestCompile group: 'org.springframework.data', name: 'spring-data-jpa', version: '+'
}