From b3d9a10bc5a285d0de05f7125cc541930a54f447 Mon Sep 17 00:00:00 2001
From: Normen Seemann <nseemann@apple.com>
Date: Tue, 31 May 2022 06:58:41 +0200
Subject: [PATCH] resolves #1703: publish test jar artifact

---
 build.gradle             | 1 +
 docs/ReleaseNotes.md     | 2 +-
 gradle/publishing.gradle | 3 ++-
 gradle/testing.gradle    | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 82e50a5d7a..607f1cb43f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -202,6 +202,7 @@ subprojects {
     artifacts {
         add("archives", tasks.sourcesJar)
         add("archives", tasks.javadocJar)
+        add("archives", tasks.testJar)
     }
 
     afterEvaluate { project ->
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index d5a5e591ff..f3f3a6244a 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -33,7 +33,7 @@ This release also updates downstream dependency versions. Most notably, the prot
 * **Feature** Feature 1 [(Issue #NNN)](https://github.com/FoundationDB/fdb-record-layer/issues/NNN)
 * **Feature** Feature 2 [(Issue #NNN)](https://github.com/FoundationDB/fdb-record-layer/issues/NNN)
 * **Feature** Feature 3 [(Issue #NNN)](https://github.com/FoundationDB/fdb-record-layer/issues/NNN)
-* **Feature** Feature 4 [(Issue #NNN)](https://github.com/FoundationDB/fdb-record-layer/issues/NNN)
+* **Feature** Publish test jar as part of the regular distribution [(Issue #1703)](https://github.com/FoundationDB/fdb-record-layer/issues/1703)
 * **Feature** Feature 5 [(Issue #NNN)](https://github.com/FoundationDB/fdb-record-layer/issues/NNN)
 * **Breaking change** Change 1 [(Issue #NNN)](https://github.com/FoundationDB/fdb-record-layer/issues/NNN)
 * **Breaking change** Change 2 [(Issue #NNN)](https://github.com/FoundationDB/fdb-record-layer/issues/NNN)
diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle
index b2dd000696..8a8f2440c7 100644
--- a/gradle/publishing.gradle
+++ b/gradle/publishing.gradle
@@ -58,6 +58,7 @@ publishing {
             from components.java
             artifact tasks.sourcesJar
             artifact tasks.javadocJar
+            artifact tasks.testJar
             addPublishingInfo(publication)
         }
     }
@@ -100,7 +101,7 @@ if (System.getenv('ARTIFACTORY_USER') != null && System.getenv('ARTIFACTORY_KEY'
 createDistribution.configure {
     afterEvaluate {
         dependsOn generatePomFileForLibraryPublication
-        from tasks.jar, tasks.sourcesJar, tasks.javadocJar, tasks.generatePomFileForLibraryPublication
+        from tasks.jar, tasks.sourcesJar, tasks.javadocJar, tasks.testJar, tasks.generatePomFileForLibraryPublication
         rename { filename ->
             GenerateMavenPom pomTask = tasks.generatePomFileForLibraryPublication
             Jar jarTask = tasks.jar
diff --git a/gradle/testing.gradle b/gradle/testing.gradle
index b5bdaa1d85..e297d7720c 100644
--- a/gradle/testing.gradle
+++ b/gradle/testing.gradle
@@ -116,7 +116,7 @@ tasks.withType(Test) { task ->
 task testJar(type: Jar, dependsOn: testClasses) {
     group = 'Build'
     description = 'Build a jar file of test classes as an exported artifact'
-    baseName = "${project.archivesBaseName}-test"
+    classifier='test'
     from sourceSets.test.output
 }