open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use archivesBaseName when publishing. (#809) 

* Use archivesBaseName when publishing.

* Fix auto name
This commit is contained in:
Anuraag Agrawal 2020-07-27 21:01:55 +09:00 committed by GitHub
parent 3a24611d4a
commit 91f8e8c199
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gradle/instrumentation.gradle
View File

@ -15,6 +15,11 @@ byteBuddy {
} }
} }
// TODO(anuraaga): This needs to be added before adding publish.gradle, clean up this ordering restraint.
afterEvaluate {
archivesBaseName = 'opentelemetry-auto-' + archivesBaseName
}
apply from: "$rootDir/gradle/java.gradle" apply from: "$rootDir/gradle/java.gradle"
if (project.ext.find("skipPublish") != true) { if (project.ext.find("skipPublish") != true) {
apply from: "$rootDir/gradle/publish.gradle" apply from: "$rootDir/gradle/publish.gradle"
@ -22,8 +27,6 @@ if (project.ext.find("skipPublish") != true) {
afterEvaluate { afterEvaluate {
archivesBaseName = 'opentelemetry-auto-' + archivesBaseName
byteBuddy { byteBuddy {
transformation { transformation {
tasks = ['compileJava', 'compileScala', 'compileKotlin'] tasks = ['compileJava', 'compileScala', 'compileKotlin']

9
gradle/publish.gradle
View File

@ -19,7 +19,9 @@ publishing {
from components.java from components.java
} }
artifactId = artifactPrefix(project) + artifactId afterEvaluate {
artifactId = artifactPrefix(project, archivesBaseName) + archivesBaseName
}
pom { pom {
name = 'OpenTelemetry Instrumentation for Java' name = 'OpenTelemetry Instrumentation for Java'
@ -57,7 +59,10 @@ publishing {
} }
} }
private String artifactPrefix(Project p) { private String artifactPrefix(Project p, String archivesBaseName) {
if (archivesBaseName.startsWith("opentelemetry")) {
return ''
}
if (p.name.startsWith("opentelemetry")) { if (p.name.startsWith("opentelemetry")) {
return '' return ''
} }