Skip to content

Commit f24ee19

Browse files
authored
decommission the deprecated Gradle archivesBaseName property (open-telemetry#3878)
1 parent 0ede131 commit f24ee19

File tree

12 files changed

+19
-19
lines changed

12 files changed

+19
-19
lines changed

api/all/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88

99
description = "OpenTelemetry API"
1010
otelJava.moduleName.set("io.opentelemetry.api")
11-
base.archivesBaseName = "opentelemetry-api"
11+
base.archivesName.set("opentelemetry-api")
1212

1313
dependencies {
1414
api(project(":context"))

api/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ subprojects {
33
group = "io.opentelemetry.api"
44
val proj = this
55
plugins.withId("java") {
6-
configure<BasePluginConvention> {
7-
archivesBaseName = "opentelemetry-api-${proj.name}"
6+
configure<BasePluginExtension> {
7+
archivesName.set("opentelemetry-api-${proj.name}")
88
}
99
}
1010
}

bom-alpha/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ plugins {
44

55
description = "OpenTelemetry Bill of Materials (Alpha)"
66
group = "io.opentelemetry"
7-
base.archivesBaseName = "opentelemetry-bom-alpha"
7+
base.archivesName.set("opentelemetry-bom-alpha")
88

99
otelBom.projectFilter.set { it.findProperty("otel.release") == "alpha" }

bom/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ plugins {
44

55
description = "OpenTelemetry Bill of Materials"
66
group = "io.opentelemetry"
7-
base.archivesBaseName = "opentelemetry-bom"
7+
base.archivesName.set("opentelemetry-bom")
88

99
otelBom.projectFilter.set { !it.hasProperty("otel.release") }

buildSrc/src/main/kotlin/otel.bom-conventions.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ rootProject.tasks.named(generateBuildSubstitutions.name) {
3333
afterEvaluate {
3434
otelBom.projectFilter.finalizeValue()
3535
val bomProjects = rootProject.subprojects
36-
.sortedBy { it.findProperty("archivesBaseName") as String? }
36+
.sortedBy { it.findProperty("archivesName") as String? }
3737
.filter { !it.name.startsWith("bom") }
3838
.filter(otelBom.projectFilter.get()::test)
3939
.filter { it.plugins.hasPlugin("maven-publish") }

exporters/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ subprojects {
33
group = "io.opentelemetry.exporters"
44
val proj = this
55
plugins.withId("java") {
6-
configure<BasePluginConvention> {
7-
archivesBaseName = "opentelemetry-exporter-${proj.name}"
6+
configure<BasePluginExtension> {
7+
archivesName.set("opentelemetry-exporter-${proj.name}")
88
}
99
}
1010
}

exporters/otlp-http/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ subprojects {
33
group = "io.opentelemetry.exporter.otlp.http"
44
val proj = this
55
plugins.withId("java") {
6-
configure<BasePluginConvention> {
7-
archivesBaseName = "opentelemetry-exporter-otlp-http-${proj.name}"
6+
configure<BasePluginExtension> {
7+
archivesName.set("opentelemetry-exporter-otlp-http-${proj.name}")
88
}
99
}
1010
}

exporters/otlp/all/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88

99
description = "OpenTelemetry Protocol Exporters"
1010
otelJava.moduleName.set("io.opentelemetry.exporter.otlp")
11-
base.archivesBaseName = "opentelemetry-exporter-otlp"
11+
base.archivesName.set("opentelemetry-exporter-otlp")
1212

1313
dependencies {
1414
api(project(":exporters:otlp:trace"))

exporters/otlp/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ subprojects {
33
group = "io.opentelemetry.exporter.otlp"
44
val proj = this
55
plugins.withId("java") {
6-
configure<BasePluginConvention> {
7-
archivesBaseName = "opentelemetry-exporter-otlp-${proj.name}"
6+
configure<BasePluginExtension> {
7+
archivesName.set("opentelemetry-exporter-otlp-${proj.name}")
88
}
99
}
1010
}

extensions/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
subprojects {
22
val proj = this
33
plugins.withId("java") {
4-
configure<BasePluginConvention> {
5-
archivesBaseName = "opentelemetry-extension-${proj.name}"
4+
configure<BasePluginExtension> {
5+
archivesName.set("opentelemetry-extension-${proj.name}")
66
}
77
}
88
}

sdk-extensions/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
subprojects {
22
val proj = this
33
plugins.withId("java") {
4-
configure<BasePluginConvention> {
5-
archivesBaseName = "opentelemetry-sdk-extension-${proj.name}"
4+
configure<BasePluginExtension> {
5+
archivesName.set("opentelemetry-sdk-extension-${proj.name}")
66
}
77
}
88
}

sdk/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ subprojects {
33
group = "io.opentelemetry.sdk"
44
val proj = this
55
plugins.withId("java") {
6-
configure<BasePluginConvention> {
7-
archivesBaseName = "opentelemetry-sdk-${proj.name}"
6+
configure<BasePluginExtension> {
7+
archivesName.set("opentelemetry-sdk-${proj.name}")
88
}
99
}
1010
}

0 commit comments

Comments
 (0)