From 3e16b6690c9c718e3462124db91314fcbdc76bd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20S=C3=A1nchez-Mariscal?= Date: Wed, 2 Dec 2020 13:21:43 +0100 Subject: [PATCH 1/2] Remove nettyVersion. Closes #134 --- gradle.properties | 2 -- micrometer-core/build.gradle | 26 ++++++++------------------ 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/gradle.properties b/gradle.properties index de5a25772..c503a811e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,4 @@ projectVersion=3.2.0.BUILD-SNAPSHOT -micronautBuildVersion=1.1.5 micronautDocsVersion=1.0.24 micronautVersion=2.2.0 micronautTestVersion=2.2.1 @@ -15,7 +14,6 @@ developers=Graeme Rocher micrometerVersion=1.6.1 validationVersion=2.0.1.Final jcacheVersion=1.1.1 -nettyVersion=4.1.48.Final githubBranch=master githubCoreBranch=2.3.x diff --git a/micrometer-core/build.gradle b/micrometer-core/build.gradle index bb9e12c9b..6c29b46c5 100644 --- a/micrometer-core/build.gradle +++ b/micrometer-core/build.gradle @@ -8,10 +8,10 @@ dependencies { compileOnly "io.micronaut:micronaut-management" compileOnly "io.micronaut.sql:micronaut-jdbc" compileOnly 'io.micronaut.cache:micronaut-cache-core' - compileOnly "io.netty:netty-buffer:$nettyVersion" - compileOnly "io.netty:netty-transport:$nettyVersion" - compileOnly "io.netty:netty-transport-native-epoll:$nettyVersion" - compileOnly "io.netty:netty-transport-native-kqueue:$nettyVersion" + compileOnly "io.netty:netty-buffer" + compileOnly "io.netty:netty-transport" + compileOnly "io.netty:netty-transport-native-epoll" + compileOnly "io.netty:netty-transport-native-kqueue" compileOnly "io.micronaut:micronaut-http-server-netty" compileOnly "javax.cache:cache-api:$jcacheVersion" compileOnly "ch.qos.logback:logback-classic:1.2.3" @@ -23,21 +23,11 @@ dependencies { testImplementation "io.micronaut.sql:micronaut-jdbc" testImplementation "org.codehaus.groovy:groovy-json:$groovyVersion" - testImplementation "io.netty:netty-buffer:$nettyVersion" - testImplementation "io.netty:netty-transport:$nettyVersion" - testImplementation "io.netty:netty-transport-native-epoll:$nettyVersion" - testImplementation "io.netty:netty-transport-native-kqueue:$nettyVersion" + testImplementation "io.netty:netty-buffer" + testImplementation "io.netty:netty-transport" + testImplementation "io.netty:netty-transport-native-epoll" + testImplementation "io.netty:netty-transport-native-kqueue" testImplementation "io.micronaut:micronaut-http-server-netty" testImplementation 'io.micronaut.cache:micronaut-cache-core' testImplementation 'io.micronaut.cache:micronaut-cache-caffeine' } - -micronautBuild { - resolutionStrategy { - eachDependency { DependencyResolveDetails details -> - if (details.requested.group == 'io.netty') { - details.useVersion nettyVersion - } - } - } -} From f39d2e96289793db1e96c8572c6444fc5838ceb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20S=C3=A1nchez-Mariscal?= Date: Wed, 2 Dec 2020 16:26:48 +0100 Subject: [PATCH 2/2] Try with plugin version 2.0.13 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b781b3cd7..7ba261db2 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { maven { url "https://repo.grails.org/grails/core" } } dependencies { - classpath "io.micronaut.build:micronaut-gradle-plugins:2.0.12" + classpath "io.micronaut.build:micronaut-gradle-plugins:2.0.13" } }