Skip to content

Commit 1761bda

Browse files
123HaynesRobWin
authored andcommitted
Add the Automatic-Module-Name for each project. (ReactiveX#426)
Until proper support for modules is introduced, this commit adds the Automatic-Module-Name to every produces .jar file.
1 parent 033f5c9 commit 1761bda

File tree

24 files changed

+50
-16
lines changed

24 files changed

+50
-16
lines changed

build.gradle

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,17 @@ subprojects {
106106
property "sonar.jacoco.reportPaths", allTestCoverageFile
107107
}
108108
}
109+
afterEvaluate {
110+
// exclude subprojects that don't produce a jar file.
111+
if(!project.name.equals('resilience4j-bom') && !project.name.equals('resilience4j-documentation') && !project.name.equals('resilience4j-test')) {
112+
jar {
113+
inputs.property('moduleName', moduleName)
114+
manifest.attributes(
115+
'Automatic-Module-Name': moduleName
116+
)
117+
}
118+
}
119+
}
109120
}
110121

111122
tasks.check.dependsOn tasks.jacocoTestReport

resilience4j-all/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ dependencies {
1010
compile project(':resilience4j-cache')
1111
compile project(':resilience4j-timelimiter')
1212
testCompile project(':resilience4j-test')
13-
}
13+
}
14+
ext.moduleName='io.github.resilience4j.all'

resilience4j-annotations/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
dependencies {
22
compileOnly project(':resilience4j-circuitbreaker')
33
compileOnly project(':resilience4j-ratelimiter')
4-
}
4+
}
5+
ext.moduleName='io.github.resilience4j.annotations'

resilience4j-bulkhead/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ dependencies {
44
testCompile project(':resilience4j-rxjava2')
55
jmh project(':resilience4j-rxjava2')
66
testCompile ( libraries.rxjava2)
7-
}
7+
}
8+
ext.moduleName='io.github.resilience4j.bulkhead'

resilience4j-cache/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ dependencies {
33
compile ( libraries.jcache)
44
testCompile project(':resilience4j-rxjava2')
55
testCompile ( libraries.rxjava2)
6-
}
6+
}
7+
ext.moduleName='io.github.resilience4j.cache'

resilience4j-circuitbreaker/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ dependencies {
33
testCompile project(':resilience4j-test')
44
jmh project(':resilience4j-rxjava2')
55
testCompile ( libraries.rxjava2 )
6-
}
6+
}
7+
ext.moduleName='io.github.resilience4j.circuitbreaker'
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ext.moduleName='io.github.resilience4j.circularbuffer'

resilience4j-consumer/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ dependencies {
22
compile project(':resilience4j-core')
33
compile project(':resilience4j-circularbuffer')
44
testCompile project(':resilience4j-circuitbreaker')
5-
}
5+
}
6+
ext.moduleName='io.github.resilience4j.consumer'

resilience4j-core/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ext.moduleName='io.github.resilience4j.core'

resilience4j-feign/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ dependencies {
44
compile project(':resilience4j-ratelimiter')
55
testCompile ( libraries.feign_wiremock )
66
testCompile ( libraries.feign )
7-
}
7+
}
8+
ext.moduleName='io.github.resilience4j.feign'

resilience4j-metrics/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ dependencies {
1313
testCompile project(':resilience4j-circuitbreaker')
1414
testCompile (libraries.metrics)
1515
}
16+
ext.moduleName='io.github.resilience4j.metrics'

resilience4j-micrometer/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ dependencies {
1212
testCompile project(':resilience4j-test')
1313
testCompile project(':resilience4j-circuitbreaker')
1414
testCompile (libraries.micrometer)
15-
}
15+
}
16+
ext.moduleName='io.github.resilience4j.micrometer'

resilience4j-prometheus/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ dependencies {
88
testCompile project(':resilience4j-bulkhead')
99
testCompile (libraries.prometheus_simpleclient)
1010
}
11+
ext.moduleName='io.github.resilience4j.prometheus'

resilience4j-ratelimiter/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
dependencies {
22
compile project(':resilience4j-core')
3-
}
3+
}
4+
ext.moduleName='io.github.resilience4j.ratelimiter'

resilience4j-ratpack/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ dependencies {
1919
testCompile project(':resilience4j-metrics')
2020
testCompile ( libraries.ratpack )
2121
}
22+
ext.moduleName='io.github.resilience4j.ratpack'

resilience4j-reactor/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ dependencies {
1313
testCompile (libraries.reactor_test)
1414
testCompile (libraries.assertj)
1515
testCompile (libraries.reactive_streams_tck)
16-
}
16+
}
17+
ext.moduleName='io.github.resilience4j.reactor'

resilience4j-retrofit/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ dependencies {
55
testCompile ( libraries.retrofit_test )
66
testCompile ( libraries.retrofit_wiremock )
77
testCompile ( libraries.retrofit )
8-
}
8+
}
9+
ext.moduleName='io.github.resilience4j.retrofit'

resilience4j-retry/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ dependencies {
33
testCompile project(':resilience4j-test')
44
testCompile project(':resilience4j-rxjava2')
55
testCompile ( libraries.rxjava2)
6-
}
6+
}
7+
ext.moduleName='io.github.resilience4j.retry'

resilience4j-rxjava2/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ dependencies {
1010
testCompile project(':resilience4j-bulkhead')
1111
testCompile project(':resilience4j-retry')
1212
testCompile ( libraries.rxjava2)
13-
}
13+
}
14+
ext.moduleName='io.github.resilience4j.rxjava2'

resilience4j-spring-boot/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,4 @@ dependencies {
2929
}
3030

3131
compileJava.dependsOn(processResources)
32+
ext.moduleName='io.github.resilience4j.springboot'

resilience4j-spring-boot2/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,5 @@ dependencies {
2525
testCompile(libraries.spring_boot2_actuator)
2626
}
2727

28-
compileJava.dependsOn(processResources)
28+
compileJava.dependsOn(processResources)
29+
ext.moduleName='io.github.resilience4j.springboot2'

resilience4j-spring/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ dependencies {
1717
testCompile project(':resilience4j-prometheus')
1818
testCompile project(':resilience4j-metrics')
1919
}
20+
ext.moduleName='io.github.resilience4j.spring'

resilience4j-timelimiter/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
dependencies {
22

3-
}
3+
}
4+
ext.moduleName='io.github.resilience4j.timelimiter'

resilience4j-vertx/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ dependencies {
33
compile project(':resilience4j-circuitbreaker')
44
testCompile ( libraries.vertx_unit)
55
testCompile ( libraries.vertx)
6-
}
6+
}
7+
ext.moduleName='io.github.resilience4j.vertx'

0 commit comments

Comments
 (0)