Skip to content

Commit

Permalink
Merge branch 'master' of github.com:micronaut-projects/micronaut-core
Browse files Browse the repository at this point in the history
  • Loading branch information
graemerocher committed Dec 13, 2019
2 parents 6a30dd9 + dda46eb commit 7b8fc70
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion benchmarks/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies {
api project(":runtime")

jmh 'org.openjdk.jmh:jmh-core:1.22'
jmh 'org.openjdk.jmh:jmh-generator-annprocess:1.21'
jmh 'org.openjdk.jmh:jmh-generator-annprocess:1.22'
}
jmh {
include =['io.micronaut.aop.around.AroundCompileBenchmark']
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,7 @@ subprojects { Project subproject ->
exclude module: 'groovy-all'
}
testImplementation "cglib:cglib-nodep:3.3.0"
testImplementation "org.objenesis:objenesis:1.4"
testImplementation "org.objenesis:objenesis:3.1"

testRuntimeOnly "ch.qos.logback:logback-classic:1.2.3"
testImplementation "org.codehaus.groovy:groovy-test:$groovyVersion"
Expand Down
2 changes: 1 addition & 1 deletion inject-groovy/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies {
testImplementation "org.hibernate:hibernate-core:5.3.6.Final"
testImplementation 'org.hibernate:hibernate-validator:6.0.13.Final'
testRuntimeOnly 'org.glassfish.web:el-impl:2.2.1-b05'
testRuntimeOnly 'org.glassfish:javax.el:3.0.1-b08'
testRuntimeOnly 'org.glassfish:javax.el:3.0.1-b11'
testImplementation project(":http-server-netty")
testImplementation project(":http-client")
testImplementation project(":validation")
Expand Down
2 changes: 1 addition & 1 deletion inject-java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies {
testImplementation project(":validation")

testRuntimeOnly 'org.glassfish.web:el-impl:2.2.1-b05'
testRuntimeOnly 'org.glassfish:javax.el:3.0.1-b08'
testRuntimeOnly 'org.glassfish:javax.el:3.0.1-b11'
}


2 changes: 1 addition & 1 deletion inject/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ dependencies {
testImplementation("com.github.stefanbirkner:system-rules:$systemRulesVersion") {
exclude group: "junit", module: "junit-dep"
}
testImplementation "junit:junit-dep:4.9"
testImplementation "junit:junit-dep:4.11"
}
4 changes: 2 additions & 2 deletions runtime/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ dependencies {
transitive = false
}

compileOnly 'org.glassfish:javax.el:3.0.1-b09'
compileOnly 'org.glassfish:javax.el:3.0.1-b11'
compileOnly dependencyVersion("reactor")
compileOnly dependencyVersion("rxjava1.interop")
compileOnly "com.github.ben-manes.caffeine:caffeine:$caffeineVersion"

testAnnotationProcessor project(":inject-java")
testImplementation 'org.jsr107.ri:cache-ri-impl:1.1.0'
testImplementation 'org.jsr107.ri:cache-ri-impl:1.1.1'
testImplementation dependencyVersion("jcache")
testImplementation dependencyVersion("rxjava1.interop")
testImplementation dependencyVersion("reactor")
Expand Down

0 comments on commit 7b8fc70

Please sign in to comment.