Skip to content

Commit 0f2757e

Browse files
committed
Merge branch 'main' of https://github.com/open-telemetry/semantic-conventions-java into prepare-1.30.0-RC
2 parents cc263b7 + 9ebb57d commit 0f2757e

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

CHANGELOG.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
# Changelog
22

3-
## Unreleased
3+
## Version 1.30.0-RC (2025-01-27)
4+
5+
**NOTICE**: This is a release candidate (RC), preceding the first stable release of `io.opentelemetry.semconv:opentelemetry-semconv`.
6+
7+
* **BREAKING**: Prepare for stable release. Remove deprecated `ResourceAttributes`, `SemanticAttributes`.
8+
([#130](https://github.com/open-telemetry/semantic-conventions-java/pull/130))
9+
* Exclude `exception.escaped` from (to-be-stable) artifact
10+
([#133](https://github.com/open-telemetry/semantic-conventions-java/pull/133))
11+
* Remove schema urls for `1.22.0`, `1.23.1`.
12+
([#134](https://github.com/open-telemetry/semantic-conventions-java/pull/134))
13+
* Bump to semantic-conventions v1.30.0
14+
([#141](https://github.com/open-telemetry/semantic-conventions-java/pull/141))
415

516
## Version 1.30.0-RC (2025-01-27)
617

buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ java {
2424

2525
checkstyle {
2626
configDirectory.set(file("$rootDir/buildscripts/"))
27-
toolVersion = "8.12"
27+
toolVersion = "10.21.2"
2828
isIgnoreFailures = false
2929
configProperties["rootDir"] = rootDir
3030
}

buildscripts/checkstyle.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,17 +161,14 @@
161161
value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
162162
</module-->
163163
<module name="JavadocMethod">
164-
<property name="scope" value="public"/>
164+
<property name="accessModifiers" value="public"/>
165165
<property name="allowMissingParamTags" value="true"/>
166-
<property name="allowMissingThrowsTags" value="true"/>
167166
<property name="allowMissingReturnTag" value="true"/>
168-
<property name="minLineCount" value="2"/>
169167
<!-- <!-\- Too restrictive for tests -\-> -->
170168
<!-- <property name="allowedAnnotations" value="Override, Test"/ -->
171169
<property name="allowedAnnotations"
172170
value="Override, Test, Before, After, BeforeClass, AfterClass, Setup,
173171
TearDown"/>
174-
<property name="allowThrowsTagsForSubclasses" value="true"/>
175172
</module>
176173
<module name="MethodName">
177174
<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>

0 commit comments

Comments
 (0)