allure-framework · baev · Nov 1, 2021 · Oct 28, 2021
diff --git a/allure-assertj/build.gradle.kts b/allure-assertj/build.gradle.kts
@@ -1,9 +1,6 @@
 description = "Allure AssertJ Integration"
 
-val agent: Configuration by configurations.creating
-
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
     compileOnly("org.aspectj:aspectjrt")
     compileOnly("org.assertj:assertj-core")
@@ -25,7 +22,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-attachments/build.gradle.kts b/allure-attachments/build.gradle.kts
@@ -1,9 +1,6 @@
 description = "Allure Attachments"
 
-val agent: Configuration by configurations.creating
-
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
     implementation("org.freemarker:freemarker")
     testImplementation("org.apache.commons:commons-lang3")
@@ -26,7 +23,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-citrus/build.gradle.kts b/allure-citrus/build.gradle.kts
@@ -1,11 +1,8 @@
 description = "Allure Citrus Integration"
 
-val agent: Configuration by configurations.creating
-
 val citrusVersion = "2.8.0"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
     compileOnly("com.consol.citrus:citrus-core:$citrusVersion")
     testImplementation("com.consol.citrus:citrus-http:$citrusVersion")
@@ -32,7 +29,4 @@ tasks.jar {
 tasks.test {
     useJUnitPlatform()
     exclude("**/samples/*")
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-cucumber-jvm/build.gradle.kts b/allure-cucumber-jvm/build.gradle.kts
@@ -1,11 +1,8 @@
 description = "Allure CucumberJVM Integration"
 
-val agent: Configuration by configurations.creating
-
 val cucumberVersion = "1.2.6"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
     implementation("info.cukes:cucumber-core:$cucumberVersion")
     implementation("info.cukes:cucumber-java:$cucumberVersion")
@@ -30,7 +27,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-cucumber2-jvm/build.gradle.kts b/allure-cucumber2-jvm/build.gradle.kts
@@ -1,11 +1,8 @@
 description = "Allure CucumberJVM 2.0 Integration"
 
-val agent: Configuration by configurations.creating
-
 val cucumberVersion = "2.4.0"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
     implementation("io.cucumber:cucumber-core:$cucumberVersion")
     implementation("io.cucumber:cucumber-java:$cucumberVersion")
@@ -29,7 +26,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-cucumber3-jvm/build.gradle.kts b/allure-cucumber3-jvm/build.gradle.kts
@@ -1,11 +1,8 @@
 description = "Allure CucumberJVM 3.0 Integration"
 
-val agent: Configuration by configurations.creating
-
 val cucumberVersion = "3.0.2"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
     implementation("io.cucumber:cucumber-core:$cucumberVersion")
     implementation("io.cucumber:cucumber-java:$cucumberVersion")
@@ -29,7 +26,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-cucumber4-jvm/build.gradle.kts b/allure-cucumber4-jvm/build.gradle.kts
@@ -1,11 +1,8 @@
 description = "Allure CucumberJVM 4.0"
 
-val agent: Configuration by configurations.creating
-
 val cucumberVersion = "4.8.0"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
     implementation("io.cucumber:cucumber-core:$cucumberVersion")
     implementation("io.cucumber:cucumber-java:$cucumberVersion")
@@ -29,7 +26,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-cucumber5-jvm/build.gradle.kts b/allure-cucumber5-jvm/build.gradle.kts
@@ -1,12 +1,9 @@
 description = "Allure CucumberJVM 5.0"
 
-val agent: Configuration by configurations.creating
-
 val cucumberVersion = "5.1.2"
 val cucumberGherkinVersion = "5.1.0"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
     compileOnly("io.cucumber:cucumber-plugin:$cucumberVersion")
     implementation("io.cucumber:gherkin:$cucumberGherkinVersion")
@@ -32,7 +29,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-cucumber6-jvm/build.gradle.kts b/allure-cucumber6-jvm/build.gradle.kts
@@ -1,12 +1,9 @@
 description = "Allure CucumberJVM 6.0"
 
-val agent: Configuration by configurations.creating
-
 val cucumberVersion = "6.10.2"
 val cucumberGherkinVersion = "18.0.0"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
     compileOnly("io.cucumber:cucumber-plugin:$cucumberVersion")
     implementation("io.cucumber:gherkin:$cucumberGherkinVersion")
@@ -32,7 +29,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-descriptions-javadoc/build.gradle.kts b/allure-descriptions-javadoc/build.gradle.kts
@@ -3,7 +3,6 @@ description = "Allure Javadoc Descriptions"
 val agent: Configuration by configurations.creating
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api("commons-io:commons-io")
     api(project(":allure-java-commons"))
     testImplementation("com.google.testing.compile:compile-testing")
@@ -26,7 +25,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-hamcrest/build.gradle.kts b/allure-hamcrest/build.gradle.kts
@@ -1,9 +1,6 @@
 description = "Allure Hamcrest Assertions Integration"
 
-val agent: Configuration by configurations.creating
-
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
     compileOnly("org.aspectj:aspectjrt")
     implementation("org.hamcrest:hamcrest")
@@ -26,7 +23,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
-}
+}
diff --git a/allure-httpclient/build.gradle.kts b/allure-httpclient/build.gradle.kts
@@ -1,9 +1,6 @@
 description = "Allure Apache HttpClient Integration"
 
