Skip to content

Commit 0e684c0

Browse files
committed
Merge branch 'main' into fbc-create-resource-from-model
2 parents 6defc6d + 2eb84bf commit 0e684c0

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ Snapshots of the `main` branch are available as follows:
176176

177177
```groovy
178178
repositories {
179-
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
179+
maven { url 'https://central.sonatype.com/repository/maven-snapshots/' }
180180
}
181181
182182
dependencies {
@@ -193,8 +193,8 @@ dependencies {
193193
<project>
194194
<repositories>
195195
<repository>
196-
<id>oss.sonatype.org-snapshot</id>
197-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
196+
<id>sonatype-snapshot-repository</id>
197+
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
198198
</repository>
199199
</repositories>
200200
<dependencyManagement>

buildSrc/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ dependencies {
6565
implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.2.0")
6666
implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.2.0")
6767
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21")
68-
implementation("org.owasp:dependency-check-gradle:12.1.2")
68+
implementation("org.owasp:dependency-check-gradle:12.1.3")
6969
implementation("ru.vyarus:gradle-animalsniffer-plugin:2.0.1")
7070
}
7171

context/src/main/java/io/opentelemetry/context/ContextKey.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* private static final ContextKey<MyState> KEY = ContextKey.named("MyState");
1717
*
1818
* public Context startWork() {
19-
* return Context.withValues(KEY, new MyState());
19+
* return Context.with(KEY, new MyState());
2020
* }
2121
*
2222
* public void continueWork(Context context) {

dependencyManagement/build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ val DEPENDENCY_BOMS = listOf(
1717
"com.google.guava:guava-bom:33.4.8-jre",
1818
"com.google.protobuf:protobuf-bom:4.31.1",
1919
"com.squareup.okhttp3:okhttp-bom:4.12.0",
20-
"com.squareup.okio:okio-bom:3.12.0", // applies to transitive dependencies of okhttp
20+
"com.squareup.okio:okio-bom:3.13.0", // applies to transitive dependencies of okhttp
2121
"io.grpc:grpc-bom:1.73.0",
2222
"io.netty:netty-bom:4.2.2.Final",
2323
"io.zipkin.brave:brave-bom:6.3.0",
2424
"io.zipkin.reporter2:zipkin-reporter-bom:3.5.1",
2525
"org.assertj:assertj-bom:3.27.3",
26-
"org.testcontainers:testcontainers-bom:1.21.1",
26+
"org.testcontainers:testcontainers-bom:1.21.2",
2727
"org.snakeyaml:snakeyaml-engine:2.9"
2828
)
2929

@@ -68,7 +68,7 @@ val DEPENDENCIES = listOf(
6868
"io.prometheus:prometheus-metrics-exposition-formats-no-protobuf:${prometheusServerVersion}",
6969
"javax.annotation:javax.annotation-api:1.3.2",
7070
"com.github.stefanbirkner:system-rules:1.19.0",
71-
"com.google.api.grpc:proto-google-common-protos:2.58.0",
71+
"com.google.api.grpc:proto-google-common-protos:2.58.2",
7272
"com.google.code.findbugs:jsr305:3.0.2",
7373
"com.google.guava:guava-beta-checker:1.0",
7474
"com.sun.net.httpserver:http:20070405",
@@ -79,7 +79,7 @@ val DEPENDENCIES = listOf(
7979
"io.github.netmikey.logunit:logunit-jul:2.0.0",
8080
"io.jaegertracing:jaeger-client:1.8.1",
8181
"io.opentelemetry.contrib:opentelemetry-aws-xray-propagator:1.46.0-alpha",
82-
"io.opentelemetry.semconv:opentelemetry-semconv-incubating:1.32.0-alpha",
82+
"io.opentelemetry.semconv:opentelemetry-semconv-incubating:1.34.0-alpha",
8383
"io.opentelemetry.proto:opentelemetry-proto:1.7.0-alpha",
8484
"io.opentracing:opentracing-api:0.33.0",
8585
"io.opentracing:opentracing-noop:0.33.0",

0 commit comments

Comments
 (0)