Fix publication details for shadowed jars (#5548)

Fixes #5547
deephaven · May 30, 2024 · 770440b · 770440b
1 parent f8e269a
commit 770440b
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/authentication/example-providers/build.gradle b/authentication/example-providers/build.gradle
@@ -4,10 +4,6 @@ plugins {
 
 project.subprojects { Project p ->
     p.plugins.apply('java-library')
-
-    // Combined, these next two lines will activate the JAVA_PUBLIC_SHADOW to all
-    // sub-projects, and in turn, apply the shadow plugin
-    p.setProperty('io.deephaven.project.ProjectType', 'JAVA_PUBLIC_SHADOW')
     p.plugins.apply('io.deephaven.project.register')
 
     p.dependencies {

diff --git a/authentication/example-providers/mtls/gradle.properties b/authentication/example-providers/mtls/gradle.properties
@@ -0,0 +1 @@
+io.deephaven.project.ProjectType=JAVA_PUBLIC_SHADOW
diff --git a/authentication/example-providers/oidc/gradle.properties b/authentication/example-providers/oidc/gradle.properties
@@ -0,0 +1 @@
+io.deephaven.project.ProjectType=JAVA_PUBLIC_SHADOW
diff --git a/authentication/example-providers/psk/gradle.properties b/authentication/example-providers/psk/gradle.properties
@@ -0,0 +1 @@
+io.deephaven.project.ProjectType=JAVA_PUBLIC_SHADOW
diff --git a/authentication/example-providers/sql-username-password/gradle.properties b/authentication/example-providers/sql-username-password/gradle.properties
@@ -0,0 +1 @@
+io.deephaven.project.ProjectType=JAVA_PUBLIC_SHADOW
diff --git a/buildSrc/src/main/groovy/io.deephaven.java-shadow-publishing-conventions.gradle b/buildSrc/src/main/groovy/io.deephaven.java-shadow-publishing-conventions.gradle
@@ -22,9 +22,10 @@ PublishingTools.setupPublications(project) { publication ->
   // This assumes that the shadow plugin is enabled, rather than using the vanilla java component.
 
   // Inlines the shadow.component call, which doesn't actually use components, and doesn't generate
-  // the pom late enough to pick up gradle's own artifactId wiring from our archivesBaseName changes
+  // the pom late enough to pick up gradle's own artifactId wiring from our archivesBaseName changes.
+  // Also un-sets the classifier for the shadow jar, since we want this to be the default artifact
 //  project.shadow.component(publication)
-  publication.artifact(project.tasks.named("shadowJar"))
+  publication.artifact(source: project.tasks.named("shadowJar"), classifier: '')
   publication.pom {
     withXml {
       def root = asNode()