Skip to content

Commit bfc9ef8

Browse files
committed
Merge branch '3.2.x'
Closes gh-39765
2 parents 04c919b + db0fcc5 commit bfc9ef8

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/dsl/SpringBootExtension.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.gradle.api.tasks.SourceSet;
2828
import org.gradle.api.tasks.TaskContainer;
2929
import org.gradle.api.tasks.TaskProvider;
30-
import org.gradle.jvm.tasks.Jar;
30+
import org.gradle.api.tasks.bundling.Jar;
3131

3232
import org.springframework.boot.gradle.tasks.buildinfo.BuildInfo;
3333

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/ApplicationPluginAction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
import org.gradle.api.plugins.JavaApplication;
3636
import org.gradle.api.tasks.TaskContainer;
3737
import org.gradle.api.tasks.TaskProvider;
38+
import org.gradle.api.tasks.application.CreateStartScripts;
3839
import org.gradle.jvm.application.scripts.TemplateBasedScriptGenerator;
39-
import org.gradle.jvm.application.tasks.CreateStartScripts;
4040
import org.gradle.util.GradleVersion;
4141

4242
import org.springframework.boot.gradle.tasks.run.BootRun;

src/checkstyle/checkstyle.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<property name="illegalClasses"
2626
value="javax.annotation.PostConstruct, jakarta.annotation.PostConstruct"/>
2727
<property name="illegalPkgs"
28-
value="^io\.opentelemetry\.semconv.*"/>
28+
value="^io\.opentelemetry\.semconv.*, ^org\.gradle\.(?!api).*\.tasks.*"/>
2929
</module>
3030
<module
3131
name="com.puppycrawl.tools.checkstyle.checks.imports.ImportControlCheck">

0 commit comments

Comments
 (0)