Skip to content

Commit fa7f62d

Browse files
Merge branch 'dev' into df/#891_gradle8x
2 parents fd12e5f + 2352c79 commit fa7f62d

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ dependencies {
8080
testImplementation "org.testcontainers:couchbase:$testcontainersVersion"
8181

8282
// logging
83-
implementation platform('org.apache.logging.log4j:log4j-bom:2.21.0')
83+
implementation platform('org.apache.logging.log4j:log4j-bom:2.21.1')
8484
implementation 'org.apache.logging.log4j:log4j-api' // log4j
8585
implementation 'org.apache.logging.log4j:log4j-core' // log4j
8686
implementation 'org.apache.logging.log4j:log4j-slf4j-impl' // log4j -> slf4j
@@ -90,7 +90,7 @@ dependencies {
9090
implementation 'com.couchbase.client:java-client:3.4.11'
9191
runtimeOnly 'org.postgresql:postgresql:42.6.0' // postgresql jdbc driver required during runtime
9292

93-
implementation 'commons-io:commons-io:2.14.0' // I/O functionalities
93+
implementation 'commons-io:commons-io:2.15.0' // I/O functionalities
9494
implementation 'org.apache.commons:commons-compress:1.24.0' // I/O functionalities
9595
implementation 'org.apache.commons:commons-lang3:3.13.0'
9696
}

gradle/scripts/spotless.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,16 @@ spotless {
2020
licenseHeader ie3LicHead
2121
// the Groovy Eclipse formatter extends the Java Eclipse formatter,
2222
// so it formats Java files by default (unless `excludeJava` is used).
23-
greclipse().configFile('greclipse.properties')
23+
// FIXME rolled back greclipse version https://github.com/diffplug/spotless/issues/1860
24+
greclipse('4.27').configFile('greclipse.properties')
2425
indentWithSpaces 2
2526
}
2627

2728
groovyGradle {
2829
// same as groovy, but for .gradle (defaults to '*.gradle')
2930
target '*.gradle', 'gradle/scripts/*.gradle'
30-
greclipse()
31+
// FIXME rolled back greclipse version https://github.com/diffplug/spotless/issues/1860
32+
greclipse('4.27')
3133
indentWithSpaces 2
3234
}
3335

0 commit comments

Comments
 (0)