Skip to content

Commit 958c261

Browse files
fix(deps): update dependency com.google.guava:guava-bom to v33.4.5-jre - abandoned (#13555)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lauri Tulmin <[email protected]>
1 parent c096540 commit 958c261

File tree

3 files changed

+2
-21
lines changed

3 files changed

+2
-21
lines changed

dependencyManagement/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ val DEPENDENCY_BOMS = listOf(
2929

3030
"com.fasterxml.jackson:jackson-bom:2.18.3",
3131
"com.squareup.okio:okio-bom:3.10.2", // see https://github.com/open-telemetry/opentelemetry-java/issues/5637
32-
"com.google.guava:guava-bom:33.4.0-jre",
32+
"com.google.guava:guava-bom:33.4.5-jre",
3333
"org.apache.groovy:groovy-bom:${groovyVersion}",
3434
"io.opentelemetry:opentelemetry-bom:${otelSdkVersion}",
3535
"io.opentelemetry:opentelemetry-bom-alpha:${otelSdkAlphaVersion}",

docs/contributing/style-guideline.md

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -108,18 +108,7 @@ All parameters and fields which can be `null` should be annotated with `@Nullabl
108108
(specifically `javax.annotation.Nullable`, which is included by the
109109
`otel.java-conventions` gradle plugin as a `compileOnly` dependency).
110110

111-
There is no need to use `@NonNull`, as this is the default, which should be declared in a
112-
`package-info.java` file on the root package of each module, e.g.
113-
114-
```java
115-
@DefaultQualifier(
116-
value = NonNull.class,
117-
locations = {TypeUseLocation.FIELD, TypeUseLocation.PARAMETER, TypeUseLocation.RETURN})
118-
package io.opentelemetry.instrumentation.api;
119-
120-
import org.checkerframework.checker.nullness.qual.NonNull;
121-
import org.checkerframework.framework.qual.DefaultQualifier;
122-
```
111+
There is no need to use `@NonNull`, as this is the default.
123112

124113
Public APIs should still defensively check for `null` parameters, even if the parameter is not
125114
annotated with `@Nullable`. Internal APIs do not need to defensively check for `null` parameters.

instrumentation/zio/zio-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/zio/v2_0/package-info.java

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)