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

Fix property name for latest Spring MVC (#1516) 

Cap latest supported version for Spring Data JPA
This commit is contained in:
Nikita Salnikov-Tarnovski 2020-10-28 22:28:19 +02:00 committed by GitHub
parent 9bb13bd8f0
commit 4959b7eb34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
instrumentation/spring/spring-data-1.8/spring-data-1.8.gradle
View File

@ -27,14 +27,15 @@ dependencies {
testImplementation group: 'org.spockframework', name: 'spock-spring', version: "$versions.spock" testImplementation group: 'org.spockframework', name: 'spock-spring', version: "$versions.spock"
testLibrary group: 'org.springframework', name: 'spring-test', version: '3.0.0.RELEASE' testLibrary group: 'org.springframework', name: 'spring-test', version: '3.0.0.RELEASE'
testLibrary group: 'org.springframework.data', name: 'spring-data-jpa', version: '1.8.0.RELEASE'
// JPA dependencies // JPA dependencies
testImplementation project(':instrumentation:jdbc') testImplementation project(':instrumentation:jdbc')
testLibrary group: 'org.springframework.data', name: 'spring-data-jpa', version: '+'
testImplementation group: 'com.mysema.querydsl', name: 'querydsl-jpa', version: '3.7.4' testImplementation group: 'com.mysema.querydsl', name: 'querydsl-jpa', version: '3.7.4'
testImplementation group: 'org.hsqldb', name: 'hsqldb', version: '2.0.0' testImplementation group: 'org.hsqldb', name: 'hsqldb', version: '2.0.0'
testImplementation group: 'org.hibernate', name: 'hibernate-entitymanager', version: '4.3.0.Final' testImplementation group: 'org.hibernate', name: 'hibernate-entitymanager', version: '4.3.0.Final'
latestDepTestLibrary group: 'org.springframework.data', name: 'spring-data-jpa', version: '(,2.4.0)'
latestDepTestLibrary group: 'org.springframework', name: 'spring-context', version: '+' latestDepTestLibrary group: 'org.springframework', name: 'spring-context', version: '+'
} }

1
instrumentation/spring/spring-webmvc-3.1/javaagent/src/test/groovy/test/boot/SpringBootBasedTest.groovy
View File

@ -33,6 +33,7 @@ class SpringBootBasedTest extends HttpServerTest<ConfigurableApplicationContext>
app.setDefaultProperties(ImmutableMap.of( app.setDefaultProperties(ImmutableMap.of(
"server.port", port, "server.port", port,
"server.context-path", getContextPath(), "server.context-path", getContextPath(),
"server.servlet.contextPath", getContextPath(),
"server.error.include-message", "always")) "server.error.include-message", "always"))
def context = app.run() def context = app.run()
return context return context