Skip to content

Commit de0f123

Browse files
committed
Fix license and notice files in jars
Prior to this commit, the produced jar files contained invalid LICENSE.txt and notice.txt files for the Gradle Develocity plugin instead of the Spring Pulsar relevant files. See #1202 Fixes #1310 Signed-off-by: onobc <[email protected]> (cherry picked from commit b7cd391)
1 parent 1320849 commit de0f123

File tree

6 files changed

+35
-340
lines changed

6 files changed

+35
-340
lines changed

buildSrc/src/main/java/org/springframework/pulsar/gradle/ExtractResources.java

Lines changed: 0 additions & 96 deletions
This file was deleted.

buildSrc/src/main/java/org/springframework/pulsar/gradle/JavaConventionsPlugin.java

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,8 @@
1616

1717
package org.springframework.pulsar.gradle;
1818

19-
import java.util.Arrays;
2019
import java.util.Collections;
21-
import java.util.Map;
2220
import java.util.Set;
23-
import java.util.TreeMap;
24-
import java.util.stream.Collectors;
2521

2622
import org.gradle.api.Plugin;
2723
import org.gradle.api.Project;
@@ -34,8 +30,6 @@
3430
import org.gradle.api.plugins.quality.Checkstyle;
3531
import org.gradle.api.plugins.quality.CheckstyleExtension;
3632
import org.gradle.api.plugins.quality.CheckstylePlugin;
37-
import org.gradle.api.tasks.SourceSet;
38-
import org.gradle.api.tasks.SourceSetContainer;
3933
import org.gradle.api.tasks.bundling.Jar;
4034
import org.gradle.api.tasks.compile.JavaCompile;
4135
import org.gradle.api.tasks.javadoc.Javadoc;
@@ -77,15 +71,6 @@
7771
* <li>Enable {@code unchecked}, {@code deprecation}, {@code rawtypes}, and {@code varags}
7872
* warnings
7973
* </ul>
80-
* <li>{@link Jar} tasks are configured to produce jars with LICENSE.txt and NOTICE.txt
81-
* files and the following manifest entries:
82-
* <ul>
83-
* <li>{@code Automatic-Module-Name}
84-
* <li>{@code Build-Jdk-Spec}
85-
* <li>{@code Built-By}
86-
* <li>{@code Implementation-Title}
87-
* <li>{@code Implementation-Version}
88-
* </ul>
8974
* <li>{@code spring-pulsar-dependencies} is used for dependency management</li>
9075
* </ul>
9176
*
@@ -107,7 +92,6 @@ public void apply(Project project) {
10792
configureSpringJavaFormat(project);
10893
configureJavadocConventions(project);
10994
configureTestConventions(project);
110-
configureJarManifestConventions(project);
11195
configureDependencyManagement(project);
11296
});
11397
}
@@ -162,32 +146,6 @@ private void configureTestConventions(Project project) {
162146
.add(JavaPlugin.TEST_RUNTIME_ONLY_CONFIGURATION_NAME, "org.junit.platform:junit-platform-launcher"));
163147
}
164148

165-
private void configureJarManifestConventions(Project project) {
166-
ExtractResources extractLegalResources = project.getTasks().create("extractLegalResources",
167-
ExtractResources.class);
168-
extractLegalResources.getDestinationDirectory().set(project.getLayout().getBuildDirectory().dir("legal"));
169-
extractLegalResources.setResourcesNames(Arrays.asList("LICENSE.txt", "NOTICE.txt"));
170-
extractLegalResources.property("version", project.getVersion().toString());
171-
SourceSetContainer sourceSets = project.getExtensions().getByType(SourceSetContainer.class);
172-
Set<String> sourceJarTaskNames = sourceSets.stream().map(SourceSet::getSourcesJarTaskName)
173-
.collect(Collectors.toSet());
174-
Set<String> javadocJarTaskNames = sourceSets.stream().map(SourceSet::getJavadocJarTaskName)
175-
.collect(Collectors.toSet());
176-
project.getTasks().withType(Jar.class, (jar) -> project.afterEvaluate((evaluated) -> {
177-
jar.metaInf((metaInf) -> metaInf.from(extractLegalResources));
178-
jar.manifest((manifest) -> {
179-
Map<String, Object> attributes = new TreeMap<>();
180-
attributes.put("Automatic-Module-Name", project.getName().replace("-", "."));
181-
attributes.put("Build-Jdk-Spec", SOURCE_AND_TARGET_COMPATIBILITY);
182-
attributes.put("Built-By", "Spring");
183-
attributes.put("Implementation-Title",
184-
determineImplementationTitle(project, sourceJarTaskNames, javadocJarTaskNames, jar));
185-
attributes.put("Implementation-Version", project.getVersion());
186-
manifest.attributes(attributes);
187-
});
188-
}));
189-
}
190-
191149
private String determineImplementationTitle(Project project, Set<String> sourceJarTaskNames,
192150
Set<String> javadocJarTaskNames, Jar jar) {
193151
if (sourceJarTaskNames.contains(jar.getName())) {

buildSrc/src/main/resources/LICENSE.txt

Lines changed: 0 additions & 202 deletions
This file was deleted.

0 commit comments

Comments
 (0)