Skip to content

Commit 6a0df06

Browse files
committed
upgrade gradle and spotless for JDK25 compat
Fix gradle 10 deprecations too
1 parent 439033c commit 6a0df06

3 files changed

Lines changed: 14 additions & 14 deletions

File tree

nouveau/build.gradle

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id 'application'
3-
id 'com.diffplug.spotless' version '6.25.0'
3+
id 'com.diffplug.spotless' version '8.0.0'
44
id 'jacoco'
55
}
66

@@ -24,19 +24,19 @@ dependencies {
2424
testImplementation 'io.dropwizard:dropwizard-testing'
2525

2626
def luceneVersion = '9.12.1'
27-
implementation group: 'org.apache.lucene', name: 'lucene-core', version: luceneVersion
28-
implementation group: 'org.apache.lucene', name: 'lucene-queryparser', version: luceneVersion
29-
implementation group: 'org.apache.lucene', name: 'lucene-analysis-common', version: luceneVersion
30-
implementation group: 'org.apache.lucene', name: 'lucene-analysis-stempel', version: luceneVersion
31-
implementation group: 'org.apache.lucene', name: 'lucene-analysis-smartcn', version: luceneVersion
32-
implementation group: 'org.apache.lucene', name: 'lucene-analysis-kuromoji', version: luceneVersion
33-
implementation group: 'org.apache.lucene', name: 'lucene-facet', version: luceneVersion
34-
implementation group: 'org.apache.lucene', name: 'lucene-misc', version: luceneVersion
35-
implementation group: 'org.apache.lucene', name: 'lucene-backward-codecs', version: luceneVersion
27+
implementation 'org.apache.lucene:lucene-core:' + luceneVersion
28+
implementation 'org.apache.lucene:lucene-queryparser:' + luceneVersion
29+
implementation 'org.apache.lucene:lucene-analysis-common:' + luceneVersion
30+
implementation 'org.apache.lucene:lucene-analysis-stempel:' + luceneVersion
31+
implementation 'org.apache.lucene:lucene-analysis-smartcn:' + luceneVersion
32+
implementation 'org.apache.lucene:lucene-analysis-kuromoji:' + luceneVersion
33+
implementation 'org.apache.lucene:lucene-facet:' + luceneVersion
34+
implementation 'org.apache.lucene:lucene-misc:' + luceneVersion
35+
implementation 'org.apache.lucene:lucene-backward-codecs:' + luceneVersion
3636

3737
def swaggerVersion = '2.2.8'
38-
implementation group: 'io.swagger.core.v3', name: 'swagger-jaxrs2-jakarta', version: swaggerVersion
39-
implementation group: 'io.swagger.core.v3', name: 'swagger-jaxrs2-servlet-initializer-v2', version: swaggerVersion
38+
implementation 'io.swagger.core.v3:swagger-jaxrs2-jakarta:' + swaggerVersion
39+
implementation 'io.swagger.core.v3:swagger-jaxrs2-servlet-initializer-v2:' + swaggerVersion
4040

4141
testImplementation 'org.assertj:assertj-core'
4242
testImplementation 'org.mockito:mockito-core'

nouveau/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

nouveau/src/main/java/org/apache/couchdb/nouveau/core/IOUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public static void rm(final Path path) throws IOException {
3434

3535
@FunctionalInterface
3636
public interface IORunnable {
37-
public abstract void run() throws IOException;
37+
void run() throws IOException;
3838
}
3939

4040
public static void runAll(final IORunnable... runnables) throws IOException {

0 commit comments

Comments
 (0)