From 1b5e0722be838d243251792707eb97826828abe7 Mon Sep 17 00:00:00 2001 From: Dmitry Baev Date: Tue, 12 Feb 2019 16:20:15 +0300 Subject: [PATCH 1/4] bump gradle --- AUTHORS | 2 +- LICENSE | 2 +- allure-assertj/build.gradle.kts | 16 +- .../src/main/resources/META-INF/aop-ajc.xml | 1 + allure-attachments/build.gradle.kts | 20 +- allure-citrus/build.gradle.kts | 26 +-- allure-cucumber-jvm/build.gradle.kts | 27 ++- allure-cucumber2-jvm/build.gradle.kts | 24 ++- allure-cucumber3-jvm/build.gradle.kts | 23 ++- allure-cucumber4-jvm/build.gradle.kts | 26 ++- allure-descriptions-javadoc/build.gradle.kts | 22 +-- allure-httpclient/build.gradle.kts | 24 ++- allure-java-commons-test/build.gradle.kts | 4 +- allure-java-commons/build.gradle.kts | 33 ++-- allure-java-migration/build.gradle.kts | 34 ++-- allure-jax-rs/build.gradle.kts | 23 ++- allure-jbehave/build.gradle.kts | 22 +-- allure-jsonunit/build.gradle.kts | 24 +-- .../allure/jsonunit/JsonPatchListener.java | 1 - allure-junit-platform/build.gradle.kts | 22 +-- allure-junit4-aspect/build.gradle.kts | 7 +- allure-junit4/build.gradle.kts | 20 +- allure-junit5/build.gradle.kts | 36 +--- .../AllureJunit5AnnotationProcessor.java | 18 -- .../org.junit.jupiter.api.extension.Extension | 1 - .../src/test/resources/allure.properties | 2 - allure-model/build.gradle.kts | 18 +- allure-okhttp/build.gradle.kts | 24 ++- allure-okhttp3/build.gradle.kts | 24 ++- allure-rest-assured/build.gradle.kts | 26 ++- allure-scalatest/build.gradle.kts | 24 ++- allure-selenide/build.gradle.kts | 4 +- allure-servlet-api/build.gradle.kts | 4 +- allure-spock/build.gradle.kts | 32 +--- allure-spring-boot/build.gradle.kts | 15 -- .../AllureSpringWebmvcAutoconfigure.java | 14 -- .../main/resources/META-INF/spring.factories | 3 - allure-spring-web/build.gradle.kts | 25 ++- allure-spring4-test/build.gradle.kts | 14 -- .../allure/spring4/test/AllureSpring4.java | 179 ------------------ .../allure/spring4/test/DisplayName.java | 21 -- .../main/resources/META-INF/spring.factories | 3 - allure-spring4-webmvc/build.gradle.kts | 14 -- .../spring4/webmvc/AllureSpring4WebMvc.java | 54 ------ .../webmvc/AllureWebMvcConfigurerAdapter.java | 24 --- allure-testng/build.gradle.kts | 16 +- build.gradle.kts | 12 +- gradle.properties | 4 +- gradle/wrapper/gradle-wrapper.jar | Bin 54417 -> 56177 bytes gradle/wrapper/gradle-wrapper.properties | 3 +- settings.gradle.kts | 3 - 51 files changed, 294 insertions(+), 726 deletions(-) delete mode 100644 allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5AnnotationProcessor.java delete mode 100644 allure-junit5/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension delete mode 100644 allure-junit5/src/test/resources/allure.properties delete mode 100644 allure-spring-boot/build.gradle.kts delete mode 100644 allure-spring-boot/src/main/java/io/qameta/allure/springboot/AllureSpringWebmvcAutoconfigure.java delete mode 100644 allure-spring-boot/src/main/resources/META-INF/spring.factories delete mode 100644 allure-spring4-test/build.gradle.kts delete mode 100644 allure-spring4-test/src/main/java/io/qameta/allure/spring4/test/AllureSpring4.java delete mode 100644 allure-spring4-test/src/main/java/io/qameta/allure/spring4/test/DisplayName.java delete mode 100644 allure-spring4-test/src/main/resources/META-INF/spring.factories delete mode 100644 allure-spring4-webmvc/build.gradle.kts delete mode 100644 allure-spring4-webmvc/src/main/java/io/qameta/allure/spring4/webmvc/AllureSpring4WebMvc.java delete mode 100644 allure-spring4-webmvc/src/main/java/io/qameta/allure/spring4/webmvc/AllureWebMvcConfigurerAdapter.java diff --git a/AUTHORS b/AUTHORS index 0751849e9..0edbd3fb9 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,4 +1,4 @@ The following authors have created the source code of "Allure Java" -published and distributed by Dmitry Baev as the owner: +published and distributed by Qameta Software OÜ as the owner: * Dmitry Baev diff --git a/LICENSE b/LICENSE index 8bf31132f..a5ff24fc6 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2016 Dmitry Baev + Copyright 2019 Qameta Software OÜ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/allure-assertj/build.gradle.kts b/allure-assertj/build.gradle.kts index c8e66bddf..f564571cc 100644 --- a/allure-assertj/build.gradle.kts +++ b/allure-assertj/build.gradle.kts @@ -4,13 +4,15 @@ val agent by configurations.creating dependencies { agent("org.aspectj:aspectjweaver") - compile("org.assertj:assertj-core") - compile(project(":allure-java-commons")) - testCompile("org.junit.jupiter:junit-jupiter-api") - testCompile("org.slf4j:slf4j-simple") - testCompile(project(":allure-java-commons-test")) - testCompile(project(":allure-junit-platform")) - testRuntime("org.junit.jupiter:junit-jupiter-engine") + api(project(":allure-java-commons")) + compileOnly("org.aspectj:aspectjrt") + compileOnly("org.assertj:assertj-core") + testImplementation("org.assertj:assertj-core") + testImplementation("org.junit.jupiter:junit-jupiter-api") + testImplementation("org.slf4j:slf4j-simple") + testImplementation(project(":allure-java-commons-test")) + testImplementation(project(":allure-junit-platform")) + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") } tasks.named("jar") { diff --git a/allure-assertj/src/main/resources/META-INF/aop-ajc.xml b/allure-assertj/src/main/resources/META-INF/aop-ajc.xml index b2bb4bc34..3f0cc6ade 100644 --- a/allure-assertj/src/main/resources/META-INF/aop-ajc.xml +++ b/allure-assertj/src/main/resources/META-INF/aop-ajc.xml @@ -1,4 +1,5 @@ + diff --git a/allure-attachments/build.gradle.kts b/allure-attachments/build.gradle.kts index 64d89fea9..d4f4ea0a6 100644 --- a/allure-attachments/build.gradle.kts +++ b/allure-attachments/build.gradle.kts @@ -4,16 +4,16 @@ val agent by configurations.creating dependencies { agent("org.aspectj:aspectjweaver") - compile("org.freemarker:freemarker") - compile(project(":allure-java-commons")) - testCompile("org.apache.commons:commons-lang3") - testCompile("org.assertj:assertj-core") - testCompile("org.junit.jupiter:junit-jupiter-api") - testCompile("org.mockito:mockito-core") - testCompile("org.slf4j:slf4j-simple") - testCompile(project(":allure-java-commons-test")) - testCompile(project(":allure-junit-platform")) - testRuntime("org.junit.jupiter:junit-jupiter-engine") + api(project(":allure-java-commons")) + implementation("org.freemarker:freemarker") + testImplementation("org.apache.commons:commons-lang3") + testImplementation("org.assertj:assertj-core") + testImplementation("org.junit.jupiter:junit-jupiter-api") + testImplementation("org.mockito:mockito-core") + testImplementation("org.slf4j:slf4j-simple") + testImplementation(project(":allure-java-commons-test")) + testImplementation(project(":allure-junit-platform")) + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") } tasks.named("jar") { diff --git a/allure-citrus/build.gradle.kts b/allure-citrus/build.gradle.kts index f3965d618..4602daa9e 100644 --- a/allure-citrus/build.gradle.kts +++ b/allure-citrus/build.gradle.kts @@ -6,19 +6,19 @@ val citrusVersion = "2.7.8" dependencies { agent("org.aspectj:aspectjweaver") - compile("com.consol.citrus:citrus-core:$citrusVersion") - compile(project(":allure-java-commons")) - testCompile("com.consol.citrus:citrus-http:$citrusVersion") - testCompile("com.consol.citrus:citrus-java-dsl:$citrusVersion") - testCompile("io.github.glytching:junit-extensions") - testCompile("org.assertj:assertj-core") - testCompile("org.junit.jupiter:junit-jupiter-api") - testCompile("org.junit.jupiter:junit-jupiter-params") - testCompile("org.slf4j:slf4j-simple") - testCompile(project(":allure-assertj")) - testCompile(project(":allure-java-commons-test")) - testCompile(project(":allure-junit-platform")) - testRuntime("org.junit.jupiter:junit-jupiter-engine") + api(project(":allure-java-commons")) + compileOnly("com.consol.citrus:citrus-core:$citrusVersion") + testImplementation("com.consol.citrus:citrus-http:$citrusVersion") + testImplementation("com.consol.citrus:citrus-java-dsl:$citrusVersion") + testImplementation("io.github.glytching:junit-extensions") + testImplementation("org.assertj:assertj-core") + testImplementation("org.junit.jupiter:junit-jupiter-api") + testImplementation("org.junit.jupiter:junit-jupiter-params") + testImplementation("org.slf4j:slf4j-simple") + testImplementation(project(":allure-assertj")) + testImplementation(project(":allure-java-commons-test")) + testImplementation(project(":allure-junit-platform")) + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") } tasks.named("jar") { diff --git a/allure-cucumber-jvm/build.gradle.kts b/allure-cucumber-jvm/build.gradle.kts index ca6696b9a..9c73de996 100644 --- a/allure-cucumber-jvm/build.gradle.kts +++ b/allure-cucumber-jvm/build.gradle.kts @@ -6,20 +6,19 @@ val cucumberVersion = "1.2.5" dependencies { agent("org.aspectj:aspectjweaver") - compile("info.cukes:cucumber-core:$cucumberVersion") - compile("info.cukes:cucumber-java:$cucumberVersion") - compile("info.cukes:gherkin:2.12.2") - compile(project(":allure-java-commons")) - - testCompile("info.cukes:cucumber-testng:$cucumberVersion") - testCompile("commons-io:commons-io") - testCompile("io.github.glytching:junit-extensions") - testCompile("org.assertj:assertj-core") - testCompile("org.junit.jupiter:junit-jupiter-api") - testCompile("org.slf4j:slf4j-simple") - testCompile(project(":allure-java-commons-test")) - testCompile(project(":allure-junit-platform")) - testRuntime("org.junit.jupiter:junit-jupiter-engine") + api(project(":allure-java-commons")) + implementation("info.cukes:cucumber-core:$cucumberVersion") + implementation("info.cukes:cucumber-java:$cucumberVersion") + implementation("info.cukes:gherkin:2.12.2") + testImplementation("commons-io:commons-io") + testImplementation("info.cukes:cucumber-testng:$cucumberVersion") + testImplementation("io.github.glytching:junit-extensions") + testImplementation("org.assertj:assertj-core") + testImplementation("org.junit.jupiter:junit-jupiter-api") + testImplementation("org.slf4j:slf4j-simple") + testImplementation(project(":allure-java-commons-test")) + testImplementation(project(":allure-junit-platform")) + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") } tasks.named("jar") { diff --git a/allure-cucumber2-jvm/build.gradle.kts b/allure-cucumber2-jvm/build.gradle.kts index 5e36884fb..db23062db 100644 --- a/allure-cucumber2-jvm/build.gradle.kts +++ b/allure-cucumber2-jvm/build.gradle.kts @@ -6,19 +6,17 @@ val cucumberVersion = "2.3.1" dependencies { agent("org.aspectj:aspectjweaver") - - compile(project(":allure-java-commons")) - compile("io.cucumber:cucumber-core:$cucumberVersion") - compile("io.cucumber:cucumber-java:$cucumberVersion") - - testCompile("commons-io:commons-io") - testCompile("io.github.glytching:junit-extensions") - testCompile("org.assertj:assertj-core") - testCompile("org.junit.jupiter:junit-jupiter-api") - testCompile("org.slf4j:slf4j-simple") - testCompile(project(":allure-java-commons-test")) - testCompile(project(":allure-junit-platform")) - testRuntime("org.junit.jupiter:junit-jupiter-engine") + api(project(":allure-java-commons")) + implementation("io.cucumber:cucumber-core:$cucumberVersion") + implementation("io.cucumber:cucumber-java:$cucumberVersion") + testImplementation("commons-io:commons-io") + testImplementation("io.github.glytching:junit-extensions") + testImplementation("org.assertj:assertj-core") + testImplementation("org.junit.jupiter:junit-jupiter-api") + testImplementation("org.slf4j:slf4j-simple") + testImplementation(project(":allure-java-commons-test")) + testImplementation(project(":allure-junit-platform")) + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") } tasks.named("jar") { diff --git a/allure-cucumber3-jvm/build.gradle.kts b/allure-cucumber3-jvm/build.gradle.kts index 5c6259fcf..212a8f1d9 100644 --- a/allure-cucumber3-jvm/build.gradle.kts +++ b/allure-cucumber3-jvm/build.gradle.kts @@ -6,18 +6,17 @@ val cucumberVersion = "3.0.0" dependencies { agent("org.aspectj:aspectjweaver") - compile("io.cucumber:cucumber-core:$cucumberVersion") - compile("io.cucumber:cucumber-java:$cucumberVersion") - compile(project(":allure-java-commons")) - - testCompile("commons-io:commons-io") - testCompile("io.github.glytching:junit-extensions") - testCompile("org.assertj:assertj-core") - testCompile("org.junit.jupiter:junit-jupiter-api") - testCompile("org.slf4j:slf4j-simple") - testCompile(project(":allure-java-commons-test")) - testCompile(project(":allure-junit-platform")) - testRuntime("org.junit.jupiter:junit-jupiter-engine") + api(project(":allure-java-commons")) + implementation("io.cucumber:cucumber-core:$cucumberVersion") + implementation("io.cucumber:cucumber-java:$cucumberVersion") + testImplementation("commons-io:commons-io") + testImplementation("io.github.glytching:junit-extensions") + testImplementation("org.assertj:assertj-core") + testImplementation("org.junit.jupiter:junit-jupiter-api") + testImplementation("org.slf4j:slf4j-simple") + testImplementation(project(":allure-java-commons-test")) + testImplementation(project(":allure-junit-platform")) + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") } tasks.named("jar") { diff --git a/allure-cucumber4-jvm/build.gradle.kts b/allure-cucumber4-jvm/build.gradle.kts index 8fd39e12d..76475d003 100644 --- a/allure-cucumber4-jvm/build.gradle.kts +++ b/allure-cucumber4-jvm/build.gradle.kts @@ -6,21 +6,17 @@ val cucumberVersion = "4.2.2" dependencies { agent("org.aspectj:aspectjweaver") - compile(project(":allure-java-commons")) - - compile("io.cucumber:cucumber-core:$cucumberVersion") - compile("io.cucumber:cucumber-java:$cucumberVersion") - - testCompile("io.cucumber:cucumber-testng:$cucumberVersion") - testCompile(project(":allure-java-commons-test")) - testCompile("commons-io:commons-io") - testCompile("org.assertj:assertj-core") - - testCompile("org.junit.jupiter:junit-jupiter-api") - testRuntime("org.junit.jupiter:junit-jupiter-engine") - testCompile("io.github.glytching:junit-extensions") - - testCompile("org.slf4j:slf4j-simple") + api(project(":allure-java-commons")) + implementation("io.cucumber:cucumber-core:$cucumberVersion") + implementation("io.cucumber:cucumber-java:$cucumberVersion") + testImplementation("commons-io:commons-io") + testImplementation("io.cucumber:cucumber-testng:$cucumberVersion") + testImplementation("io.github.glytching:junit-extensions") + testImplementation("org.assertj:assertj-core") + testImplementation("org.junit.jupiter:junit-jupiter-api") + testImplementation("org.slf4j:slf4j-simple") + testImplementation(project(":allure-java-commons-test")) + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") } tasks.named("jar") { diff --git a/allure-descriptions-javadoc/build.gradle.kts b/allure-descriptions-javadoc/build.gradle.kts index c5492dce1..724fc0669 100644 --- a/allure-descriptions-javadoc/build.gradle.kts +++ b/allure-descriptions-javadoc/build.gradle.kts @@ -4,18 +4,16 @@ val agent by configurations.creating dependencies { agent("org.aspectj:aspectjweaver") - - compile(project(":allure-java-commons")) - compile("commons-io:commons-io") - - testCompile("com.google.testing.compile:compile-testing") - testCompile("io.github.glytching:junit-extensions") - testCompile("org.assertj:assertj-core") - testCompile("org.junit.jupiter:junit-jupiter-api") - testCompile("org.slf4j:slf4j-simple") - testCompile(project(":allure-java-commons-test")) - testCompile(project(":allure-junit-platform")) - testRuntime("org.junit.jupiter:junit-jupiter-engine") + api("commons-io:commons-io") + api(project(":allure-java-commons")) + testImplementation("com.google.testing.compile:compile-testing") + testImplementation("io.github.glytching:junit-extensions") + testImplementation("org.assertj:assertj-core") + testImplementation("org.junit.jupiter:junit-jupiter-api") + testImplementation("org.slf4j:slf4j-simple") + testImplementation(project(":allure-java-commons-test")) + testImplementation(project(":allure-junit-platform")) + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") } tasks.named("jar") { diff --git a/allure-httpclient/build.gradle.kts b/allure-httpclient/build.gradle.kts index 4127b82c9..d88cdb6a7 100644 --- a/allure-httpclient/build.gradle.kts +++ b/allure-httpclient/build.gradle.kts @@ -4,19 +4,17 @@ val agent by configurations.creating dependencies { agent("org.aspectj:aspectjweaver") - - compile("org.apache.httpcomponents:httpclient") - compile(project(":allure-attachments")) - - testCompile("com.github.tomakehurst:wiremock") - testCompile("io.github.glytching:junit-extensions") - testCompile("org.assertj:assertj-core") - testCompile("org.junit.jupiter:junit-jupiter-api") - testCompile("org.mockito:mockito-core") - testCompile("org.slf4j:slf4j-simple") - testCompile(project(":allure-java-commons-test")) - testCompile(project(":allure-junit-platform")) - testRuntime("org.junit.jupiter:junit-jupiter-engine") + api(project(":allure-attachments")) + implementation("org.apache.httpcomponents:httpclient") + testImplementation("com.github.tomakehurst:wiremock") + testImplementation("io.github.glytching:junit-extensions") + testImplementation("org.assertj:assertj-core") + testImplementation("org.junit.jupiter:junit-jupiter-api") + testImplementation("org.mockito:mockito-core") + testImplementation("org.slf4j:slf4j-simple") + testImplementation(project(":allure-java-commons-test")) + testImplementation(project(":allure-junit-platform")) + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") } tasks.named("jar") { diff --git a/allure-java-commons-test/build.gradle.kts b/allure-java-commons-test/build.gradle.kts index 129c6c565..5db67ba7b 100644 --- a/allure-java-commons-test/build.gradle.kts +++ b/allure-java-commons-test/build.gradle.kts @@ -1,8 +1,8 @@ description = "Allure Java Commons Test Utils" dependencies { - compile("commons-io:commons-io") - compile(project(":allure-java-commons")) + api("commons-io:commons-io") + api(project(":allure-java-commons")) } tasks.named("jar") { diff --git a/allure-java-commons/build.gradle.kts b/allure-java-commons/build.gradle.kts index 66d0ff84f..a47a40b5d 100644 --- a/allure-java-commons/build.gradle.kts +++ b/allure-java-commons/build.gradle.kts @@ -4,22 +4,23 @@ val agent by configurations.creating dependencies { agent("org.aspectj:aspectjweaver") - compile("org.apache.tika:tika-core") - compile("org.aspectj:aspectjrt") - compile("org.jooq:joor-java-8") - compile("org.slf4j:slf4j-api") - compile(project(":allure-model")) - testCompile("io.github.benas:random-beans") - testCompile("io.github.glytching:junit-extensions") - testCompile("org.assertj:assertj-core") - testCompile("org.junit-pioneer:junit-pioneer") - testCompile("org.junit.jupiter:junit-jupiter-api") - testCompile("org.junit.jupiter:junit-jupiter-params") - testCompile("org.mockito:mockito-core") - testCompile("org.slf4j:slf4j-simple") - testCompile(project(":allure-java-commons-test")) - testCompile(project(":allure-junit-platform")) - testRuntime("org.junit.jupiter:junit-jupiter-engine") + api("org.slf4j:slf4j-api") + api(project(":allure-model")) + compileOnly("org.aspectj:aspectjrt") + implementation("com.fasterxml.jackson.core:jackson-databind") + implementation("org.apache.tika:tika-core") + implementation("org.jooq:joor-java-8") + testImplementation("io.github.benas:random-beans") + testImplementation("io.github.glytching:junit-extensions") + testImplementation("org.assertj:assertj-core") + testImplementation("org.junit-pioneer:junit-pioneer") + testImplementation("org.junit.jupiter:junit-jupiter-api") + testImplementation("org.junit.jupiter:junit-jupiter-params") + testImplementation("org.mockito:mockito-core") + testImplementation("org.slf4j:slf4j-simple") + testImplementation(project(":allure-java-commons-test")) + testImplementation(project(":allure-junit-platform")) + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") } tasks.named("jar") { diff --git a/allure-java-migration/build.gradle.kts b/allure-java-migration/build.gradle.kts index a34e4f044..488fbaaa4 100644 --- a/allure-java-migration/build.gradle.kts +++ b/allure-java-migration/build.gradle.kts @@ -7,24 +7,22 @@ val testNgVersion = "6.14.3" dependencies { agent("org.aspectj:aspectjweaver") - - compile("org.apache.commons:commons-lang3") - compile("org.aspectj:aspectjrt") - compile(project(":allure-java-commons")) - compileOnly("junit:junit:$junitVersion") - compileOnly("org.testng:testng:$testNgVersion") - - testCompile("io.github.glytching:junit-extensions") - testCompile("junit:junit:$junitVersion") - testCompile("org.assertj:assertj-core") - testCompile("org.junit.jupiter:junit-jupiter-api") - testCompile("org.junit.jupiter:junit-jupiter-params") - testCompile("org.mockito:mockito-core") - testCompile("org.slf4j:slf4j-simple") - testCompile("org.testng:testng:$testNgVersion") - testCompile(project(":allure-java-commons-test")) - testCompile(project(":allure-junit-platform")) - testRuntime("org.junit.jupiter:junit-jupiter-engine") + api("org.apache.commons:commons-lang3") + api("org.aspectj:aspectjrt") + api(project(":allure-java-commons")) + implementation("junit:junit:$junitVersion") + implementation("org.testng:testng:$testNgVersion") + testImplementation("io.github.glytching:junit-extensions") + testImplementation("junit:junit:$junitVersion") + testImplementation("org.assertj:assertj-core") + testImplementation("org.junit.jupiter:junit-jupiter-api") + testImplementation("org.junit.jupiter:junit-jupiter-params") + testImplementation("org.mockito:mockito-core") + testImplementation("org.slf4j:slf4j-simple") + testImplementation("org.testng:testng:$testNgVersion") + testImplementation(project(":allure-java-commons-test")) + testImplementation(project(":allure-junit-platform")) + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") } tasks.named("jar") { diff --git a/allure-jax-rs/build.gradle.kts b/allure-jax-rs/build.gradle.kts index e76cfc84e..37a55620a 100644 --- a/allure-jax-rs/build.gradle.kts +++ b/allure-jax-rs/build.gradle.kts @@ -6,18 +6,17 @@ val javaxWsRsApiVersion = "2.0.1" dependencies { agent("org.aspectj:aspectjweaver") - - compile(project(":allure-attachments")) - compile("javax.ws.rs:javax.ws.rs-api:$javaxWsRsApiVersion") - testCompile("com.github.tomakehurst:wiremock") - testCompile("org.jboss.resteasy:resteasy-client") - testCompile("org.assertj:assertj-core") - testCompile("org.junit.jupiter:junit-jupiter-api") - testCompile("org.mockito:mockito-core") - testCompile("org.slf4j:slf4j-simple") - testCompile(project(":allure-java-commons-test")) - testCompile(project(":allure-junit-platform")) - testRuntime("org.junit.jupiter:junit-jupiter-engine") + api(project(":allure-attachments")) + implementation("javax.ws.rs:javax.ws.rs-api:$javaxWsRsApiVersion") + testImplementation("com.github.tomakehurst:wiremock") + testImplementation("org.assertj:assertj-core") + testImplementation("org.jboss.resteasy:resteasy-client") + testImplementation("org.junit.jupiter:junit-jupiter-api") + testImplementation("org.mockito:mockito-core") + testImplementation("org.slf4j:slf4j-simple") + testImplementation(project(":allure-java-commons-test")) + testImplementation(project(":allure-junit-platform")) + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") } tasks.named("jar") { diff --git a/allure-jbehave/build.gradle.kts b/allure-jbehave/build.gradle.kts index 015abbbbb..6ec3746c7 100644 --- a/allure-jbehave/build.gradle.kts +++ b/allure-jbehave/build.gradle.kts @@ -6,18 +6,16 @@ val jbehaveVersion = "4.3.4" dependencies { agent("org.aspectj:aspectjweaver") - - compile(project(":allure-java-commons")) - compile("org.jbehave:jbehave-core:$jbehaveVersion") - - testCompile("org.assertj:assertj-core") - testCompile("org.junit-pioneer:junit-pioneer") - testCompile("org.junit.jupiter:junit-jupiter-api") - testCompile("org.mockito:mockito-core") - testCompile("org.slf4j:slf4j-simple") - testCompile(project(":allure-java-commons-test")) - testCompile(project(":allure-junit-platform")) - testRuntime("org.junit.jupiter:junit-jupiter-engine") + api(project(":allure-java-commons")) + implementation("org.jbehave:jbehave-core:$jbehaveVersion") + testImplementation("org.assertj:assertj-core") + testImplementation("org.junit-pioneer:junit-pioneer") + testImplementation("org.junit.jupiter:junit-jupiter-api") + testImplementation("org.mockito:mockito-core") + testImplementation("org.slf4j:slf4j-simple") + testImplementation(project(":allure-java-commons-test")) + testImplementation(project(":allure-junit-platform")) + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") } tasks.named("jar") { diff --git a/allure-jsonunit/build.gradle.kts b/allure-jsonunit/build.gradle.kts index 5bd5bb0f2..cb715f8f3 100644 --- a/allure-jsonunit/build.gradle.kts +++ b/allure-jsonunit/build.gradle.kts @@ -6,18 +6,18 @@ val jsonUnitVersion = "2.0.0.RC1" dependencies { agent("org.aspectj:aspectjweaver") - - compile("org.apache.commons:commons-lang3") - compile("net.javacrumbs.json-unit:json-unit:$jsonUnitVersion") - compile(project(":allure-attachments")) - testCompile("org.assertj:assertj-core") - testCompile("org.junit-pioneer:junit-pioneer") - testCompile("org.junit.jupiter:junit-jupiter-api") - testCompile("org.mockito:mockito-core") - testCompile("org.slf4j:slf4j-simple") - testCompile(project(":allure-java-commons-test")) - testCompile(project(":allure-junit-platform")) - testRuntime("org.junit.jupiter:junit-jupiter-engine") + api(project(":allure-attachments")) + implementation("com.fasterxml.jackson.core:jackson-databind") + implementation("net.javacrumbs.json-unit:json-unit:$jsonUnitVersion") + implementation("org.apache.commons:commons-lang3") + testImplementation("org.assertj:assertj-core") + testImplementation("org.junit-pioneer:junit-pioneer") + testImplementation("org.junit.jupiter:junit-jupiter-api") + testImplementation("org.mockito:mockito-core") + testImplementation("org.slf4j:slf4j-simple") + testImplementation(project(":allure-java-commons-test")) + testImplementation(project(":allure-junit-platform")) + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") } tasks.named("jar") { diff --git a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchListener.java b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchListener.java index bccba70bb..de27cc39d 100644 --- a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchListener.java +++ b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchListener.java @@ -132,7 +132,6 @@ public String getJsonPatch() { left = right + 1; } }); - final ObjectMapper mapper = new ObjectMapper(); try { return mapper.writeValueAsString(jsonDiffPatch); diff --git a/allure-junit-platform/build.gradle.kts b/allure-junit-platform/build.gradle.kts index 27ad75ebf..2e0da229a 100644 --- a/allure-junit-platform/build.gradle.kts +++ b/allure-junit-platform/build.gradle.kts @@ -4,18 +4,18 @@ val agent by configurations.creating dependencies { agent("org.aspectj:aspectjweaver") - compile("org.junit.jupiter:junit-jupiter-api") - compile("org.junit.platform:junit-platform-launcher") - compile(project(":allure-java-commons")) + api(project(":allure-java-commons")) + implementation("org.junit.jupiter:junit-jupiter-api") + implementation("org.junit.platform:junit-platform-launcher") testAnnotationProcessor(project(":allure-descriptions-javadoc")) - testCompile("io.github.glytching:junit-extensions") - testCompile("org.assertj:assertj-core") - testCompile("org.junit.jupiter:junit-jupiter-api") - testCompile("org.junit.jupiter:junit-jupiter-params") - testCompile("org.slf4j:slf4j-simple") - testCompile(project(":allure-assertj")) - testCompile(project(":allure-java-commons-test")) - testRuntime("org.junit.jupiter:junit-jupiter-engine") + testImplementation("io.github.glytching:junit-extensions") + testImplementation("org.assertj:assertj-core") + testImplementation("org.junit.jupiter:junit-jupiter-api") + testImplementation("org.junit.jupiter:junit-jupiter-params") + testImplementation("org.slf4j:slf4j-simple") + testImplementation(project(":allure-assertj")) + testImplementation(project(":allure-java-commons-test")) + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") } tasks.named("jar") { diff --git a/allure-junit4-aspect/build.gradle.kts b/allure-junit4-aspect/build.gradle.kts index d989777b6..711b4b8d8 100644 --- a/allure-junit4-aspect/build.gradle.kts +++ b/allure-junit4-aspect/build.gradle.kts @@ -2,10 +2,13 @@ description = "Allure JUnit 4 Aspect HACK" val agent by configurations.creating +val junitVersion = "4.12" + dependencies { agent("org.aspectj:aspectjweaver") - compile(project(":allure-junit4")) - compileOnly("org.aspectj:aspectjrt") + api(project(":allure-junit4")) + implementation("junit:junit:$junitVersion") + implementation("org.aspectj:aspectjrt") } tasks.named("jar") { diff --git a/allure-junit4/build.gradle.kts b/allure-junit4/build.gradle.kts index 17f7e8a82..333d6707a 100644 --- a/allure-junit4/build.gradle.kts +++ b/allure-junit4/build.gradle.kts @@ -6,16 +6,16 @@ val junitVersion = "4.12" dependencies { agent("org.aspectj:aspectjweaver") - compile("junit:junit:$junitVersion") - compile(project(":allure-java-commons")) - testCompile("org.assertj:assertj-core") - testCompile("org.junit-pioneer:junit-pioneer") - testCompile("org.junit.jupiter:junit-jupiter-api") - testCompile("org.mockito:mockito-core") - testCompile("org.slf4j:slf4j-simple") - testCompile(project(":allure-java-commons-test")) - testCompile(project(":allure-junit-platform")) - testRuntime("org.junit.jupiter:junit-jupiter-engine") + api(project(":allure-java-commons")) + implementation("junit:junit:$junitVersion") + testImplementation("org.assertj:assertj-core") + testImplementation("org.junit-pioneer:junit-pioneer") + testImplementation("org.junit.jupiter:junit-jupiter-api") + testImplementation("org.mockito:mockito-core") + testImplementation("org.slf4j:slf4j-simple") + testImplementation(project(":allure-java-commons-test")) + testImplementation(project(":allure-junit-platform")) + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") } tasks.named("jar") { diff --git a/allure-junit5/build.gradle.kts b/allure-junit5/build.gradle.kts index 8deace94c..e5c328c46 100644 --- a/allure-junit5/build.gradle.kts +++ b/allure-junit5/build.gradle.kts @@ -1,39 +1,5 @@ description = "Allure JUnit 5 Integration" -val agent by configurations.creating - dependencies { - agent("org.aspectj:aspectjweaver") - compile(project(":allure-junit-platform")) -} - -tasks.named("jar") { - manifest { - attributes(mapOf( - "Automatic-Module-Name" to "io.qameta.allure.junit5" - )) - } - from("src/main/services") { - into("META-INF/services") - } -} - -tasks.named("test") { - useJUnitPlatform() - exclude("**/samples/*") - doFirst { - jvmArgs("-javaagent:${agent.singleFile}") - } + api(project(":allure-junit-platform")) } - -val spiOffJar by tasks.creating(Jar::class) { - from(sourceSets.getByName("main").output) - classifier = "spi-off" -} - -val spiOff by configurations.creating { - extendsFrom(configurations.getByName("compile")) -} - -artifacts.add("archives", spiOffJar) -artifacts.add("spiOff", spiOffJar) diff --git a/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5AnnotationProcessor.java b/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5AnnotationProcessor.java deleted file mode 100644 index 1be082fa0..000000000 --- a/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5AnnotationProcessor.java +++ /dev/null @@ -1,18 +0,0 @@ -package io.qameta.allure.junit5; - -import org.junit.jupiter.api.extension.BeforeTestExecutionCallback; -import org.junit.jupiter.api.extension.ExtensionContext; - -/** - * Allure Junit5 annotation processor. - * - * @deprecated use Allure JUnit platform integration instead - */ -@Deprecated -public class AllureJunit5AnnotationProcessor implements BeforeTestExecutionCallback { - - @Override - public void beforeTestExecution(final ExtensionContext context) { - //do nothing - } -} diff --git a/allure-junit5/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/allure-junit5/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension deleted file mode 100644 index 78d288db3..000000000 --- a/allure-junit5/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension +++ /dev/null @@ -1 +0,0 @@ -io.qameta.allure.junit5.AllureJunit5AnnotationProcessor \ No newline at end of file diff --git a/allure-junit5/src/test/resources/allure.properties b/allure-junit5/src/test/resources/allure.properties deleted file mode 100644 index 1e290b58d..000000000 --- a/allure-junit5/src/test/resources/allure.properties +++ /dev/null @@ -1,2 +0,0 @@ -allure.model.indentOutput=true -allure.results.directory=build/allure-results \ No newline at end of file diff --git a/allure-model/build.gradle.kts b/allure-model/build.gradle.kts index 53401c3f7..b1324c275 100644 --- a/allure-model/build.gradle.kts +++ b/allure-model/build.gradle.kts @@ -4,16 +4,14 @@ val agent by configurations.creating dependencies { agent("org.aspectj:aspectjweaver") - - compile("com.fasterxml.jackson.core:jackson-databind") - - testCompile("io.github.benas:random-beans") - testCompile("org.assertj:assertj-core") - testCompile("org.junit-pioneer:junit-pioneer") - testCompile("org.junit.jupiter:junit-jupiter-api") - testCompile("org.mockito:mockito-core") - testCompile("org.slf4j:slf4j-simple") - testRuntime("org.junit.jupiter:junit-jupiter-engine") + implementation("com.fasterxml.jackson.core:jackson-databind") + testImplementation("io.github.benas:random-beans") + testImplementation("org.assertj:assertj-core") + testImplementation("org.junit-pioneer:junit-pioneer") + testImplementation("org.junit.jupiter:junit-jupiter-api") + testImplementation("org.mockito:mockito-core") + testImplementation("org.slf4j:slf4j-simple") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") } tasks.named("jar") { diff --git a/allure-okhttp/build.gradle.kts b/allure-okhttp/build.gradle.kts index f8fefa823..92325e0c8 100644 --- a/allure-okhttp/build.gradle.kts +++ b/allure-okhttp/build.gradle.kts @@ -6,19 +6,17 @@ val okhttpVersion = "2.7.5" dependencies { agent("org.aspectj:aspectjweaver") - - compile(project(":allure-attachments")) - compile("com.squareup.okhttp:okhttp:$okhttpVersion") - - testCompile("com.github.tomakehurst:wiremock") - testCompile("org.jboss.resteasy:resteasy-client") - testCompile("org.assertj:assertj-core") - testCompile("org.junit.jupiter:junit-jupiter-api") - testCompile("org.mockito:mockito-core") - testCompile("org.slf4j:slf4j-simple") - testCompile(project(":allure-java-commons-test")) - testCompile(project(":allure-junit-platform")) - testRuntime("org.junit.jupiter:junit-jupiter-engine") + api(project(":allure-attachments")) + implementation("com.squareup.okhttp:okhttp:$okhttpVersion") + testImplementation("com.github.tomakehurst:wiremock") + testImplementation("org.assertj:assertj-core") + testImplementation("org.jboss.resteasy:resteasy-client") + testImplementation("org.junit.jupiter:junit-jupiter-api") + testImplementation("org.mockito:mockito-core") + testImplementation("org.slf4j:slf4j-simple") + testImplementation(project(":allure-java-commons-test")) + testImplementation(project(":allure-junit-platform")) + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") } tasks.named("jar") { diff --git a/allure-okhttp3/build.gradle.kts b/allure-okhttp3/build.gradle.kts index a77f22776..087de66cb 100644 --- a/allure-okhttp3/build.gradle.kts +++ b/allure-okhttp3/build.gradle.kts @@ -6,19 +6,17 @@ val okhttpVersion = "3.10.0" dependencies { agent("org.aspectj:aspectjweaver") - - compile(project(":allure-attachments")) - compile("com.squareup.okhttp3:okhttp:$okhttpVersion") - - testCompile("com.github.tomakehurst:wiremock") - testCompile("org.jboss.resteasy:resteasy-client") - testCompile("org.assertj:assertj-core") - testCompile("org.junit.jupiter:junit-jupiter-api") - testCompile("org.mockito:mockito-core") - testCompile("org.slf4j:slf4j-simple") - testCompile(project(":allure-java-commons-test")) - testCompile(project(":allure-junit-platform")) - testRuntime("org.junit.jupiter:junit-jupiter-engine") + api(project(":allure-attachments")) + implementation("com.squareup.okhttp3:okhttp:$okhttpVersion") + testImplementation("com.github.tomakehurst:wiremock") + testImplementation("org.assertj:assertj-core") + testImplementation("org.jboss.resteasy:resteasy-client") + testImplementation("org.junit.jupiter:junit-jupiter-api") + testImplementation("org.mockito:mockito-core") + testImplementation("org.slf4j:slf4j-simple") + testImplementation(project(":allure-java-commons-test")) + testImplementation(project(":allure-junit-platform")) + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") } tasks.named("jar") { diff --git a/allure-rest-assured/build.gradle.kts b/allure-rest-assured/build.gradle.kts index 09e9bde2e..0eb60769e 100644 --- a/allure-rest-assured/build.gradle.kts +++ b/allure-rest-assured/build.gradle.kts @@ -6,20 +6,18 @@ val restAssuredVersion = "3.1.0" dependencies { agent("org.aspectj:aspectjweaver") - - compile(project(":allure-attachments")) - compile("io.rest-assured:rest-assured:$restAssuredVersion") - - testCompile("com.github.tomakehurst:wiremock") - testCompile("org.jboss.resteasy:resteasy-client") - testCompile("org.assertj:assertj-core") - testCompile("org.junit.jupiter:junit-jupiter-api") - testCompile("org.junit.jupiter:junit-jupiter-params") - testCompile("org.mockito:mockito-core") - testCompile("org.slf4j:slf4j-simple") - testCompile(project(":allure-java-commons-test")) - testCompile(project(":allure-junit-platform")) - testRuntime("org.junit.jupiter:junit-jupiter-engine") + api(project(":allure-attachments")) + implementation("io.rest-assured:rest-assured:$restAssuredVersion") + testImplementation("com.github.tomakehurst:wiremock") + testImplementation("org.assertj:assertj-core") + testImplementation("org.jboss.resteasy:resteasy-client") + testImplementation("org.junit.jupiter:junit-jupiter-api") + testImplementation("org.junit.jupiter:junit-jupiter-params") + testImplementation("org.mockito:mockito-core") + testImplementation("org.slf4j:slf4j-simple") + testImplementation(project(":allure-java-commons-test")) + testImplementation(project(":allure-junit-platform")) + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") } tasks.named("jar") { diff --git a/allure-scalatest/build.gradle.kts b/allure-scalatest/build.gradle.kts index fbbdefb8b..91b165643 100644 --- a/allure-scalatest/build.gradle.kts +++ b/allure-scalatest/build.gradle.kts @@ -79,21 +79,19 @@ val installAll by tasks.creating { val agent by configurations.creating dependencies { - compile("org.scalatest:scalatest_$baseScalaVersion:3.0.5") agent("org.aspectj:aspectjweaver") - compile("org.junit.jupiter:junit-jupiter-api") - compile("org.junit.platform:junit-platform-launcher") - compile(project(":allure-java-commons")) + api(project(":allure-java-commons")) + implementation("org.scalatest:scalatest_$baseScalaVersion:3.0.5") testAnnotationProcessor(project(":allure-descriptions-javadoc")) - testCompile("io.github.glytching:junit-extensions") - testCompile("org.assertj:assertj-core") - testCompile("org.junit.jupiter:junit-jupiter-api") - testCompile("org.junit.jupiter:junit-jupiter-params") - testCompile("org.slf4j:slf4j-simple") - testCompile(project(":allure-assertj")) - testCompile(project(":allure-java-commons-test")) - testCompile(project(":allure-junit-platform")) - testRuntime("org.junit.jupiter:junit-jupiter-engine") + testImplementation("io.github.glytching:junit-extensions") + testImplementation("org.assertj:assertj-core") + testImplementation("org.junit.jupiter:junit-jupiter-api") + testImplementation("org.junit.jupiter:junit-jupiter-params") + testImplementation("org.slf4j:slf4j-simple") + testImplementation(project(":allure-assertj")) + testImplementation(project(":allure-java-commons-test")) + testImplementation(project(":allure-junit-platform")) + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") } val scaladocJar by tasks.creating(Jar::class) { diff --git a/allure-selenide/build.gradle.kts b/allure-selenide/build.gradle.kts index 51518a5cb..148697d5c 100644 --- a/allure-selenide/build.gradle.kts +++ b/allure-selenide/build.gradle.kts @@ -3,8 +3,8 @@ description = "Allure Selenide Integration" val selenideVersion = "4.12.2" dependencies { - compile(project(":allure-java-commons")) - compile("com.codeborne:selenide:$selenideVersion") + api(project(":allure-java-commons")) + implementation("com.codeborne:selenide:$selenideVersion") } tasks.named("jar") { diff --git a/allure-servlet-api/build.gradle.kts b/allure-servlet-api/build.gradle.kts index cba56c3ca..23b427af0 100644 --- a/allure-servlet-api/build.gradle.kts +++ b/allure-servlet-api/build.gradle.kts @@ -3,8 +3,8 @@ description = "Allure Servlet API v3 Integration" var servletApiVersion = "4.0.1" dependencies { - compile(project(":allure-attachments")) - compile("javax.servlet:javax.servlet-api:$servletApiVersion") + api(project(":allure-attachments")) + implementation("javax.servlet:javax.servlet-api:$servletApiVersion") } tasks.named("jar") { diff --git a/allure-spock/build.gradle.kts b/allure-spock/build.gradle.kts index f0f8b547b..6920e8d4c 100644 --- a/allure-spock/build.gradle.kts +++ b/allure-spock/build.gradle.kts @@ -1,5 +1,3 @@ -import groovy.sql.GroovyResultSetExtension - description = "Allure Spock Framework Integration" apply(plugin = "groovy") @@ -10,15 +8,16 @@ val spockFrameworkVersion = "1.1-groovy-2.4" dependencies { agent("org.aspectj:aspectjweaver") - compile("org.spockframework:spock-core:$spockFrameworkVersion") - compile(project(":allure-java-commons")) - testCompile("org.assertj:assertj-core") - testCompile("org.codehaus.groovy:groovy-all") - testCompile("org.mockito:mockito-core") - testCompile("org.slf4j:slf4j-simple") - testCompile(project(":allure-junit-platform")) - testCompile(project(":allure-java-commons-test")) - testRuntime("org.junit.jupiter:junit-jupiter-engine") + api(project(":allure-java-commons")) + implementation("org.spockframework:spock-core:$spockFrameworkVersion") + testImplementation("org.assertj:assertj-core") + testImplementation("org.codehaus.groovy:groovy-all") + testImplementation("org.junit.jupiter:junit-jupiter-api") + testImplementation("org.mockito:mockito-core") + testImplementation("org.slf4j:slf4j-simple") + testImplementation(project(":allure-java-commons-test")) + testImplementation(project(":allure-junit-platform")) + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") } tasks.named("jar") { @@ -36,14 +35,3 @@ tasks.named("test") { jvmArgs("-javaagent:${agent.singleFile}") } } - -// -//val sourceSets = project.the() -//sourceSets.getByName("test") { -// java { -// srcDir("src/test/groovy") -// } -//} - -//sourceSets.getByName("test").withGroovyBuilder { } - diff --git a/allure-spring-boot/build.gradle.kts b/allure-spring-boot/build.gradle.kts deleted file mode 100644 index f36a2026b..000000000 --- a/allure-spring-boot/build.gradle.kts +++ /dev/null @@ -1,15 +0,0 @@ -description = "Allure Spring Boot Integration" - -dependencies { - compile("org.springframework.boot:spring-boot-autoconfigure") - compile(project(":allure-attachments")) - compile(project(":allure-spring4-webmvc")) -} - -tasks.named("jar") { - manifest { - attributes(mapOf( - "Automatic-Module-Name" to "io.qameta.allure.springboot" - )) - } -} diff --git a/allure-spring-boot/src/main/java/io/qameta/allure/springboot/AllureSpringWebmvcAutoconfigure.java b/allure-spring-boot/src/main/java/io/qameta/allure/springboot/AllureSpringWebmvcAutoconfigure.java deleted file mode 100644 index c02d01218..000000000 --- a/allure-spring-boot/src/main/java/io/qameta/allure/springboot/AllureSpringWebmvcAutoconfigure.java +++ /dev/null @@ -1,14 +0,0 @@ -package io.qameta.allure.springboot; - -import io.qameta.allure.spring4.webmvc.AllureSpring4WebMvc; -import io.qameta.allure.spring4.webmvc.AllureWebMvcConfigurerAdapter; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.context.annotation.Configuration; - -/** - * @author charlie (Dmitry Baev). - */ -@Configuration -@ConditionalOnMissingBean(AllureSpring4WebMvc.class) -public class AllureSpringWebmvcAutoconfigure extends AllureWebMvcConfigurerAdapter { -} diff --git a/allure-spring-boot/src/main/resources/META-INF/spring.factories b/allure-spring-boot/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 6bc5e608c..000000000 --- a/allure-spring-boot/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,3 +0,0 @@ -# Allure TestExecutionListener for the Spring TestContext Framework -# -org.springframework.boot.autoconfigure.EnableAutoConfiguration=io.qameta.allure.springboot.AllureSpringWebmvcAutoconfigure diff --git a/allure-spring-web/build.gradle.kts b/allure-spring-web/build.gradle.kts index 668cf2417..4d069ac40 100644 --- a/allure-spring-web/build.gradle.kts +++ b/allure-spring-web/build.gradle.kts @@ -6,19 +6,18 @@ val springWebVersion = "5.0.4.RELEASE" dependencies { agent("org.aspectj:aspectjweaver") - - compile(project(":allure-attachments")) - compile("org.springframework:spring-web:$springWebVersion") - testCompile("com.github.tomakehurst:wiremock") - testCompile("org.jboss.resteasy:resteasy-client") - testCompile("org.assertj:assertj-core") - testCompile("org.junit.jupiter:junit-jupiter-api") - testCompile("org.junit.jupiter:junit-jupiter-params") - testCompile("org.mockito:mockito-core") - testCompile("org.slf4j:slf4j-simple") - testCompile(project(":allure-java-commons-test")) - testCompile(project(":allure-junit-platform")) - testRuntime("org.junit.jupiter:junit-jupiter-engine") + api(project(":allure-attachments")) + implementation("org.springframework:spring-web:$springWebVersion") + testImplementation("com.github.tomakehurst:wiremock") + testImplementation("org.assertj:assertj-core") + testImplementation("org.jboss.resteasy:resteasy-client") + testImplementation("org.junit.jupiter:junit-jupiter-api") + testImplementation("org.junit.jupiter:junit-jupiter-params") + testImplementation("org.mockito:mockito-core") + testImplementation("org.slf4j:slf4j-simple") + testImplementation(project(":allure-java-commons-test")) + testImplementation(project(":allure-junit-platform")) + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") } tasks.named("jar") { diff --git a/allure-spring4-test/build.gradle.kts b/allure-spring4-test/build.gradle.kts deleted file mode 100644 index 9f73efd3e..000000000 --- a/allure-spring4-test/build.gradle.kts +++ /dev/null @@ -1,14 +0,0 @@ -description = "Allure Spring 4 test Integration" - -dependencies { - compile("org.springframework:spring-test") - compile(project(":allure-java-commons")) -} - -tasks.named("jar") { - manifest { - attributes(mapOf( - "Automatic-Module-Name" to "io.qameta.allure.spring4test" - )) - } -} diff --git a/allure-spring4-test/src/main/java/io/qameta/allure/spring4/test/AllureSpring4.java b/allure-spring4-test/src/main/java/io/qameta/allure/spring4/test/AllureSpring4.java deleted file mode 100644 index 3cd18b524..000000000 --- a/allure-spring4-test/src/main/java/io/qameta/allure/spring4/test/AllureSpring4.java +++ /dev/null @@ -1,179 +0,0 @@ -package io.qameta.allure.spring4.test; - -import io.qameta.allure.Allure; -import io.qameta.allure.AllureLifecycle; -import io.qameta.allure.Epic; -import io.qameta.allure.Feature; -import io.qameta.allure.Issue; -import io.qameta.allure.Owner; -import io.qameta.allure.Severity; -import io.qameta.allure.Story; -import io.qameta.allure.TmsLink; -import io.qameta.allure.model.Label; -import io.qameta.allure.model.Link; -import io.qameta.allure.model.Status; -import io.qameta.allure.model.StatusDetails; -import io.qameta.allure.model.TestResult; -import io.qameta.allure.util.ResultsUtils; -import org.springframework.test.context.TestContext; -import org.springframework.test.context.TestExecutionListener; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; -import java.security.MessageDigest; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; -import java.util.Optional; -import java.util.UUID; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import static io.qameta.allure.util.ResultsUtils.bytesToHex; -import static io.qameta.allure.util.ResultsUtils.createFrameworkLabel; -import static io.qameta.allure.util.ResultsUtils.createHostLabel; -import static io.qameta.allure.util.ResultsUtils.createLanguageLabel; -import static io.qameta.allure.util.ResultsUtils.createPackageLabel; -import static io.qameta.allure.util.ResultsUtils.createSuiteLabel; -import static io.qameta.allure.util.ResultsUtils.createTestClassLabel; -import static io.qameta.allure.util.ResultsUtils.createTestMethodLabel; -import static io.qameta.allure.util.ResultsUtils.createThreadLabel; -import static io.qameta.allure.util.ResultsUtils.getMd5Digest; -import static io.qameta.allure.util.ResultsUtils.getProvidedLabels; -import static io.qameta.allure.util.ResultsUtils.getStatus; -import static io.qameta.allure.util.ResultsUtils.getStatusDetails; -import static java.nio.charset.StandardCharsets.UTF_8; - -/** - * @author charlie (Dmitry Baev). - */ -@SuppressWarnings("PMD.ExcessiveImports") -public class AllureSpring4 implements TestExecutionListener { - - private final ThreadLocal testCases = new InheritableThreadLocal() { - @Override - protected String initialValue() { - return UUID.randomUUID().toString(); - } - }; - - private final AllureLifecycle lifecycle; - - public AllureSpring4() { - this.lifecycle = Allure.getLifecycle(); - } - - @Override - public void beforeTestClass(final TestContext testContext) { - //do nothing - } - - @Override - public void prepareTestInstance(final TestContext testContext) { - //do nothing - } - - @Override - public void beforeTestMethod(final TestContext testContext) { - final String uuid = testCases.get(); - final Class testClass = testContext.getTestClass(); - final Method testMethod = testContext.getTestMethod(); - final String id = getHistoryId(testClass, testMethod); - - final String fullName = String.format("%s.%s", testClass.getCanonicalName(), testMethod.getName()); - final TestResult testResult = new TestResult() - .setUuid(uuid) - .setHistoryId(id) - .setFullName(fullName) - .setName(testMethod.getName()); - - testResult.getLabels().addAll(getProvidedLabels()); - testResult.getLabels().addAll(Arrays.asList( - createPackageLabel(testClass.getCanonicalName()), - createTestClassLabel(testClass.getCanonicalName()), - createTestMethodLabel(testMethod.getName()), - createSuiteLabel(testClass.getName()), - createHostLabel(), - createThreadLabel(), - createFrameworkLabel("spring4-test"), - createLanguageLabel("java") - )); - testResult.getLabels().addAll(getLabels(testClass, testMethod)); - - testResult.getLinks().addAll(getLinks(testClass, testMethod)); - - getDisplayName(testMethod).ifPresent(testResult::setName); - getLifecycle().scheduleTestCase(testResult); - getLifecycle().startTestCase(uuid); - } - - @Override - public void afterTestMethod(final TestContext testContext) { - final String uuid = testCases.get(); - testCases.remove(); - getLifecycle().updateTestCase(uuid, testResult -> { - testResult.setStatus(getStatus(testContext.getTestException()).orElse(Status.PASSED)); - if (Objects.isNull(testResult.getStatusDetails())) { - testResult.setStatusDetails(new StatusDetails()); - } - getStatusDetails(testContext.getTestException()).ifPresent(statusDetails -> { - testResult.getStatusDetails().setMessage(statusDetails.getMessage()); - testResult.getStatusDetails().setTrace(statusDetails.getTrace()); - }); - }); - getLifecycle().stopTestCase(uuid); - getLifecycle().writeTestCase(uuid); - } - - @Override - public void afterTestClass(final TestContext testContext) { - //do nothing - } - - public AllureLifecycle getLifecycle() { - return lifecycle; - } - - private Optional getDisplayName(final Method method) { - return Optional.ofNullable(method.getAnnotation(DisplayName.class)) - .map(DisplayName::value); - } - - private List getLinks(final Class testClass, final Method testMethod) { - return Stream.of( - getAnnotations(testClass, testMethod, io.qameta.allure.Link.class).map(ResultsUtils::createLink), - getAnnotations(testClass, testMethod, Issue.class).map(ResultsUtils::createLink), - getAnnotations(testClass, testMethod, TmsLink.class).map(ResultsUtils::createLink) - ).reduce(Stream::concat).orElseGet(Stream::empty).collect(Collectors.toList()); - } - - private List