Modernize

Author: wilkinsona

Diff for: build.gradle

@@ -1,8 +1,8 @@
 plugins {
 	id "checkstyle"
 	id "java"
-	id "io.spring.javaformat" version "0.0.35"
-	id "org.springframework.boot" version "3.0.1"
+	id "io.spring.javaformat" version "0.0.43"
+	id "org.springframework.boot" version "3.4.2"
 }
 
 group = "io.spring.issuebot"
@@ -15,21 +15,21 @@ dependencies {
 	annotationProcessor(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
 	annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
 
-	checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:0.0.35")
+	checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:0.0.43")
 
 	implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
 	implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
 	implementation("org.apache.httpcomponents.client5:httpclient5")
 	implementation("org.springframework.boot:spring-boot-starter-web")
 
-	runtimeOnly(platform("com.azure.spring:spring-cloud-azure-dependencies:4.5.0"))
+	runtimeOnly(platform("com.azure.spring:spring-cloud-azure-dependencies:5.20.0"))
 	runtimeOnly("com.azure.spring:spring-cloud-azure-starter-keyvault-secrets")
 
 	testImplementation("org.springframework.boot:spring-boot-starter-test")
 }
 
 checkstyle {
-	toolVersion = "10.6.0"
+	toolVersion = "10.21.2"
 }
 
 java {

Diff for: gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

Diff for: gradle/wrapper/gradle-wrapper.properties

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

Diff for: gradlew

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

Diff for: gradlew.bat

@@ -2,34 +2,13 @@ pluginManagement {
 	repositories {
 		mavenCentral()
 		gradlePluginPortal()
-		maven {
-			url "https://repo.spring.io/release"
-			content {
-				includeGroup("io.spring.ge.conventions")
-			}
-		}
 	}
 }
 
 plugins {
-	id "com.gradle.enterprise" version "3.12.1"
-	id "io.spring.ge.conventions" version "0.0.12"
+	id "io.spring.develocity.conventions" version "0.0.22"
 }
 
 rootProject.name="issue-bot"
 
 enableFeaturePreview("STABLE_CONFIGURATION_CACHE")
-
-settings.gradle.projectsLoaded {
-	gradleEnterprise {
-		buildScan {
-			def buildDir = settings.gradle.rootProject.getBuildDir()
-			buildDir.mkdirs()
-			new File(buildDir, "build-scan-uri.txt").text = "build scan not generated"
-			buildScanPublished { scan ->
-				buildDir.mkdirs()
-				new File(buildDir, "build-scan-uri.txt").text = "<${scan.buildScanUri}|build scan>\n"
-			}
-		}
-	}
-}

Diff for: settings.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,11 +56,11 @@ final class FeedbackIssueListener implements IssueListener {
 		this.gitHub = gitHub;
 		this.labelName = labelName;
 		this.repositoryCollaborators = repositories.stream()
-				.collect(Collectors.toMap(Function.identity(), (repository) -> {
-					List<String> collaborators = new ArrayList<>(repository.getCollaborators());
-					collaborators.add(username);
-					return collaborators;
-				}));
+			.collect(Collectors.toMap(Function.identity(), (repository) -> {
+				List<String> collaborators = new ArrayList<>(repository.getCollaborators());
+				collaborators.add(username);
+				return collaborators;
+			}));
 		this.feedbackListener = feedbackListener;
 	}
 

Diff for: src/main/java/io/spring/issuebot/feedback/FeedbackIssueListener.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2023 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
+import java.util.Base64;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
@@ -50,7 +51,6 @@
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
-import org.springframework.util.Base64Utils;
 import org.springframework.util.StreamUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.client.DefaultResponseErrorHandler;
@@ -106,10 +106,10 @@ public void handleError(ClientHttpResponse response) throws IOException {
 			}
 		});
 		HttpClient httpClient = HttpClientBuilder.create()
-				.setConnectionManager(PoolingHttpClientConnectionManagerBuilder.create()
-						.setDefaultSocketConfig(SocketConfig.custom().setSoTimeout(Timeout.ofSeconds(30)).build())
-						.build())
-				.build();
+			.setConnectionManager(PoolingHttpClientConnectionManagerBuilder.create()
+				.setDefaultSocketConfig(SocketConfig.custom().setSoTimeout(Timeout.ofSeconds(30)).build())
+				.build())
+			.build();
 		BufferingClientHttpRequestFactory bufferingClient = new BufferingClientHttpRequestFactory(
 				new HttpComponentsClientHttpRequestFactory(httpClient));
 		rest.setRequestFactory(bufferingClient);
@@ -151,8 +151,8 @@ private String getNextUrl(ResponseEntity<?> response) {
 	public Issue addLabel(Issue issue, String labelName) {
 		URI uri = URI.create(issue.getLabelsUrl().replace("{/name}", ""));
 		log.info("Adding label {} to {}", labelName, uri);
-		ResponseEntity<Label[]> response = this.rest.exchange(
-				new RequestEntity<>(Collections.singletonList(labelName), HttpMethod.POST, uri), Label[].class);
+		ResponseEntity<Label[]> response = this.rest
+			.exchange(new RequestEntity<>(Collections.singletonList(labelName), HttpMethod.POST, uri), Label[].class);
 		if (response.getStatusCode() != HttpStatus.OK) {
 			log.warn("Failed to add label to issue. Response status: " + response.getStatusCode());
 		}
@@ -193,7 +193,7 @@ public Issue close(Issue issue, ClosureReason closureReason) {
 			body.put("state_reason", closureReason.getStateReason());
 		}
 		ResponseEntity<Issue> response = this.rest
-				.exchange(new RequestEntity<>(body, HttpMethod.PATCH, URI.create(issue.getUrl())), Issue.class);
+			.exchange(new RequestEntity<>(body, HttpMethod.PATCH, URI.create(issue.getUrl())), Issue.class);
 		if (response.getStatusCode() != HttpStatus.OK) {
 			log.warn("Failed to close issue. Response status: " + response.getStatusCode());
 		}
@@ -248,7 +248,7 @@ private static class BasicAuthorizationInterceptor implements ClientHttpRequestI
 		@Override
 		public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution)
 				throws IOException {
-			String token = Base64Utils.encodeToString((this.username + ":" + this.password).getBytes(UTF_8));
+			String token = Base64.getEncoder().encodeToString((this.username + ":" + this.password).getBytes(UTF_8));
 			request.getHeaders().add("Authorization", "Basic " + token);
 			return execution.execute(request, body);
 		}

Diff for: src/main/java/io/spring/issuebot/github/GitHubTemplate.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@ final class OpenedByCollaboratorTriageFilter implements TriageFilter {
 
 	OpenedByCollaboratorTriageFilter(List<Repository> repositories) {
 		this.repositoryCollaborators = repositories.stream()
-				.collect(Collectors.toMap(Function.identity(), Repository::getCollaborators));
+			.collect(Collectors.toMap(Function.identity(), Repository::getCollaborators));
 	}
 
 	@Override