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

Exclude hibernate-annotations from 3.5 latestDepTest

This commit is contained in:
Will Gittoes 2019-03-18 16:35:01 +11:00
parent 3b6c688ce8
commit 86d14280d2
No known key found for this signature in database
GPG Key ID: 521026A02DB0BB42
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dd-java-agent/instrumentation/hibernate-3.5/hibernate-3.5.gradle
View File

@ -36,10 +36,10 @@ dependencies {
testCompile project(':dd-java-agent:testing')
testCompile project(':dd-java-agent:instrumentation:jdbc')
testCompile group: 'org.hibernate', name: 'hibernate-annotations', version: '+'
testCompile group: 'javassist', name: 'javassist', version: '+'
testCompile group: 'org.hibernate', name: 'hibernate-core', version: '3.5.0-Final'
testCompile group: 'org.hibernate', name: 'hibernate-annotations', version: '+'
testCompile group: 'javassist', name: 'javassist', version: '+'
testCompile group: 'com.h2database', name: 'h2', version: '1.4.197'
testCompile "javax.xml.bind:jaxb-api:2.2.11"
testCompile "com.sun.xml.bind:jaxb-core:2.2.11"
@ -47,5 +47,9 @@ dependencies {
testCompile "javax.activation:activation:1.1.1"
latestDepTestCompile group: 'org.hibernate', name: 'hibernate-core', version: '3.+'
latestDepTestCompile group: 'com.h2database', name: 'h2', version: '1.4.197'
}
configurations {
// Needed for test, but for latestDepTest this would otherwise bundle a second incompatible version of hibernate-core.
latestDepTestCompile.exclude group: 'org.hibernate', module: 'hibernate-annotations'
}

1
dd-java-agent/instrumentation/hibernate-3.5/src/test/groovy/AbstractHibernateTest.groovy
View File

@ -13,7 +13,6 @@ abstract class AbstractHibernateTest extends AgentTestRunner {
protected List<Value> prepopulated
def setupSpec() {
// sessionFactory = new Configuration().configure().buildSessionFactory()
sessionFactory = new AnnotationConfiguration().configure().buildSessionFactory()
// Pre-populate the DB, so delete/update can be tested.