root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge branch '2.3.x' 

Closes gh-24057
This commit is contained in:
Andy Wilkinson 2020-11-05 15:01:49 +00:00
parent d6f10e16f7 1e100677c7
commit 38821c15da
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java
View File

@ -18,6 +18,7 @@ package org.springframework.boot.build;
import java.io.File; import java.io.File;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@ -113,7 +114,13 @@ class JavaConventions {
.collect(Collectors.toSet()); .collect(Collectors.toSet());
Set<String> javadocJarTaskNames = sourceSets.stream().map(SourceSet::getJavadocJarTaskName) Set<String> javadocJarTaskNames = sourceSets.stream().map(SourceSet::getJavadocJarTaskName)
.collect(Collectors.toSet()); .collect(Collectors.toSet());
project.getTasks().withType(Jar.class, (jar) -> project.afterEvaluate((evaluated) -> { Set<String> jarTaskNames = sourceSets.stream().map(SourceSet::getJarTaskName).collect(Collectors.toSet());
Set<String> jarTasksOfInterest = new HashSet<String>();
jarTasksOfInterest.addAll(sourceJarTaskNames);
jarTasksOfInterest.addAll(javadocJarTaskNames);
jarTasksOfInterest.addAll(jarTaskNames);
project.getTasks().matching((task) -> jarTasksOfInterest.contains(task.getName())).withType(Jar.class,
(jar) -> project.afterEvaluate((evaluated) -> {
jar.metaInf((metaInf) -> metaInf.from(extractLegalResources)); jar.metaInf((metaInf) -> metaInf.from(extractLegalResources));
jar.manifest((manifest) -> { jar.manifest((manifest) -> {
Map<String, Object> attributes = new TreeMap<>(); Map<String, Object> attributes = new TreeMap<>();