Skip to content

Commit 2b3f523

Browse files
committed
Fixed dependency declaration in starters
1 parent 624d527 commit 2b3f523

File tree

7 files changed

+30
-19
lines changed

7 files changed

+30
-19
lines changed

datasource-decorator-spring-boot-autoconfigure/build.gradle.kts

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1+
plugins {
2+
`java-library`
3+
}
4+
15
dependencies {
2-
compileOnly("org.springframework.boot:spring-boot:${project.extra["springBootVersion"]}")
3-
compileOnly("org.springframework.boot:spring-boot-autoconfigure:${project.extra["springBootVersion"]}")
4-
compileOnly("org.springframework.boot:spring-boot-starter-jdbc:${project.extra["springBootVersion"]}")
6+
implementation("org.springframework.boot:spring-boot:${project.extra["springBootVersion"]}")
7+
implementation("org.springframework.boot:spring-boot-autoconfigure:${project.extra["springBootVersion"]}")
8+
implementation("org.springframework.boot:spring-boot-starter-jdbc:${project.extra["springBootVersion"]}")
59

610
annotationProcessor("org.springframework.boot:spring-boot-configuration-processor:${project.extra["springBootVersion"]}")
711
annotationProcessor("org.projectlombok:lombok:1.18.8")
812
compileOnly("org.projectlombok:lombok:1.18.8")
913

10-
compileOnly("org.springframework.boot:spring-boot-actuator:${project.extra["springBootVersion"]}")
11-
1214
compileOnly("org.apache.commons:commons-dbcp2:2.6.0")
1315
compileOnly("org.apache.tomcat:tomcat-jdbc:9.0.22")
1416
compileOnly("com.zaxxer:HikariCP:3.3.1")
@@ -24,9 +26,6 @@ dependencies {
2426
compileOnly("org.springframework.boot:spring-boot-starter-actuator:${project.extra["springBootVersion"]}")
2527
compileOnly("org.springframework.cloud:spring-cloud-sleuth-core:${project.extra["sleuthVersion"]}")
2628

27-
testImplementation("org.springframework.boot:spring-boot:${project.extra["springBootVersion"]}")
28-
testImplementation("org.springframework.boot:spring-boot-autoconfigure:${project.extra["springBootVersion"]}")
29-
testImplementation("org.springframework.boot:spring-boot-starter-jdbc:${project.extra["springBootVersion"]}")
3029
testImplementation("org.junit.jupiter:junit-jupiter-api:5.5.0")
3130
testImplementation("org.junit.jupiter:junit-jupiter-params:5.5.0")
3231
testImplementation("org.junit.jupiter:junit-jupiter-engine:5.5.0")
Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
plugins {
2+
`java-library`
3+
}
4+
15
dependencies {
2-
implementation(project(":datasource-decorator-spring-boot-autoconfigure"))
3-
implementation("net.ttddyy:datasource-proxy:${project.extra["datasourceProxyVersion"]}")
6+
api(project(":datasource-decorator-spring-boot-autoconfigure"))
7+
api("net.ttddyy:datasource-proxy:${project.extra["datasourceProxyVersion"]}")
48
}
Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1+
plugins {
2+
`java-library`
3+
}
4+
15
dependencies {
2-
implementation(project(":datasource-decorator-spring-boot-autoconfigure"))
3-
implementation("com.vladmihalcea.flexy-pool:flexy-pool-core:${project.extra["flexyPoolVersion"]}")
4-
implementation("com.vladmihalcea.flexy-pool:flexy-hikaricp:${project.extra["flexyPoolVersion"]}") {
6+
api(project(":datasource-decorator-spring-boot-autoconfigure"))
7+
api("com.vladmihalcea.flexy-pool:flexy-pool-core:${project.extra["flexyPoolVersion"]}")
8+
api("com.vladmihalcea.flexy-pool:flexy-hikaricp:${project.extra["flexyPoolVersion"]}") {
59
exclude(group = "com.vladmihalcea.flexy-pool", module = "flexy-dropwizard-metrics")
610
}
7-
implementation("com.vladmihalcea.flexy-pool:flexy-micrometer-metrics:${project.extra["flexyPoolVersion"]}")
11+
api("com.vladmihalcea.flexy-pool:flexy-micrometer-metrics:${project.extra["flexyPoolVersion"]}")
812
}
Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
plugins {
2+
`java-library`
3+
}
4+
15
dependencies {
2-
implementation(project(":datasource-decorator-spring-boot-autoconfigure"))
3-
implementation("p6spy:p6spy:${project.extra["p6SpyVersion"]}")
6+
api(project(":datasource-decorator-spring-boot-autoconfigure"))
7+
api("p6spy:p6spy:${project.extra["p6SpyVersion"]}")
48
}

samples/datasource-proxy-sample/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ repositories {
99
apply(plugin = "io.spring.dependency-management")
1010

1111
dependencies {
12-
implementation("com.github.gavlyukovskiy:datasource-proxy-spring-boot-starter:1.6.0")
12+
implementation("com.github.gavlyukovskiy:datasource-proxy-spring-boot-starter:1.5.8")
1313

1414
implementation("org.springframework.boot:spring-boot")
1515
implementation("org.springframework.boot:spring-boot-starter")

samples/flexy-pool-sample/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ repositories {
99
apply(plugin = "io.spring.dependency-management")
1010

1111
dependencies {
12-
implementation("com.github.gavlyukovskiy:flexy-pool-spring-boot-starter:1.6.0")
12+
implementation("com.github.gavlyukovskiy:flexy-pool-spring-boot-starter:1.5.8")
1313

1414
implementation("org.springframework.boot:spring-boot")
1515
implementation("org.springframework.boot:spring-boot-starter")

samples/p6spy-sample/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ repositories {
99
apply(plugin = "io.spring.dependency-management")
1010

1111
dependencies {
12-
implementation("com.github.gavlyukovskiy:p6spy-spring-boot-starter:1.6.0")
12+
implementation("com.github.gavlyukovskiy:p6spy-spring-boot-starter:1.5.8")
1313

1414
implementation("org.springframework.boot:spring-boot")
1515
implementation("org.springframework.boot:spring-boot-starter")

0 commit comments

Comments
 (0)