Disable shadowjar publishing to remove race condition of normal jar publishing (#957) (#958)

opensearch-trigger-bot[bot] · peterzhuamazon · web-flow · commit 244fb9f9cf72 · 2023-06-02T21:51:32.000-04:00
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> (cherry picked from commit eb94584) Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
diff --git a/client/build.gradle b/client/build.gradle
@@ -47,9 +47,6 @@ jacocoTestCoverageVerification {
 }
 check.dependsOn jacocoTestCoverageVerification
 
-tasks.named("jar").configure { dependsOn("publishShadowPublicationToMavenLocal") }
-tasks.named("jar").configure { dependsOn("publishShadowPublicationToStagingRepository") }
-
 shadowJar {
     archiveClassifier.set(null)
 }
@@ -112,6 +109,8 @@ publishing {
         }
         jars(MavenPublication) { publication ->
             from components.java
+            artifact sourcesJar
+            artifact javadocJar
 
             pom {
                 name = "OpenSearch Machine Learning Client"
diff --git a/settings.gradle b/settings.gradle
@@ -14,3 +14,4 @@ project(":plugin").name = rootProject.name + "-plugin"
 include 'ml-algorithms'
 project(":ml-algorithms").name = rootProject.name + "-algorithms"
 
+startParameter.excludedTaskNames=["publishShadowPublicationToStagingRepository", "publishShadowPublicationToMavenLocal"]

Original file line number	Diff line number	Diff line change
`@@ -47,9 +47,6 @@ jacocoTestCoverageVerification {`
`47`	`47`	`}`
`48`	`48`	`check.dependsOn jacocoTestCoverageVerification`
`49`	`49`
`50`		`-tasks.named("jar").configure { dependsOn("publishShadowPublicationToMavenLocal") }`
`51`		`-tasks.named("jar").configure { dependsOn("publishShadowPublicationToStagingRepository") }`
`52`		`-`
`53`	`50`	`shadowJar {`
`54`	`51`	`archiveClassifier.set(null)`
`55`	`52`	`}`
`@@ -112,6 +109,8 @@ publishing {`
`112`	`109`	`}`
`113`	`110`	`jars(MavenPublication) { publication ->`
`114`	`111`	`from components.java`
	`112`	`+ artifact sourcesJar`
	`113`	`+ artifact javadocJar`
`115`	`114`
`116`	`115`	`pom {`
`117`	`116`	`name = "OpenSearch Machine Learning Client"`
Original file line number	Diff line number	Diff line change
`@@ -14,3 +14,4 @@ project(":plugin").name = rootProject.name + "-plugin"`
`14`	`14`	`include 'ml-algorithms'`
`15`	`15`	`project(":ml-algorithms").name = rootProject.name + "-algorithms"`
`16`	`16`
	`17`	`+startParameter.excludedTaskNames=["publishShadowPublicationToStagingRepository", "publishShadowPublicationToMavenLocal"]`