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

Fix groups / base name for javaagent artifacts (#1173)

This commit is contained in:
Anuraag Agrawal 2020-09-09 15:38:29 +09:00 committed by GitHub
parent 030e9fe107
commit 5289520203
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gradle/java.gradle
View File

@ -10,7 +10,8 @@ apply from: "$rootDir/gradle/codenarc.gradle"
apply from: "$rootDir/gradle/spotbugs.gradle" apply from: "$rootDir/gradle/spotbugs.gradle"
afterEvaluate { afterEvaluate {
if (group == 'io.opentelemetry.instrumentation.auto' || findProperty('mavenGroupId') == 'io.opentelemetry.instrumentation.auto') { if (!archivesBaseName.startsWith('javaagent') &&
(group == 'io.opentelemetry.instrumentation.auto' || findProperty('mavenGroupId') == 'io.opentelemetry.instrumentation.auto')) {
archivesBaseName = 'opentelemetry-auto-' + archivesBaseName archivesBaseName = 'opentelemetry-auto-' + archivesBaseName
} else { } else {
archivesBaseName = 'opentelemetry-' + archivesBaseName archivesBaseName = 'opentelemetry-' + archivesBaseName

2
javaagent-bootstrap/javaagent-bootstrap.gradle
View File

@ -1,5 +1,3 @@
group = 'io.opentelemetry.javaagent'
apply from: "$rootDir/gradle/java.gradle" apply from: "$rootDir/gradle/java.gradle"
apply from: "$rootDir/gradle/publish.gradle" apply from: "$rootDir/gradle/publish.gradle"

2
javaagent-tooling/javaagent-tooling.gradle
View File

@ -1,5 +1,3 @@
group = 'io.opentelemetry.javaagent'
apply from: "$rootDir/gradle/java.gradle" apply from: "$rootDir/gradle/java.gradle"
apply from: "$rootDir/gradle/publish.gradle" apply from: "$rootDir/gradle/publish.gradle"

1
javaagent/javaagent.gradle
View File

@ -5,7 +5,6 @@ plugins {
} }
description = 'OpenTelemetry Javaagent' description = 'OpenTelemetry Javaagent'
group = 'io.opentelemetry.javaagent'
apply from: "$rootDir/gradle/java.gradle" apply from: "$rootDir/gradle/java.gradle"
apply from: "$rootDir/gradle/publish.gradle" apply from: "$rootDir/gradle/publish.gradle"