spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-09 19:09:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.1.x'

Browse Source 
Closes gh-52054
This commit is contained in:
Stéphane Nicoll
2026-10-07 10:15:24 +02:00
parent 0d3b02e245 3ad807dad5
commit 82fb23132b
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java
+6
View File
@@ -73,6 +73,8 @@ import org.gradle.jvm.toolchain.JavaLanguageVersion;
import org.springframework.boot.build.architecture.ArchitecturePlugin;
import org.springframework.boot.build.classpath.CheckClasspathForProhibitedDependencies;
import org.springframework.boot.build.optional.OptionalDependenciesPlugin;
import org.springframework.boot.build.properties.BuildProperties;
import org.springframework.boot.build.properties.BuildType;
import org.springframework.boot.build.springframework.CheckAotFactories;
import org.springframework.boot.build.springframework.CheckSpringFactories;
import org.springframework.boot.build.testing.TestFailuresPlugin;
@@ -172,12 +174,16 @@ class JavaConventions {
}
private void configureJarManifestConventions(Project project) {
BuildType buildType = BuildProperties.get(project).buildType();
String license = (buildType == BuildType.OPEN_SOURCE) ? "Apache License, Version 2.0"
: "Broadcom Foundation License";
TaskProvider<ExtractResources> extractLegalResources = project.getTasks()
.register("extractLegalResources", ExtractResources.class, (task) -> {
task.getPackageName().set("org.springframework.boot.build.legal");
task.getDestinationDirectory().set(project.getLayout().getBuildDirectory().dir("legal"));
task.getResourceNames().set(Arrays.asList("LICENSE.txt", "NOTICE.txt"));
task.getProperties().put("version", project.getVersion().toString());
task.getProperties().put("license", license);
});
SourceSetContainer sourceSets = project.getExtensions().getByType(SourceSetContainer.class);
Set<String> sourceJarTaskNames = sourceSets.stream()
buildSrc/src/main/resources/org/springframework/boot/build/legal/NOTICE.txt
+1 -1
View File
@@ -1,6 +1,6 @@
Spring Boot ${version}
Copyright (c) 2012-2026 VMware, Inc.
This product is licensed to you under the Apache License, Version 2.0
This product is licensed to you under the ${license}
(the "License"). You may not use this product except in compliance with
the License.