Merge branch '3.3.x' into 3.4.x

Author: wilkinsona

buildSrc/src/main/java/org/springframework/boot/build/antora/Contribution.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-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.
@@ -20,7 +20,6 @@
 import java.util.Map;
 
 import org.antora.gradle.AntoraTask;
-import org.apache.commons.lang3.StringUtils;
 import org.gradle.api.Action;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Dependency;
@@ -30,6 +29,7 @@
 import org.gradle.api.tasks.TaskProvider;
 
 import org.springframework.boot.build.AntoraConventions;
+import org.springframework.util.StringUtils;
 
 /**
  * A contribution to Antora.