Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into heya/fix-etw-init-fai…
Browse files Browse the repository at this point in the history
…lure
  • Loading branch information
heyams committed Mar 5, 2024
2 parents 6432948 + dccea09 commit e71ba12
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@

## Version 3.5.0 GA (02/29/2024)

### Breaking changes

* ⚠️⚠️ Stable HTTP semantic conventions are now emitted ⚠️⚠️
TOO MANY CHANGES TO LIST HERE, be sure to review the full [list of changes](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/http/migration-guide.md#summary-of-changes).

### Enhancements:

* Update to OpenTelemetry Java 2.1.0 ([#3418](https://github.com/microsoft/ApplicationInsights-Java/pull/3418))
Expand Down
2 changes: 1 addition & 1 deletion dependencyManagement/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ val CORE_DEPENDENCIES = listOf(
val DEPENDENCIES = listOf(
"ch.qos.logback:logback-classic:1.3.14", // logback 1.4+ requires Java 11+
"ch.qos.logback.contrib:logback-json-classic:0.1.5",
"com.uber.nullaway:nullaway:0.10.23",
"com.uber.nullaway:nullaway:0.10.24",
"commons-codec:commons-codec:1.16.1",
"org.apache.commons:commons-text:1.11.0",
"com.google.code.gson:gson:2.10.1",
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Project properties
version=3.5.0
version=3.5.1

org.gradle.parallel=true
org.gradle.caching=true
Expand Down

0 comments on commit e71ba12

Please sign in to comment.