Disable jar task in javaagent module (#4765)

* Disable jar task in javaagent module

* Don't try to publish jar from javaagent

* Fix publishing
This commit is contained in:
Nikita Salnikov-Tarnovski 2021-12-02 17:18:34 +02:00 committed by GitHub
parent a70682c390
commit 63c8b55d68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions

View File

@ -9,9 +9,11 @@ publishing {
plugins.withId("java-platform") { plugins.withId("java-platform") {
from(components["javaPlatform"]) from(components["javaPlatform"])
} }
if(project.path != ":javaagent"){
plugins.withId("java-library") { plugins.withId("java-library") {
from(components["java"]) from(components["java"])
} }
}
versionMapping { versionMapping {
allVariants { allVariants {

View File

@ -158,9 +158,7 @@ tasks {
val shadowJar by existing(ShadowJar::class) { val shadowJar by existing(ShadowJar::class) {
configurations = listOf(bootstrapLibs) configurations = listOf(bootstrapLibs)
// without an explicit dependency on jar here, :javaagent:test fails on CI because :javaagent:jar dependsOn(relocateJavaagentLibs, relocateExporterLibs)
// runs after :javaagent:shadowJar and loses (at least) the manifest entries
dependsOn(jar, relocateJavaagentLibs, relocateExporterLibs)
isolateClasses(relocateJavaagentLibs.get().outputs.files) isolateClasses(relocateJavaagentLibs.get().outputs.files)
isolateClasses(relocateExporterLibs.get().outputs.files) isolateClasses(relocateExporterLibs.get().outputs.files)
@ -220,6 +218,10 @@ tasks {
add("baseJar", baseJavaagentJar) add("baseJar", baseJavaagentJar)
} }
jar {
enabled = false
}
assemble { assemble {
dependsOn(shadowJar, slimShadowJar, baseJavaagentJar) dependsOn(shadowJar, slimShadowJar, baseJavaagentJar)
} }
@ -252,6 +254,7 @@ tasks {
publications { publications {
named<MavenPublication>("maven") { named<MavenPublication>("maven") {
artifact(slimShadowJar) artifact(slimShadowJar)
project.shadow.component(this)
} }
} }
} }