Merge branch '3.1.x' into 3.2.x

Closes gh-39764
spring-projects · Feb 27, 2024 · db0fcc5 · db0fcc5
2 parents ed56c3d + 54cdc83
commit db0fcc5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...-gradle-plugin/src/main/java/org/springframework/boot/gradle/dsl/SpringBootExtension.java b/...-gradle-plugin/src/main/java/org/springframework/boot/gradle/dsl/SpringBootExtension.java
@@ -27,7 +27,7 @@
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.api.tasks.TaskContainer;
 import org.gradle.api.tasks.TaskProvider;
-import org.gradle.jvm.tasks.Jar;
+import org.gradle.api.tasks.bundling.Jar;
 
 import org.springframework.boot.gradle.tasks.buildinfo.BuildInfo;
 

diff --git a/...-plugin/src/main/java/org/springframework/boot/gradle/plugin/ApplicationPluginAction.java b/...-plugin/src/main/java/org/springframework/boot/gradle/plugin/ApplicationPluginAction.java
@@ -35,8 +35,8 @@
 import org.gradle.api.plugins.JavaApplication;
 import org.gradle.api.tasks.TaskContainer;
 import org.gradle.api.tasks.TaskProvider;
+import org.gradle.api.tasks.application.CreateStartScripts;
 import org.gradle.jvm.application.scripts.TemplateBasedScriptGenerator;
-import org.gradle.jvm.application.tasks.CreateStartScripts;
 import org.gradle.util.GradleVersion;
 
 import org.springframework.boot.gradle.tasks.run.BootRun;

diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml
@@ -25,7 +25,7 @@
 			<property name="illegalClasses"
 				value="javax.annotation.PostConstruct, jakarta.annotation.PostConstruct"/>
 			<property name="illegalPkgs"
-				value="^io\.opentelemetry\.semconv.*"/>
+				value="^io\.opentelemetry\.semconv.*, ^org\.gradle\.(?!api).*\.tasks.*"/>
 		</module>
 		<module
 			name="com.puppycrawl.tools.checkstyle.checks.imports.ImportControlCheck">