Skip to content

Commit 6a1a6a8

Browse files
Fixed dependency versions
1 parent e0e545d commit 6a1a6a8

File tree

3 files changed

+18
-23
lines changed

3 files changed

+18
-23
lines changed

gradle.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
group=com.redislabs.testcontainers
22
redislabsBuildVersion=0.1.0
33
kordampPluginVersion=0.46.0
4-
bootPluginVersion=2.5.1
5-
dependencyPluginVersion=1.0.11.RELEASE

settings.gradle

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ buildscript {
77
dependencies {
88
classpath "org.kordamp.gradle:java-project-gradle-plugin:$kordampPluginVersion"
99
classpath "com.redislabs.gradle:redislabs-parentbuild:$redislabsBuildVersion"
10-
classpath "org.springframework.boot:spring-boot-gradle-plugin:$bootPluginVersion"
11-
classpath "io.spring.gradle:dependency-management-plugin:$dependencyPluginVersion"
1210
}
1311
}
1412

@@ -29,8 +27,16 @@ projects {
2927
dirs(['subprojects']) {
3028
id 'java-library'
3129
id 'java-library-distribution'
32-
id 'org.springframework.boot'
33-
id 'io.spring.dependency-management'
3430
}
3531
}
3632
}
33+
34+
enforce {
35+
mergeStrategy = 'append'
36+
37+
rule(enforcer.rules.ForceDependencies) { r ->
38+
r.dependencies.addAll "org.slf4j:slf4j-api:1.7.30",
39+
"org.junit.jupiter:junit-jupiter-api:5.7.2"
40+
41+
}
42+
}
Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,13 @@
1-
bootJar {
2-
enabled = false
3-
}
4-
5-
jar {
6-
enabled = true
7-
archiveClassifier = ''
8-
}
9-
101
dependencies {
11-
compileOnly 'org.projectlombok:lombok'
12-
annotationProcessor 'org.projectlombok:lombok'
2+
compileOnly 'org.projectlombok:lombok:1.18.20'
3+
annotationProcessor 'org.projectlombok:lombok:1.18.20'
134
implementation 'com.redislabs.testcontainers:testcontainers:1.15.3'
145
testImplementation 'com.redislabs.testcontainers:junit-jupiter:1.15.3'
15-
testImplementation 'org.junit.jupiter:junit-jupiter-api'
16-
testImplementation 'org.junit.jupiter:junit-jupiter-engine'
17-
testImplementation 'org.junit.jupiter:junit-jupiter-params'
18-
testImplementation 'org.slf4j:slf4j-simple'
6+
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.2'
7+
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.7.2'
8+
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.2'
9+
testImplementation 'org.slf4j:slf4j-simple:1.7.30'
1910
testImplementation 'com.redislabs:mesclun:1.3.4'
20-
testImplementation 'org.projectlombok:lombok'
21-
testAnnotationProcessor 'org.projectlombok:lombok'
11+
testImplementation 'org.projectlombok:lombok:1.18.20'
12+
testAnnotationProcessor 'org.projectlombok:lombok:1.18.20'
2213
}

0 commit comments

Comments
 (0)