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:
parent
a70682c390
commit
63c8b55d68
|
@ -9,8 +9,10 @@ publishing {
|
||||||
plugins.withId("java-platform") {
|
plugins.withId("java-platform") {
|
||||||
from(components["javaPlatform"])
|
from(components["javaPlatform"])
|
||||||
}
|
}
|
||||||
plugins.withId("java-library") {
|
if(project.path != ":javaagent"){
|
||||||
from(components["java"])
|
plugins.withId("java-library") {
|
||||||
|
from(components["java"])
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
versionMapping {
|
versionMapping {
|
||||||
|
|
|
@ -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)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue