Skip to content

Commit

Permalink
Stop including old artifacts in bom (#6157)
Browse files Browse the repository at this point in the history
  • Loading branch information
jack-berg committed Jan 18, 2024
1 parent 16d6e0e commit ede6a81
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 108 deletions.
3 changes: 1 addition & 2 deletions VERSIONING.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ new artifact which requires adding the new artifact to dependency declarations.
On rare occasions we may deprecate an entire stable artifact, with the intent of stopping functional
changes or enhancements. In these situations we may stop publishing additional `MINOR` or `MAJOR`
versions of the artifact. However, if necessary, we'll publish security fixes via `PATCH` releases.
Despite stopping publishing, new versions of the BOM will continue to reference the last published
version of the artifact, and the API of the last published version will remain stable.
The API of the last published version will remain stable.

As a user, if you always depend on the latest version of the BOM for a given `MAJOR` version, and
you do not use classes in the `internal` package (which you MUST NOT do), you can be assured that
Expand Down
13 changes: 0 additions & 13 deletions all/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,6 @@ dependencies {
}
}

// For testing BOM references to artifacts that were previously published
testImplementation(platform(project(":bom")))
// The io.grpc.grpc-* dependencies are transitive dependencies of opentelemetry-exporter-jaeger-proto
// which must be provided by the user
testImplementation("io.opentelemetry:opentelemetry-exporter-jaeger-proto")
testImplementation("io.grpc:grpc-api")
testImplementation("io.grpc:grpc-protobuf")
testImplementation("io.grpc:grpc-stub")
testImplementation("io.opentelemetry:opentelemetry-extension-annotations")
testImplementation("io.opentelemetry:opentelemetry-extension-aws")
testImplementation("io.opentelemetry:opentelemetry-sdk-extension-resources")
testImplementation("io.opentelemetry:opentelemetry-sdk-extension-aws")

testImplementation("com.tngtech.archunit:archunit-junit5")
}

Expand Down
68 changes: 0 additions & 68 deletions all/src/test/java/io/opentelemetry/all/FallbackArtifactsTest.java

This file was deleted.

9 changes: 0 additions & 9 deletions bom/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,3 @@ group = "io.opentelemetry"
base.archivesName.set("opentelemetry-bom")

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

// Artifacts that were previously published and included in the BOM for backwards compatibility
otelBom.addFallback("opentelemetry-exporter-jaeger-proto", "1.17.0")
otelBom.addFallback("opentelemetry-extension-annotations", "1.18.0")
otelBom.addFallback("opentelemetry-sdk-extension-resources", "1.19.0")
otelBom.addFallback("opentelemetry-sdk-extension-aws", "1.19.0")
otelBom.addFallback("opentelemetry-extension-aws", "1.20.1")
// NOTE: opentelemetry-exporter-jaeger and opentelemetry-exporter-jaeger-thift are omitted because
// they contain dependencies on internal classes, which may have breaking API changes preventing compilation.
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,4 @@ import java.util.function.Predicate

abstract class OtelBomExtension {
abstract val projectFilter: Property<Predicate<Project>>
val additionalDependencies: MutableSet<String> = hashSetOf()

fun addFallback(artifactId: String, version: String) {
this.additionalDependencies.add("io.opentelemetry:" + artifactId + ":" + version)
}

fun addExtra(groupId: String, artifactId: String, version: String) {
this.additionalDependencies.add(groupId + ":" + artifactId + ":" + version)
}
}
7 changes: 0 additions & 7 deletions buildSrc/src/main/kotlin/otel.bom-conventions.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,4 @@ afterEvaluate {
}
}
}
otelBom.additionalDependencies.forEach { dependency ->
dependencies {
constraints {
api(dependency)
}
}
}
}

0 comments on commit ede6a81

Please sign in to comment.