Skip to content

Commit

Permalink
Upgrade to Micronaut 2 (#127)
Browse files Browse the repository at this point in the history
* Upgrade to Micronaut 2.x

* Fix for #128

* Cleanup

* Upgrade to Groovy 3 and Spock 2

* Upgrade to Micronaut 2.0.1

* Use new groupIds for micronaut-micrometer dependencies

* Remove micronaut-test version and get it from bom

* Remove micronaut-micrometer version and get it from bom

Co-authored-by: Iván López <[email protected]>
  • Loading branch information
alvarosanchez and ilopmar authored Sep 15, 2020
1 parent 299d55c commit f56c2dd
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 9 deletions.
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
projectVersion=2.1.2.BUILD-SNAPSHOT
micronautDocsVersion=1.0.24
micronautBuildVersion=1.1.5
micronautVersion=1.3.5
groovyVersion=2.5.11
spockVersion=1.3-groovy-2.5
micronautVersion=2.0.1
groovyVersion=3.0.5
spockVersion=2.0-M3-groovy-3.0

kafkaVersion=2.5.0

Expand Down
6 changes: 4 additions & 2 deletions kafka-streams/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ dependencies {

testImplementation "io.micronaut:micronaut-management"
testCompileOnly "io.micronaut:micronaut-inject-groovy"
testImplementation "io.micronaut.test:micronaut-test-spock:1.2.3"
testImplementation "io.micronaut.test:micronaut-test-spock"
testImplementation "io.micronaut:micronaut-inject-java"
testImplementation "io.micronaut:micronaut-inject"
testImplementation "io.micronaut.configuration:micronaut-micrometer-core:1.3.1"
testImplementation "io.micronaut.micrometer:micronaut-micrometer-core"
testImplementation "io.projectreactor:reactor-core:3.3.10.RELEASE"
testImplementation "io.micronaut:micronaut-management"
testImplementation "org.apache.kafka:kafka-clients:${kafkaVersion}:test"
Expand All @@ -26,6 +26,8 @@ dependencies {
testRuntimeOnly "io.micronaut:micronaut-runtime"
testRuntimeOnly "io.micronaut:micronaut-http-server-netty"
testRuntimeOnly "io.micronaut:micronaut-management"
testRuntimeOnly "io.micronaut.cache:micronaut-cache-core"
testRuntimeOnly "io.micronaut.reactor:micronaut-reactor"
}

test {
Expand Down
10 changes: 6 additions & 4 deletions kafka/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ dependencies {
api "org.apache.kafka:kafka-clients:${kafkaVersion}"

compileOnly "io.micronaut:micronaut-management"
compileOnly "io.micronaut.configuration:micronaut-micrometer-core:1.3.1"
compileOnly "io.micronaut.micrometer:micronaut-micrometer-core"
compileOnly "org.apache.kafka:kafka_2.12:${kafkaVersion}"
compileOnly "org.apache.kafka:kafka-clients:${kafkaVersion}:test"
compileOnly "org.apache.kafka:kafka_2.12:${kafkaVersion}:test"


testAnnotationProcessor "io.micronaut:micronaut-inject-java"
testImplementation "io.micronaut.test:micronaut-test-spock:1.2.3"
testImplementation "io.micronaut.test:micronaut-test-spock"
testImplementation "io.micronaut:micronaut-inject-java"
testImplementation "io.micronaut.configuration:micronaut-micrometer-core:1.3.1"
testImplementation "io.micronaut.micrometer:micronaut-micrometer-core"
testImplementation "io.projectreactor:reactor-core:3.3.10.RELEASE"
testImplementation "io.micronaut:micronaut-management"
testImplementation "io.micronaut:micronaut-http-client"
Expand All @@ -36,7 +36,9 @@ dependencies {
testRuntimeOnly "io.micronaut:micronaut-runtime"
testRuntimeOnly "io.micronaut:micronaut-http-server-netty"
testRuntimeOnly "io.micronaut:micronaut-management"
testRuntimeOnly "io.micronaut.configuration:micronaut-micrometer-registry-statsd"
testRuntimeOnly "io.micronaut.micrometer:micronaut-micrometer-registry-statsd"
testRuntimeOnly "io.micronaut.cache:micronaut-cache-core"
testRuntimeOnly "io.micronaut.reactor:micronaut-reactor"
}

test {
Expand Down

0 comments on commit f56c2dd

Please sign in to comment.