Skip to content

Commit 367fe31

Browse files
RobWinRobWin
authored
Change dependencies to compile only (ReactiveX#408)
* Changed all external dependencies to compileOnly so that Resilience4j does not introduce too many transitive dependencies.
1 parent bb13613 commit 367fe31

File tree

20 files changed

+55
-21
lines changed

20 files changed

+55
-21
lines changed

‎libraries.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ ext {
5757
// Spring Boot addon
5858
spring_4_core: "org.springframework:spring-core:${spring4Version}",
5959
spring_4_context: "org.springframework:spring-context:${spring4Version}",
60-
spring_reactor: "io.projectreactor:reactor-core:${reactorVersion}",
6160
spring_boot_aop: "org.springframework.boot:spring-boot-starter-aop:${springBootVersion}",
6261
spring_boot_actuator: "org.springframework.boot:spring-boot-starter-actuator:${springBootVersion}",
6362
spring_boot_web: "org.springframework.boot:spring-boot-starter-web:${springBootVersion}",

‎resilience4j-bulkhead/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@ dependencies {
66
testCompile project(':resilience4j-rxjava2')
77
jmh project(':resilience4j-rxjava2')
88
jcstress project(':resilience4j-rxjava2')
9+
testCompile ( libraries.rxjava2)
10+
jcstress ( libraries.rxjava2 )
911
}

‎resilience4j-cache/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ dependencies {
22
compile project(':resilience4j-core')
33
compile ( libraries.jcache)
44
testCompile project(':resilience4j-rxjava2')
5+
testCompile ( libraries.rxjava2)
56
}

‎resilience4j-circuitbreaker/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@ dependencies {
55
testCompile project(':resilience4j-test')
66
jmh project(':resilience4j-rxjava2')
77
jcstress project(':resilience4j-rxjava2')
8+
testCompile ( libraries.rxjava2 )
9+
jcstress ( libraries.rxjava2 )
810
}

‎resilience4j-feign/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
dependencies {
2-
compile ( libraries.feign )
2+
compileOnly ( libraries.feign )
33
compile project(':resilience4j-circuitbreaker')
44
compile project(':resilience4j-ratelimiter')
55
testCompile ( libraries.feign_wiremock )
6+
testCompile ( libraries.feign )
67
}

‎resilience4j-metrics/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
compile (libraries.metrics)
2+
compileOnly (libraries.metrics)
33
compileOnly project(':resilience4j-bulkhead')
44
compileOnly project(':resilience4j-circuitbreaker')
55
compileOnly project(':resilience4j-retry')
@@ -11,4 +11,5 @@ dependencies {
1111
testCompile project(':resilience4j-retry')
1212
testCompile project(':resilience4j-test')
1313
testCompile project(':resilience4j-circuitbreaker')
14+
testCompile (libraries.metrics)
1415
}

‎resilience4j-micrometer/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
compile (libraries.micrometer)
2+
compileOnly (libraries.micrometer)
33
compileOnly project(':resilience4j-bulkhead')
44
compileOnly project(':resilience4j-circuitbreaker')
55
compileOnly project(':resilience4j-retry')
@@ -11,4 +11,5 @@ dependencies {
1111
testCompile project(':resilience4j-retry')
1212
testCompile project(':resilience4j-test')
1313
testCompile project(':resilience4j-circuitbreaker')
14+
testCompile (libraries.micrometer)
1415
}

‎resilience4j-prometheus/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ dependencies {
66
testCompile project(':resilience4j-circuitbreaker')
77
testCompile project(':resilience4j-ratelimiter')
88
testCompile project(':resilience4j-bulkhead')
9+
testCompile (libraries.prometheus_simpleclient)
910
}

‎resilience4j-ratpack/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
apply plugin: 'groovy'
22

33
dependencies {
4-
compile ( libraries.ratpack )
4+
compileOnly ( libraries.ratpack )
55
compile project(':resilience4j-bulkhead')
66
compile project(':resilience4j-circuitbreaker')
77
compile project(':resilience4j-ratelimiter')
88
compile project(':resilience4j-retry')
99
compile project(':resilience4j-consumer')
1010
compile project(':resilience4j-reactor')
11+
compile ( libraries.reactor )
1112
compileOnly ( libraries.ratpack_metrics )
1213
compileOnly project(':resilience4j-prometheus')
1314
compileOnly project(':resilience4j-metrics')
@@ -16,4 +17,5 @@ dependencies {
1617
testCompile ( libraries.ratpack_metrics )
1718
testCompile project(':resilience4j-prometheus')
1819
testCompile project(':resilience4j-metrics')
20+
testCompile ( libraries.ratpack )
1921
}

‎resilience4j-reactor/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ dependencies {
33
compileOnly project(':resilience4j-ratelimiter')
44
compileOnly project(':resilience4j-bulkhead')
55
compileOnly project(':resilience4j-retry')
6-
compile (libraries.reactor)
6+
compileOnly (libraries.reactor)
77
testCompile project(':resilience4j-test')
88
testCompile project(':resilience4j-circuitbreaker')
99
testCompile project(':resilience4j-ratelimiter')
1010
testCompile project(':resilience4j-bulkhead')
1111
testCompile project(':resilience4j-retry')
12+
testCompile (libraries.reactor)
1213
testCompile (libraries.reactor_test)
1314
testCompile (libraries.assertj)
1415
testCompile (libraries.reactive_streams_tck)

‎resilience4j-retrofit/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
dependencies {
2-
compile ( libraries.retrofit )
2+
compileOnly ( libraries.retrofit )
33
compile project(':resilience4j-circuitbreaker')
44
compile project(':resilience4j-ratelimiter')
55
testCompile ( libraries.retrofit_test )
66
testCompile ( libraries.retrofit_wiremock )
7+
testCompile ( libraries.retrofit )
78
}

‎resilience4j-retry/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ dependencies {
22
compile project(':resilience4j-core')
33
testCompile project(':resilience4j-test')
44
testCompile project(':resilience4j-rxjava2')
5+
testCompile ( libraries.rxjava2)
56
}

‎resilience4j-rxjava2/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ dependencies {
33
compileOnly project(':resilience4j-ratelimiter')
44
compileOnly project(':resilience4j-bulkhead')
55
compileOnly project(':resilience4j-retry')
6-
compile ( libraries.rxjava2)
6+
compileOnly ( libraries.rxjava2)
77
testCompile project(':resilience4j-test')
88
testCompile project(':resilience4j-circuitbreaker')
99
testCompile project(':resilience4j-ratelimiter')
1010
testCompile project(':resilience4j-bulkhead')
1111
testCompile project(':resilience4j-retry')
12+
testCompile ( libraries.rxjava2)
1213
}

‎resilience4j-spring-boot/build.gradle

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,28 @@
11
dependencies {
2-
compile(libraries.spring_boot_aop)
3-
compile(libraries.spring_boot_actuator)
4-
compile(libraries.spring_boot_web)
5-
compile(libraries.spring_reactor)
6-
compile(libraries.hibernate_validator)
2+
compileOnly(libraries.spring_boot_aop)
3+
compileOnly(libraries.spring_boot_actuator)
4+
compileOnly(libraries.spring_boot_web)
5+
compileOnly(libraries.reactor)
6+
compileOnly(libraries.metrics)
7+
compileOnly(libraries.hibernate_validator)
78
compileOnly(libraries.spring_boot_config_processor)
89
compileOnly(libraries.spring_boot_autoconfigure_processor)
10+
911
compile project(':resilience4j-annotations')
1012
compile project(':resilience4j-spring')
1113
compile project(':resilience4j-circuitbreaker')
1214
compile project(':resilience4j-ratelimiter')
1315
compile project(':resilience4j-consumer')
1416
compileOnly project(':resilience4j-prometheus')
1517
compileOnly project(':resilience4j-metrics')
18+
1619
testCompile(libraries.spring_boot_test)
20+
testCompile(libraries.spring_boot_aop)
21+
testCompile(libraries.spring_boot_actuator)
22+
testCompile(libraries.spring_boot_web)
23+
testCompile(libraries.reactor)
24+
testCompile(libraries.metrics)
25+
testCompile(libraries.hibernate_validator)
1726
testCompile project(':resilience4j-prometheus')
1827
testCompile project(':resilience4j-metrics')
1928
testCompile(libraries.prometheus_spring_boot)

‎resilience4j-spring-boot/src/main/java/io/github/resilience4j/bulkhead/autoconfigure/BulkheadPrometheusAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
*/
3131
@Configuration
3232
@AutoConfigureAfter(value = BulkheadAutoConfiguration.class)
33-
@ConditionalOnClass(BulkheadExports.class)
33+
@ConditionalOnClass(BulkheadMetricsCollector.class)
3434
public class BulkheadPrometheusAutoConfiguration {
3535

3636
@Bean

‎resilience4j-spring-boot/src/main/java/io/github/resilience4j/circuitbreaker/autoconfigure/CircuitBreakerPrometheusAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
*/
3131
@Configuration
3232
@AutoConfigureAfter(value = CircuitBreakerAutoConfiguration.class)
33-
@ConditionalOnClass(CircuitBreakerExports.class)
33+
@ConditionalOnClass(CircuitBreakerMetricsCollector.class)
3434
public class CircuitBreakerPrometheusAutoConfiguration {
3535

3636
@Bean

‎resilience4j-spring-boot/src/main/java/io/github/resilience4j/ratelimiter/autoconfigure/RateLimiterPrometheusAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
*/
3131
@Configuration
3232
@AutoConfigureAfter(value = RateLimiterAutoConfiguration.class)
33-
@ConditionalOnClass(RateLimiterExports.class)
33+
@ConditionalOnClass(RateLimiterMetricsCollector.class)
3434
public class RateLimiterPrometheusAutoConfiguration {
3535

3636
@ConditionalOnProperty(value = "resilience4j.ratelimiter.metrics.use_legacy_collector", havingValue = "true")

‎resilience4j-spring-boot2/build.gradle

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,28 @@
11
dependencies {
2-
compile(libraries.spring_boot2_aop)
3-
compile(libraries.spring_boot2_actuator)
4-
compile(libraries.hibernate_validator)
2+
compileOnly(libraries.spring_boot2_aop)
3+
compileOnly(libraries.spring_boot2_actuator)
4+
compileOnly(libraries.hibernate_validator)
55
compileOnly(libraries.spring_boot2_config_processor)
66
compileOnly(libraries.spring_boot2_autoconfigure_processor)
7+
78
compile project(':resilience4j-annotations')
89
compile project(':resilience4j-spring')
910
compile project(':resilience4j-micrometer')
1011
compile project(':resilience4j-circuitbreaker')
1112
compile project(':resilience4j-ratelimiter')
1213
compile project(':resilience4j-consumer')
14+
1315
testCompile(libraries.spring_boot2_test)
16+
testCompile(libraries.spring_boot2_aop)
17+
testCompile(libraries.spring_boot2_actuator)
1418
testCompile(libraries.micrometer_prometheus)
1519
testCompile(libraries.spring_boot2_web)
1620
testCompile project(':resilience4j-reactor')
1721
testCompile project(':resilience4j-rxjava2')
22+
testCompile(libraries.rxjava2)
23+
testCompile(libraries.reactor)
24+
testCompile(libraries.metrics)
25+
testCompile(libraries.spring_boot2_actuator)
1826
}
1927

2028
compileJava.dependsOn(processResources)

‎resilience4j-spring/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
dependencies {
2-
compile(libraries.aspectj)
2+
compileOnly(libraries.aspectj)
33
compileOnly(libraries.hibernate_validator)
44
compileOnly(libraries.spring_4_core, libraries.spring_4_context)
55
compile project(':resilience4j-annotations')
66
compile project(':resilience4j-consumer')
77
compile project(':resilience4j-circuitbreaker')
88
compileOnly project(':resilience4j-reactor')
99
compileOnly project(':resilience4j-rxjava2')
10+
compileOnly (libraries.rxjava2)
11+
compileOnly (libraries.reactor)
1012
compile project(':resilience4j-ratelimiter')
1113
compile project(':resilience4j-retry')
1214
compile project(':resilience4j-bulkhead')

‎resilience4j-vertx/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
dependencies {
2-
compile ( libraries.vertx)
2+
compileOnly ( libraries.vertx)
33
compile project(':resilience4j-circuitbreaker')
44
testCompile ( libraries.vertx_unit)
5+
testCompile ( libraries.vertx)
56
}

0 commit comments

Comments
 (0)