decommission the deprecated Gradle archivesBaseName property (#3878)

open-telemetry · Nov 15, 2021 · f24ee19 · f24ee19
1 parent 0ede131
commit f24ee19
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 19 deletions.
diff --git a/api/all/build.gradle.kts b/api/all/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 description = "OpenTelemetry API"
 otelJava.moduleName.set("io.opentelemetry.api")
-base.archivesBaseName = "opentelemetry-api"
+base.archivesName.set("opentelemetry-api")
 
 dependencies {
   api(project(":context"))

diff --git a/api/build.gradle.kts b/api/build.gradle.kts
@@ -3,8 +3,8 @@ subprojects {
   group = "io.opentelemetry.api"
   val proj = this
   plugins.withId("java") {
-    configure<BasePluginConvention> {
-      archivesBaseName = "opentelemetry-api-${proj.name}"
+    configure<BasePluginExtension> {
+      archivesName.set("opentelemetry-api-${proj.name}")
     }
   }
 }
diff --git a/bom-alpha/build.gradle.kts b/bom-alpha/build.gradle.kts
@@ -4,6 +4,6 @@ plugins {
 
 description = "OpenTelemetry Bill of Materials (Alpha)"
 group = "io.opentelemetry"
-base.archivesBaseName = "opentelemetry-bom-alpha"
+base.archivesName.set("opentelemetry-bom-alpha")
 
 otelBom.projectFilter.set { it.findProperty("otel.release") == "alpha" }
diff --git a/bom/build.gradle.kts b/bom/build.gradle.kts
@@ -4,6 +4,6 @@ plugins {
 
 description = "OpenTelemetry Bill of Materials"
 group = "io.opentelemetry"
-base.archivesBaseName = "opentelemetry-bom"
+base.archivesName.set("opentelemetry-bom")
 
 otelBom.projectFilter.set { !it.hasProperty("otel.release") }
diff --git a/buildSrc/src/main/kotlin/otel.bom-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.bom-conventions.gradle.kts
@@ -33,7 +33,7 @@ rootProject.tasks.named(generateBuildSubstitutions.name) {
 afterEvaluate {
   otelBom.projectFilter.finalizeValue()
   val bomProjects = rootProject.subprojects
-    .sortedBy { it.findProperty("archivesBaseName") as String? }
+    .sortedBy { it.findProperty("archivesName") as String? }
     .filter { !it.name.startsWith("bom") }
     .filter(otelBom.projectFilter.get()::test)
     .filter { it.plugins.hasPlugin("maven-publish") }

diff --git a/exporters/build.gradle.kts b/exporters/build.gradle.kts
@@ -3,8 +3,8 @@ subprojects {
   group = "io.opentelemetry.exporters"
   val proj = this
   plugins.withId("java") {
-    configure<BasePluginConvention> {
-      archivesBaseName = "opentelemetry-exporter-${proj.name}"
+    configure<BasePluginExtension> {
+      archivesName.set("opentelemetry-exporter-${proj.name}")
     }
   }
 }
diff --git a/exporters/otlp-http/build.gradle.kts b/exporters/otlp-http/build.gradle.kts
@@ -3,8 +3,8 @@ subprojects {
   group = "io.opentelemetry.exporter.otlp.http"
   val proj = this
   plugins.withId("java") {
-    configure<BasePluginConvention> {
-      archivesBaseName = "opentelemetry-exporter-otlp-http-${proj.name}"
+    configure<BasePluginExtension> {
+      archivesName.set("opentelemetry-exporter-otlp-http-${proj.name}")
     }
   }
 }
diff --git a/exporters/otlp/all/build.gradle.kts b/exporters/otlp/all/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 description = "OpenTelemetry Protocol Exporters"
 otelJava.moduleName.set("io.opentelemetry.exporter.otlp")
-base.archivesBaseName = "opentelemetry-exporter-otlp"
+base.archivesName.set("opentelemetry-exporter-otlp")
 
 dependencies {
   api(project(":exporters:otlp:trace"))

diff --git a/exporters/otlp/build.gradle.kts b/exporters/otlp/build.gradle.kts
@@ -3,8 +3,8 @@ subprojects {
   group = "io.opentelemetry.exporter.otlp"
   val proj = this
   plugins.withId("java") {
-    configure<BasePluginConvention> {
-      archivesBaseName = "opentelemetry-exporter-otlp-${proj.name}"
+    configure<BasePluginExtension> {
+      archivesName.set("opentelemetry-exporter-otlp-${proj.name}")
     }
   }
 }
diff --git a/extensions/build.gradle.kts b/extensions/build.gradle.kts
@@ -1,8 +1,8 @@
 subprojects {
   val proj = this
   plugins.withId("java") {
-    configure<BasePluginConvention> {
-      archivesBaseName = "opentelemetry-extension-${proj.name}"
+    configure<BasePluginExtension> {
+      archivesName.set("opentelemetry-extension-${proj.name}")
     }
   }
 }
diff --git a/sdk-extensions/build.gradle.kts b/sdk-extensions/build.gradle.kts
@@ -1,8 +1,8 @@
 subprojects {
   val proj = this
   plugins.withId("java") {
-    configure<BasePluginConvention> {
-      archivesBaseName = "opentelemetry-sdk-extension-${proj.name}"
+    configure<BasePluginExtension> {
+      archivesName.set("opentelemetry-sdk-extension-${proj.name}")
     }
   }
 }
diff --git a/sdk/build.gradle.kts b/sdk/build.gradle.kts
@@ -3,8 +3,8 @@ subprojects {
   group = "io.opentelemetry.sdk"
   val proj = this
   plugins.withId("java") {
-    configure<BasePluginConvention> {
-      archivesBaseName = "opentelemetry-sdk-${proj.name}"
+    configure<BasePluginExtension> {
+      archivesName.set("opentelemetry-sdk-${proj.name}")
     }
   }
 }