Browse Source

Merge branch '3.2.x'

Closes gh-39765
pull/39767/head
Andy Wilkinson 2 years ago
parent
commit
bfc9ef8bc5
  1. 2
      spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/dsl/SpringBootExtension.java
  2. 2
      spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/ApplicationPluginAction.java
  3. 2
      src/checkstyle/checkstyle.xml

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

@ -27,7 +27,7 @@ import org.gradle.api.provider.Property; @@ -27,7 +27,7 @@ import org.gradle.api.provider.Property;
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;

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

@ -35,8 +35,8 @@ import org.gradle.api.plugins.ApplicationPlugin; @@ -35,8 +35,8 @@ import org.gradle.api.plugins.ApplicationPlugin;
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;

2
src/checkstyle/checkstyle.xml

@ -25,7 +25,7 @@ @@ -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">

Loading…
Cancel
Save