Skip to content
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.

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

#3057 Fix jetbrains annotations configuration scope #3157

Merged
merged 1 commit into from
Sep 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,8 @@ dependencies {

compile 'junit:junit:4.12'
compile 'org.slf4j:slf4j-api:1.7.30'
compile 'org.jetbrains:annotations:19.0.0'
compileOnly 'org.jetbrains:annotations:20.0.0'
testCompileOnly 'org.jetbrains:annotations:20.0.0'
compile 'org.apache.commons:commons-compress:1.20'
compile ('org.rnorth.duct-tape:duct-tape:1.0.8') {
exclude(group: 'org.jetbrains', module: 'annotations')
Expand Down
1 change: 1 addition & 0 deletions examples/mongodb-container/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ repositories {
dependencies {
testImplementation 'org.testcontainers:testcontainers'
testImplementation 'junit:junit:4.13'
testCompileOnly 'org.jetbrains:annotations:20.0.0'
}
1 change: 1 addition & 0 deletions modules/jdbc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ dependencies {
compile project(':database-commons')
testCompile project(':test-support')

compileOnly 'org.jetbrains:annotations:20.0.0'
testCompile 'commons-dbutils:commons-dbutils:1.7'
testCompile 'org.vibur:vibur-dbcp:25.0'
testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.37'
Expand Down
2 changes: 2 additions & 0 deletions modules/mysql/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,6 @@ dependencies {

testCompile testFixtures(project(':r2dbc'))
testCompile 'dev.miku:r2dbc-mysql:0.8.1.RELEASE'

compileOnly 'org.jetbrains:annotations:20.0.0'
}
1 change: 1 addition & 0 deletions modules/nginx/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ description = "Testcontainers :: Nginx"

dependencies {
compile project(':testcontainers')
compileOnly 'org.jetbrains:annotations:20.0.0'
}
2 changes: 2 additions & 0 deletions modules/postgresql/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,6 @@ dependencies {

testCompile testFixtures(project(':r2dbc'))
testCompile 'io.r2dbc:r2dbc-postgresql:0.8.3.RELEASE'

compileOnly 'org.jetbrains:annotations:20.0.0'
}
1 change: 1 addition & 0 deletions modules/presto/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ dependencies {

testCompile project(':jdbc-test')
testCompile 'io.prestosql:presto-jdbc:331'
compileOnly 'org.jetbrains:annotations:20.0.0'
}
3 changes: 2 additions & 1 deletion modules/rabbitmq/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ description = "TestContainers :: RabbitMQ"

dependencies {
compile project(":testcontainers")
testCompile "com.rabbitmq:amqp-client:5.7.0"
testCompile 'com.rabbitmq:amqp-client:5.7.0'
testCompile 'org.assertj:assertj-core:3.12.2'
compileOnly 'org.jetbrains:annotations:20.0.0'
}
3 changes: 3 additions & 0 deletions modules/selenium/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,7 @@ dependencies {

testCompile 'org.mortbay.jetty:jetty:6.1.26'
testCompile project(':nginx')

compileOnly 'org.jetbrains:annotations:20.0.0'
testCompileOnly 'org.jetbrains:annotations:20.0.0'
}
2 changes: 2 additions & 0 deletions modules/spock/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ dependencies {

testRuntime 'org.postgresql:postgresql:42.2.15'
testRuntime 'mysql:mysql-connector-java:8.0.21'

testCompileOnly 'org.jetbrains:annotations:20.0.0'
}

sourceJar {
Expand Down