Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release/v1.32.x to main #767

Merged
merged 4 commits into from
Feb 28, 2024
Merged

Merge release/v1.32.x to main #767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0752034
Update Dependency to 1.32.1 and remove patch (#749)
vasireddy99 Feb 15, 2024
8c25eaa
[release/v1.32.x] Add commits from main branch (#761)
vasireddy99 Feb 27, 2024
0a51f93
Prepare for release 1.32.1 - Update licenses (#766)
vasireddy99 Feb 27, 2024
071f550
Merge branch 'main' into mergeMain
vasireddy99 Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 0 additions & 25 deletions .github/patches/opentelemetry-java-instrumentation.patch
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion .github/patches/versions
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion dependencyManagement/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ data class DependencySet(val group: String, val version: String, val modules: Li
val TEST_SNAPSHOTS = rootProject.findProperty("testUpstreamSnapshots") == "true"

// This is the version of the upstream instrumentation BOM
val otelVersion = "1.32.0-adot1"
val otelVersion = "1.32.1"
val otelSnapshotVersion = "1.33.0"
val otelAlphaVersion = if (!TEST_SNAPSHOTS) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT"
val otelJavaAgentVersion = if (!TEST_SNAPSHOTS) otelVersion else "$otelSnapshotVersion-SNAPSHOT"
Expand Down
0 ...protocol-2.21.33.jar/META-INF/LICENSE.txt → ...tations-2.20.102.jar/META-INF/LICENSE.txt
View file
Open in desktop
File renamed without changes.
0 ...-protocol-2.21.33.jar/META-INF/NOTICE.txt → ...otations-2.20.102.jar/META-INF/NOTICE.txt
View file
Open in desktop
File renamed without changes.
0 ...protocol-2.21.33.jar/META-INF/LICENSE.txt → ...-client-2.20.102.jar/META-INF/LICENSE.txt
View file
Open in desktop
File renamed without changes.
0 ...-protocol-2.21.33.jar/META-INF/NOTICE.txt → ...e-client-2.20.102.jar/META-INF/NOTICE.txt
View file
Open in desktop
File renamed without changes.
0 licenses/armeria-1.26.3.jar/META-INF/LICENSE → licenses/armeria-1.26.4.jar/META-INF/LICENSE
View file
Open in desktop
File renamed without changes.
0 ...dynamodb-2.21.33.jar/META-INF/LICENSE.txt → ...es/arns-2.20.102.jar/META-INF/LICENSE.txt
View file
Open in desktop
File renamed without changes.
0 .../dynamodb-2.21.33.jar/META-INF/NOTICE.txt → ...ses/arns-2.20.102.jar/META-INF/NOTICE.txt
View file
Open in desktop
File renamed without changes.
0 .../kinesis-2.21.33.jar/META-INF/LICENSE.txt → ...es/auth-2.20.102.jar/META-INF/LICENSE.txt
View file
Open in desktop
File renamed without changes.
0 ...s/kinesis-2.21.33.jar/META-INF/NOTICE.txt → ...ses/auth-2.20.102.jar/META-INF/NOTICE.txt
View file
Open in desktop
File renamed without changes.
0 ...nses/sqs-2.21.33.jar/META-INF/LICENSE.txt → ...rotocol-2.20.102.jar/META-INF/LICENSE.txt
View file
Open in desktop
File renamed without changes.
0 licenses/sqs-2.21.33.jar/META-INF/NOTICE.txt → ...protocol-2.20.102.jar/META-INF/NOTICE.txt
View file
Open in desktop
File renamed without changes.
0 ...mat-cbor-2.21.33.jar/META-INF/LICENSE.txt → ...ws-core-2.20.102.jar/META-INF/LICENSE.txt
View file
Open in desktop
File renamed without changes.
0 ...rmat-cbor-2.21.33.jar/META-INF/NOTICE.txt → ...aws-core-2.20.102.jar/META-INF/NOTICE.txt
View file
Open in desktop
File renamed without changes.
206 changes: 206 additions & 0 deletions licenses/aws-json-protocol-2.20.102.jar/META-INF/LICENSE.txt
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 25 additions & 0 deletions licenses/aws-json-protocol-2.20.102.jar/META-INF/NOTICE.txt
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading