From f7f958054b01757c87c7142fe0c15d8eb0d29478 Mon Sep 17 00:00:00 2001 From: Pavol Loffay Date: Wed, 13 Jan 2021 17:32:33 +0100 Subject: [PATCH 1/7] Improve micronaut gradle test task Signed-off-by: Pavol Loffay --- instrumentation/micronaut-1.0/build.gradle.kts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/instrumentation/micronaut-1.0/build.gradle.kts b/instrumentation/micronaut-1.0/build.gradle.kts index a24fba104..416d03eea 100644 --- a/instrumentation/micronaut-1.0/build.gradle.kts +++ b/instrumentation/micronaut-1.0/build.gradle.kts @@ -27,11 +27,8 @@ for (version in listOf(micronaut2Version)) { extendsFrom(configurations.testRuntimeClasspath.get()) } dependencies { - versionedConfiguration(project(":instrumentation:netty:netty-4.1")) - versionedConfiguration("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-netty-4.1:${versions["opentelemetry_java_agent"]}") versionedConfiguration(project(":testing-common")) versionedConfiguration("io.micronaut.test:micronaut-test-junit5:${micronautTestVersion}") - versionedConfiguration("io.micronaut:micronaut-inject-java:${version}") versionedConfiguration("io.micronaut:micronaut-http-server-netty:${version}") versionedConfiguration("io.micronaut:micronaut-http-client:${version}") versionedConfiguration("io.micronaut:micronaut-runtime:${version}") @@ -47,5 +44,5 @@ for (version in listOf(micronaut2Version)) { useJUnitPlatform() shouldRunAfter("test") } - tasks.test { dependsOn(versionedTest) } +// tasks.test { dependsOn(versionedTest) } } From 83670cf0f6ffbc171dfaee65f7137c6048c5c43f Mon Sep 17 00:00:00 2001 From: Pavol Loffay Date: Wed, 13 Jan 2021 17:33:34 +0100 Subject: [PATCH 2/7] bring it back Signed-off-by: Pavol Loffay --- instrumentation/micronaut-1.0/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instrumentation/micronaut-1.0/build.gradle.kts b/instrumentation/micronaut-1.0/build.gradle.kts index 416d03eea..aea3285bd 100644 --- a/instrumentation/micronaut-1.0/build.gradle.kts +++ b/instrumentation/micronaut-1.0/build.gradle.kts @@ -44,5 +44,5 @@ for (version in listOf(micronaut2Version)) { useJUnitPlatform() shouldRunAfter("test") } -// tasks.test { dependsOn(versionedTest) } + tasks.test { dependsOn(versionedTest) } } From d7a2bbda878b923ce33c356759c3d6d2c8bf48e0 Mon Sep 17 00:00:00 2001 From: Pavol Loffay Date: Wed, 13 Jan 2021 18:32:13 +0100 Subject: [PATCH 3/7] Remove more Signed-off-by: Pavol Loffay --- instrumentation/micronaut-1.0/build.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/instrumentation/micronaut-1.0/build.gradle.kts b/instrumentation/micronaut-1.0/build.gradle.kts index aea3285bd..b2a0ce2e5 100644 --- a/instrumentation/micronaut-1.0/build.gradle.kts +++ b/instrumentation/micronaut-1.0/build.gradle.kts @@ -39,7 +39,6 @@ for (version in listOf(micronaut2Version)) { val versionedTest = task("test_${version}") { group = "verification" val testOuput = sourceSets.test.get().output - testClassesDirs = testOuput.classesDirs classpath = versionedConfiguration + testOuput useJUnitPlatform() shouldRunAfter("test") From d2c64d37268c148fa9106d092fcde1daad8d4d73 Mon Sep 17 00:00:00 2001 From: Pavol Loffay Date: Wed, 13 Jan 2021 18:33:02 +0100 Subject: [PATCH 4/7] Use directly Signed-off-by: Pavol Loffay --- instrumentation/micronaut-1.0/build.gradle.kts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/instrumentation/micronaut-1.0/build.gradle.kts b/instrumentation/micronaut-1.0/build.gradle.kts index b2a0ce2e5..b419aaa9b 100644 --- a/instrumentation/micronaut-1.0/build.gradle.kts +++ b/instrumentation/micronaut-1.0/build.gradle.kts @@ -38,8 +38,7 @@ for (version in listOf(micronaut2Version)) { } val versionedTest = task("test_${version}") { group = "verification" - val testOuput = sourceSets.test.get().output - classpath = versionedConfiguration + testOuput + classpath = versionedConfiguration + sourceSets.test.get().output useJUnitPlatform() shouldRunAfter("test") } From bd70d52e9a4ecf4e16ce8c8b65cc6e6e7cecce0c Mon Sep 17 00:00:00 2001 From: Pavol Loffay Date: Wed, 13 Jan 2021 18:37:59 +0100 Subject: [PATCH 5/7] Use check Signed-off-by: Pavol Loffay --- instrumentation/micronaut-1.0/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instrumentation/micronaut-1.0/build.gradle.kts b/instrumentation/micronaut-1.0/build.gradle.kts index b419aaa9b..73a01c46d 100644 --- a/instrumentation/micronaut-1.0/build.gradle.kts +++ b/instrumentation/micronaut-1.0/build.gradle.kts @@ -42,5 +42,5 @@ for (version in listOf(micronaut2Version)) { useJUnitPlatform() shouldRunAfter("test") } - tasks.test { dependsOn(versionedTest) } + tasks.check { dependsOn(versionedTest) } } From a0916c1bfad82b025b262565cc92f68efcd27f21 Mon Sep 17 00:00:00 2001 From: Pavol Loffay Date: Wed, 13 Jan 2021 18:39:24 +0100 Subject: [PATCH 6/7] remove more junk Signed-off-by: Pavol Loffay --- instrumentation/micronaut-1.0/build.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/instrumentation/micronaut-1.0/build.gradle.kts b/instrumentation/micronaut-1.0/build.gradle.kts index 73a01c46d..6dea40936 100644 --- a/instrumentation/micronaut-1.0/build.gradle.kts +++ b/instrumentation/micronaut-1.0/build.gradle.kts @@ -40,7 +40,6 @@ for (version in listOf(micronaut2Version)) { group = "verification" classpath = versionedConfiguration + sourceSets.test.get().output useJUnitPlatform() - shouldRunAfter("test") } tasks.check { dependsOn(versionedTest) } } From 027e68738b56a3c37354166cf7b9ab1b22a70834 Mon Sep 17 00:00:00 2001 From: Pavol Loffay Date: Wed, 13 Jan 2021 20:02:34 +0100 Subject: [PATCH 7/7] change Signed-off-by: Pavol Loffay --- instrumentation/micronaut-1.0/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instrumentation/micronaut-1.0/build.gradle.kts b/instrumentation/micronaut-1.0/build.gradle.kts index 6dea40936..932d68d60 100644 --- a/instrumentation/micronaut-1.0/build.gradle.kts +++ b/instrumentation/micronaut-1.0/build.gradle.kts @@ -24,7 +24,7 @@ val micronaut2Version = "2.2.3" for (version in listOf(micronaut2Version)) { val versionedConfiguration = configurations.create("test_${version}") { - extendsFrom(configurations.testRuntimeClasspath.get()) + extendsFrom(configurations.runtimeClasspath.get()) } dependencies { versionedConfiguration(project(":testing-common"))