Update core to 1.21.0 and run license report (#7384)

open-telemetry · Dec 10, 2022 · 6679cc8 · 6679cc8
1 parent 264edd9
commit 6679cc8
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 29 deletions.
diff --git a/conventions/build.gradle.kts b/conventions/build.gradle.kts
@@ -46,7 +46,7 @@ dependencies {
  implementation("org.ow2.asm:asm-tree:9.4")
  implementation("org.apache.httpcomponents:httpclient:4.5.14")
  implementation("org.gradle:test-retry-gradle-plugin:1.5.0")
- implementation("org.owasp:dependency-check-gradle:7.4.0")
+ implementation("org.owasp:dependency-check-gradle:7.4.1")
  implementation("ru.vyarus:gradle-animalsniffer-plugin:1.6.0")
  // When updating, also update dependencyManagement/build.gradle.kts
  implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.12.19")

diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -29,8 +29,8 @@ val DEPENDENCY_BOMS = listOf(
  "com.fasterxml.jackson:jackson-bom:2.14.1",
  "com.google.guava:guava-bom:31.1-jre",
  "org.apache.groovy:groovy-bom:${groovyVersion}",
- "io.opentelemetry:opentelemetry-bom:1.20.1",
- "io.opentelemetry:opentelemetry-bom-alpha:1.20.1-alpha",
+ "io.opentelemetry:opentelemetry-bom:1.21.0",
+ "io.opentelemetry:opentelemetry-bom-alpha:1.21.0-alpha",
  "org.junit:junit-bom:5.9.1",
  "org.testcontainers:testcontainers-bom:1.17.6",
  "org.spockframework:spock-bom:2.3-groovy-4.0"

diff --git a/licenses/licenses.md b/licenses/licenses.md
diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SdkDisabledSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SdkDisabledSmokeTest.groovy
@@ -24,7 +24,7 @@ class SdkDisabledSmokeTest extends SmokeTest {
  @Override
  protected Map<String, String> getExtraEnv() {
  return [
- "OTEL_EXPERIMENTAL_SDK_ENABLED": "false"
+ "OTEL_SDK_DISABLED": "true"
  ]
  }