Merge pull request #74 from cljohnso/manifestFixup

MANIFEST.MF and LICENSE corrections
Terracotta-OSS · Nov 29, 2023 · 70eec13 · 70eec13
2 parents d448ebc + 6024308
commit 70eec13
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/buildSrc/src/main/kotlin/org.terracotta.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/org.terracotta.java-conventions.gradle.kts
@@ -188,7 +188,7 @@ tasks {
                 "Build-Jdk-Spec" to jdkSpec,
                 "Built-By" to System.getProperty("user.name"),
                 "Build-Jdk" to System.getProperty("java.version"),
-                "Specification-Title" to project.description,
+                "Specification-Title" to project.extra["pomName"],
                 "Specification-Version" to specVersion(project.version.toString()),
                 "Implementation-Title" to project.name,
                 "Implementation-Vendor-Id" to project.group,

diff --git a/test-tools/build.gradle.kts b/test-tools/build.gradle.kts
@@ -124,12 +124,20 @@ spotbugs {
     excludeFilter.value(layout.projectDirectory.file("config/spotbugs/excludeFilter.xml"))
 }
 
-tasks.sourcesJar {
+val junitLicense = project.copySpec {
     into("META-INF/licenses/junit/junit") {
         from(layout.projectDirectory) {
             include("*-junit*")
         }
     }
+}
+
+tasks.jar {
+    with(junitLicense)
+}
+
+tasks.sourcesJar {
+    with(junitLicense)
     into("") {
         from(layout.projectDirectory.file("README.md"))
     }