Skip to content

[BREAKING] Move dependencies to compileOnly to exclude them from classpath #1095

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
baev merged 2 commits into from
Aug 2, 2024
Merged

[BREAKING] Move dependencies to compileOnly to exclude them from classpath #1095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7fb852
move all the framework deps to compileOnly
baev Jul 8, 2024
b69f280
remove migration module
baev Jul 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions allure-awaitility/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ val awaitilityVersion = "4.2.1"
dependencies {
agent("org.aspectj:aspectjweaver")
api(project(":allure-java-commons"))
implementation("org.awaitility:awaitility:$awaitilityVersion")
compileOnly("org.awaitility:awaitility:$awaitilityVersion")
testImplementation("javax.annotation:javax.annotation-api")
testImplementation("org.assertj:assertj-core")
testImplementation("org.awaitility:awaitility:$awaitilityVersion")
testImplementation("org.junit.jupiter:junit-jupiter-api")
testImplementation("org.slf4j:slf4j-simple")
testImplementation(project(":allure-java-commons-test"))
Expand All @@ -27,4 +28,4 @@ tasks.jar {

tasks.test {
useJUnitPlatform()
}
}
6 changes: 4 additions & 2 deletions allure-cucumber4-jvm/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ val cucumberVersion = "4.8.0"

dependencies {
api(project(":allure-java-commons"))
implementation("io.cucumber:cucumber-core:$cucumberVersion")
implementation("io.cucumber:cucumber-java:$cucumberVersion")
compileOnly("io.cucumber:cucumber-core:$cucumberVersion")
compileOnly("io.cucumber:cucumber-java:$cucumberVersion")
testImplementation("commons-io:commons-io")
testImplementation("io.cucumber:cucumber-core:$cucumberVersion")
testImplementation("io.cucumber:cucumber-java:$cucumberVersion")
testImplementation("io.github.glytching:junit-extensions")
testImplementation("org.assertj:assertj-core")
testImplementation("org.junit.jupiter:junit-jupiter-api")
Expand Down
6 changes: 3 additions & 3 deletions allure-cucumber5-jvm/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ val cucumberGherkinVersion = "5.1.0"
dependencies {
api(project(":allure-java-commons"))
compileOnly("io.cucumber:cucumber-plugin:$cucumberVersion")
implementation("io.cucumber:gherkin:$cucumberGherkinVersion")
testImplementation("io.cucumber:gherkin:$cucumberGherkinVersion")
compileOnly("io.cucumber:gherkin:$cucumberGherkinVersion")
testImplementation("commons-io:commons-io")
testImplementation("io.cucumber:cucumber-core:$cucumberVersion")
testImplementation("io.cucumber:cucumber-java:$cucumberVersion")
testImplementation("commons-io:commons-io")
testImplementation("io.cucumber:gherkin:$cucumberGherkinVersion")
testImplementation("io.github.glytching:junit-extensions")
testImplementation("org.assertj:assertj-core")
testImplementation("org.junit.jupiter:junit-jupiter-api")
Expand Down
2 changes: 1 addition & 1 deletion allure-cucumber6-jvm/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ val cucumberGherkinVersion = "18.0.0"
dependencies {
api(project(":allure-java-commons"))
compileOnly("io.cucumber:cucumber-plugin:$cucumberVersion")
implementation("io.cucumber:gherkin:$cucumberGherkinVersion")
compileOnly("io.cucumber:gherkin:$cucumberGherkinVersion")
testImplementation("commons-io:commons-io")
testImplementation("io.cucumber:cucumber-core:$cucumberVersion")
testImplementation("io.cucumber:cucumber-java:$cucumberVersion")
Expand Down
2 changes: 1 addition & 1 deletion allure-cucumber7-jvm/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ val cucumberGherkinVersion = "26.2.0"
dependencies {
api(project(":allure-java-commons"))
compileOnly("io.cucumber:cucumber-plugin:$cucumberVersion")
implementation("io.cucumber:gherkin:$cucumberGherkinVersion")
compileOnly("io.cucumber:gherkin:$cucumberGherkinVersion")
testImplementation("commons-io:commons-io")
testImplementation("io.cucumber:cucumber-core:$cucumberVersion")
testImplementation("io.cucumber:cucumber-java:$cucumberVersion")
Expand Down
15 changes: 8 additions & 7 deletions allure-grpc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,17 @@ val protobufVersion = "4.27.2"
dependencies {
agent("org.aspectj:aspectjweaver")
api(project(":allure-attachments"))
implementation("io.grpc:grpc-core:$grpcVersion")
implementation("com.google.protobuf:protobuf-java-util:$protobufVersion")

testImplementation("io.grpc:grpc-stub:$grpcVersion")
testImplementation("io.grpc:grpc-protobuf:$grpcVersion")
testImplementation("io.grpc:grpc-netty-shaded:$grpcVersion")
compileOnly("com.google.protobuf:protobuf-java-util:$protobufVersion")
compileOnly("io.grpc:grpc-core:$grpcVersion")
testImplementation("com.google.protobuf:protobuf-java-util:$protobufVersion")
testImplementation("com.google.protobuf:protobuf-java:$protobufVersion")
testImplementation("org.grpcmock:grpcmock-junit5")
testImplementation("io.grpc:grpc-core:$grpcVersion")
testImplementation("io.grpc:grpc-netty-shaded:$grpcVersion")
testImplementation("io.grpc:grpc-protobuf:$grpcVersion")
testImplementation("io.grpc:grpc-stub:$grpcVersion")
testImplementation("javax.annotation:javax.annotation-api")
testImplementation("org.assertj:assertj-core")
testImplementation("org.grpcmock:grpcmock-junit5")
testImplementation("org.junit.jupiter:junit-jupiter-api")
testImplementation("org.slf4j:slf4j-simple")
testImplementation(project(":allure-java-commons-test"))
Expand Down
5 changes: 3 additions & 2 deletions allure-hamcrest/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ description = "Allure Hamcrest Assertions Integration"
dependencies {
api(project(":allure-java-commons"))
compileOnly("org.aspectj:aspectjrt")
implementation("org.hamcrest:hamcrest")
compileOnly("org.hamcrest:hamcrest")
testAnnotationProcessor(project(":allure-descriptions-javadoc"))
testImplementation("org.assertj:assertj-core")
testImplementation("org.hamcrest:hamcrest")
testImplementation("org.junit.jupiter:junit-jupiter-api")
testImplementation("org.junit.jupiter:junit-jupiter-params")
testImplementation("org.assertj:assertj-core")
testImplementation("org.slf4j:slf4j-simple")
testImplementation(project(":allure-java-commons-test"))
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
Expand Down
5 changes: 4 additions & 1 deletion allure-httpclient/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
description = "Allure Apache HttpClient Integration"

val httpClient4Version = "4.5.14";

dependencies {
api(project(":allure-attachments"))
implementation("org.apache.httpcomponents:httpclient")
compileOnly("org.apache.httpcomponents:httpclient:$httpClient4Version")
testImplementation("com.github.tomakehurst:wiremock")
testImplementation("io.github.glytching:junit-extensions")
testImplementation("org.apache.httpcomponents:httpclient:$httpClient4Version")
testImplementation("org.assertj:assertj-core")
testImplementation("org.junit.jupiter:junit-jupiter-api")
testImplementation("org.mockito:mockito-core")
Expand Down
7 changes: 5 additions & 2 deletions allure-httpclient5/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
description = "Allure Apache HttpClient5 Integration"

val httpClient5Version = "5.3.1";

dependencies {
api(project(":allure-attachments"))
implementation("org.apache.httpcomponents.client5:httpclient5")
compileOnly("org.apache.httpcomponents.client5:httpclient5:$httpClient5Version")
testImplementation("com.github.tomakehurst:wiremock")
testImplementation("io.github.glytching:junit-extensions")
testImplementation("org.apache.httpcomponents.client5:httpclient5:$httpClient5Version")
testImplementation("org.assertj:assertj-core")
testImplementation("org.junit.jupiter:junit-jupiter-api")
testImplementation("org.mockito:mockito-core")
Expand All @@ -24,4 +27,4 @@ tasks.jar {

tasks.test {
useJUnitPlatform()
}
}
35 changes: 0 additions & 35 deletions allure-java-migration/build.gradle.kts
View file
Open in desktop

This file was deleted.

131 changes: 0 additions & 131 deletions allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1Annotations.java
View file
Open in desktop

This file was deleted.

Loading