Skip to content

S
spring-boot
Commit 1e100677 authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Reduce scope of META-INF customizations to main, source, and javadoc jars 

Closes gh-23955
parent 49ea023a
Show whitespace changes
Inline Side-by-side
Showing with 20 additions and 13 deletions
buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java
View file @ 1e100677
...@@ -18,6 +18,7 @@ package org.springframework.boot.build; ...@@ -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;
...@@ -106,7 +107,13 @@ class JavaConventions { ...@@ -106,7 +107,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<>();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment