chore: update to spring 4

.github/workflows/publish.yaml

@@ -11,7 +11,7 @@ jobs:
       - name: "git / checkout"
         uses: actions/checkout@v6
       - name: "docker / login"
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -21,8 +21,8 @@ jobs:
         with:
           check-latest: true
           distribution: zulu
-          java-version: 23
+          java-version: 25
       - name: "gradle / setup"
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
       - name: "gradle / build"
         run: ./gradlew jib -Djib.console=plain --stacktrace

build.gradle.kts

@@ -22,7 +22,7 @@ indra {
   apache2License()
 
   javaVersions {
-    target(23)
+    target(25)
   }
 }
 
@@ -70,7 +70,7 @@ jib {
     image = "ghcr.io/papermc/fill"
     tags = setOf(
       "latest",
-      "${indraGit.branchName()}-${indraGit.commit()?.name()?.take(7)}-${Instant.now().epochSecond}"
+      "${indraGit.branchName()}-${indraGit.commit().get().name()?.take(7)}-${Instant.now().epochSecond}"
     )
   }
 }
@@ -103,9 +103,9 @@ dependencies {
 
   developmentOnly("org.springframework.boot:spring-boot-devtools")
 
-  implementation("com.bucket4j:bucket4j_jdk17-caffeine:8.15.0")
-  implementation("com.bucket4j:bucket4j_jdk17-core:8.15.0")
-  implementation("com.discord4j:discord4j-core:3.3.0")
+  implementation("com.bucket4j:bucket4j_jdk17-caffeine:8.17.0")
+  implementation("com.bucket4j:bucket4j_jdk17-core:8.17.0")
+  implementation("com.discord4j:discord4j-core:3.3.2")
   implementation("com.github.ben-manes.caffeine:caffeine:3.2.3")
   implementation("com.google.guava:guava:33.5.0-jre")
   implementation("com.graphql-java:graphql-java-extended-scalars:24.0")
@@ -114,15 +114,15 @@ dependencies {
   implementation("io.jsonwebtoken:jjwt-jackson:0.13.0")
   implementation("io.micrometer:micrometer-registry-prometheus")
   implementation("org.apache.commons:commons-text:1.15.0")
-  implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.14")
+  implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:3.0.2")
   implementation("org.springframework.boot:spring-boot-starter-actuator")
   implementation("org.springframework.boot:spring-boot-starter-data-mongodb")
   implementation("org.springframework.boot:spring-boot-starter-graphql")
   implementation("org.springframework.boot:spring-boot-starter-json")
   implementation("org.springframework.boot:spring-boot-starter-security")
   implementation("org.springframework.boot:spring-boot-starter-validation")
   implementation("org.springframework.boot:spring-boot-starter-web")
-  implementation("software.amazon.awssdk:s3:2.40.15")
+  implementation("software.amazon.awssdk:s3:2.42.28")
 
   testImplementation("org.springframework.boot:spring-boot-starter-test")
   testImplementation("org.springframework.graphql:spring-graphql-test")

gradle/libs.versions.toml

@@ -1,13 +1,13 @@
 [versions]
-indra = "3.2.0"
+indra = "4.0.0"
 
 [plugins]
-gradleGitProperties = { id = "com.gorylenko.gradle-git-properties", version = "2.5.4" }
+gradleGitProperties = { id = "com.gorylenko.gradle-git-properties", version = "2.5.7" }
 indra = { id = "net.kyori.indra", version.ref = "indra" }
 indra-checkstyle = { id = "net.kyori.indra.checkstyle", version.ref = "indra" }
 indra-git = { id = "net.kyori.indra.git", version.ref = "indra" }
-jib = { id = "com.google.cloud.tools.jib", version = "3.5.2" }
+jib = { id = "com.google.cloud.tools.jib", version = "3.5.3" }
 sentry = { id = "io.sentry.jvm.gradle", version = "5.12.2" }
-spotless = { id = "com.diffplug.spotless", version = "7.2.1" }
-spring-boot = { id = "org.springframework.boot", version = "3.5.9" }
+spotless = { id = "com.diffplug.spotless", version = "8.4.0" }
+spring-boot = { id = "org.springframework.boot", version = "4.0.5" }
 spring-deps = { id = "io.spring.dependency-management", version = "1.1.7" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/io/papermc/fill/FillApplication.java

@@ -33,7 +33,7 @@
 @NullMarked
 @SpringBootApplication
 public class FillApplication {
-  public static void main(final String[] args) {
+  static void main(final String[] args) {
     SpringApplication.run(FillApplication.class, args);
   }
 }

src/main/java/io/papermc/fill/controller/Data2Controller.java

@@ -104,15 +104,15 @@ public ResponseEntity<?> getDownload(
       if (object != null) {
         return Responses.ok(new ByteArrayResource(object.content()), headers -> {
           headers.putAll(object.headers());
-          if (!headers.containsKey(HttpHeaders.CACHE_CONTROL)) {
+          if (!headers.containsHeader(HttpHeaders.CACHE_CONTROL)) {
             headers.setCacheControl(Caching.publicShared(CACHE_LENGTH_DOWNLOAD));
           }
           headers.setContentDisposition(
             ContentDisposition.attachment()
               .filename(download.name())
               .build()
           );
-          if (!headers.containsKey(HttpHeaders.ETAG)) {
+          if (!headers.containsHeader(HttpHeaders.ETAG)) {
             headers.setETag(String.format(
               "\"%s\"",
               download.checksums().sha256()

src/main/java/io/papermc/fill/jackson/ObjectIdSerializer.java

@@ -21,9 +21,9 @@
 import java.io.IOException;
 import org.bson.types.ObjectId;
 import org.jspecify.annotations.NullMarked;
-import org.springframework.boot.jackson.JsonComponent;
+import org.springframework.boot.jackson.JacksonComponent;
 
-@JsonComponent
+@JacksonComponent
 @NullMarked
 public class ObjectIdSerializer extends StdSerializer<ObjectId> {
   public ObjectIdSerializer() {

src/main/java/io/papermc/fill/service/StorageServiceImpl.java

@@ -57,12 +57,13 @@ public class StorageServiceImpl implements StorageService {
 
   @Autowired
   public StorageServiceImpl(
-    final ApplicationApiProperties properties,
-    final RestClient.Builder http
+    final ApplicationApiProperties properties
   ) {
     this.properties = properties;
     this.s3 = S3Configuration.createClient(properties.storage().s3());
-    this.http = http.build();
+    this.http = RestClient.builder()
+      .defaultHeader(HttpHeaders.USER_AGENT, "Fill (Internal)")
+      .build();
   }
 
   @Override
@@ -129,7 +130,6 @@ public void putObject(
         try {
           final ResponseEntity<byte[]> response = this.http.get()
             .uri(uri)
-            .header(HttpHeaders.USER_AGENT, "Fill (Internal)")
             .retrieve()
             .toEntity(byte[].class);
           if (response.getStatusCode().is2xxSuccessful()) {

src/main/resources/application.yaml

@@ -6,16 +6,10 @@ management:
     access:
       default: read_only
 
-server:
-  error:
-    whitelabel:
-      enabled: false
-
 spring:
   data:
     mongodb:
       auto-index-creation: true
-      database: fill
   graphql:
     cors:
       allowed-origin-patterns: "*"
@@ -24,11 +18,16 @@ spring:
     schema:
       printer:
         enabled: true
+  mongodb:
+    database: fill
   servlet:
     multipart:
-      max-file-size: 55MB
-      max-request-size: 70MB
+      max-file-size: 75MB
+      max-request-size: 100MB
   web:
+    error:
+      whitelabel:
+        enabled: false
     resources:
       add-mappings: false