-val agent: Configuration by configurations.creating
-
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-attachments"))
     implementation("org.apache.httpcomponents:httpclient")
     testImplementation("com.github.tomakehurst:wiremock")
@@ -27,7 +24,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-java-commons/build.gradle.kts b/allure-java-commons/build.gradle.kts
@@ -4,10 +4,7 @@ plugins {
 
 description = "Allure Java Commons"
 
-val agent: Configuration by configurations.creating
-
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api("org.slf4j:slf4j-api")
     api(project(":allure-model"))
     compileOnly("org.aspectj:aspectjrt")
@@ -68,8 +65,5 @@ tasks {
     test {
         dependsOn(shadowJar)
         useJUnitPlatform()
-        doFirst {
-            jvmArgs("-javaagent:${agent.singleFile}")
-        }
     }
 }
diff --git a/allure-java-migration/build.gradle.kts b/allure-java-migration/build.gradle.kts
@@ -1,12 +1,9 @@
 description = "Allure Java Migration Utils"
 
-val agent: Configuration by configurations.creating
-
 val junitVersion = "4.13.2"
 val testNgVersion = "6.14.3"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api("org.apache.commons:commons-lang3")
     api("org.aspectj:aspectjrt")
     api(project(":allure-java-commons"))
@@ -35,7 +32,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-jax-rs/build.gradle.kts b/allure-jax-rs/build.gradle.kts
@@ -1,11 +1,8 @@
 description = "Allure JAX-RS Filter Integration"
 
-val agent: Configuration by configurations.creating
-
 val javaxWsRsApiVersion = "2.1.1"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-attachments"))
     implementation("javax.ws.rs:javax.ws.rs-api:$javaxWsRsApiVersion")
     testImplementation("com.github.tomakehurst:wiremock")
@@ -29,7 +26,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-jbehave/build.gradle.kts b/allure-jbehave/build.gradle.kts
@@ -1,11 +1,8 @@
 description = "Allure JBehave Integration"
 
-val agent: Configuration by configurations.creating
-
 val jbehaveVersion = "4.8.2"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
     implementation("org.jbehave:jbehave-core:$jbehaveVersion")
     testImplementation("org.assertj:assertj-core")
@@ -27,7 +24,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-jsonunit/build.gradle.kts b/allure-jsonunit/build.gradle.kts
@@ -1,11 +1,8 @@
 description = "Allure JsonUnit Integration"
 
-val agent: Configuration by configurations.creating
-
 val jsonUnitVersion = "2.28.0"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-attachments"))
     implementation("com.fasterxml.jackson.core:jackson-databind")
     implementation("net.javacrumbs.json-unit:json-unit:$jsonUnitVersion")
@@ -29,8 +26,5 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
 
diff --git a/allure-junit-platform/build.gradle.kts b/allure-junit-platform/build.gradle.kts
@@ -1,9 +1,6 @@
 description = "Allure JUnit Platform Integration"
 
-val agent: Configuration by configurations.creating
-
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
     implementation("org.junit.jupiter:junit-jupiter-api")
     implementation("org.junit.platform:junit-platform-launcher")
@@ -35,9 +32,6 @@ tasks.test {
     systemProperty("junit.jupiter.execution.parallel.enabled", "false")
     useJUnitPlatform()
     exclude("**/features/*")
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
 
 val spiOffJar: Jar by tasks.creating(Jar::class) {

diff --git a/allure-junit4-aspect/build.gradle.kts b/allure-junit4-aspect/build.gradle.kts
@@ -1,11 +1,8 @@
 description = "Allure JUnit 4 Aspect HACK"
 
-val agent: Configuration by configurations.creating
-
 val junitVersion = "4.13.2"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-junit4"))
     implementation("junit:junit:$junitVersion")
     implementation("org.aspectj:aspectjrt")

diff --git a/allure-junit4/build.gradle.kts b/allure-junit4/build.gradle.kts
@@ -1,11 +1,8 @@
 description = "Allure JUnit 4 Integration"
 
-val agent: Configuration by configurations.creating
-
 val junitVersion = "4.13.2"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
     implementation("junit:junit:$junitVersion")
     testImplementation("org.assertj:assertj-core")
@@ -28,7 +25,4 @@ tasks.jar {
 tasks.test {
     useJUnitPlatform()
     exclude("**/samples/*", "SampleTestInDefaultPackage.java")
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }