From 189046bd4f740bfe5bb6ed2d206a51e6cd5ba529 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 12 Nov 2020 08:09:45 +0000 Subject: [PATCH] Revert "Reduce scope of META-INF customizations to main, source, and javadoc jars" Closes gh-24131 --- .../boot/build/JavaConventions.java | 33 ++++++++----------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java b/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java index 5079d684d81..5a9fecc81aa 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java @@ -18,7 +18,6 @@ package org.springframework.boot.build; import java.io.File; import java.util.Arrays; import java.util.Collections; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -107,25 +106,19 @@ class JavaConventions { .collect(Collectors.toSet()); Set javadocJarTaskNames = sourceSets.stream().map(SourceSet::getJavadocJarTaskName) .collect(Collectors.toSet()); - Set jarTaskNames = sourceSets.stream().map(SourceSet::getJarTaskName).collect(Collectors.toSet()); - Set jarTasksOfInterest = new HashSet(); - 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.manifest((manifest) -> { - Map attributes = new TreeMap<>(); - attributes.put("Automatic-Module-Name", project.getName().replace("-", ".")); - attributes.put("Build-Jdk-Spec", project.property("sourceCompatibility")); - attributes.put("Built-By", "Spring"); - attributes.put("Implementation-Title", - determineImplementationTitle(project, sourceJarTaskNames, javadocJarTaskNames, jar)); - attributes.put("Implementation-Version", project.getVersion()); - manifest.attributes(attributes); - }); - })); + project.getTasks().withType(Jar.class, (jar) -> project.afterEvaluate((evaluated) -> { + jar.metaInf((metaInf) -> metaInf.from(extractLegalResources)); + jar.manifest((manifest) -> { + Map attributes = new TreeMap<>(); + attributes.put("Automatic-Module-Name", project.getName().replace("-", ".")); + attributes.put("Build-Jdk-Spec", project.property("sourceCompatibility")); + attributes.put("Built-By", "Spring"); + attributes.put("Implementation-Title", + determineImplementationTitle(project, sourceJarTaskNames, javadocJarTaskNames, jar)); + attributes.put("Implementation-Version", project.getVersion()); + manifest.attributes(attributes); + }); + })); } private String determineImplementationTitle(Project project, Set sourceJarTaskNames,