Skip to content

handles merge conflicts for release#1480

Merged
baywet merged 175 commits intov3/longTermBranchfrom
release/v3
Feb 7, 2024
Merged

handles merge conflicts for release#1480
baywet merged 175 commits intov3/longTermBranchfrom
release/v3

Conversation

@baywet
Copy link
Member

@baywet baywet commented Feb 7, 2024

  • chore(deps): bump com.github.spotbugs in /samples/deviceCodeSample
  • chore(deps): bump com.github.spotbugs
  • chore(deps): bump rickstaa/action-create-tag from 1.6.3 to 1.6.4
  • chore(deps): bump com.squareup.okhttp3:okhttp from 4.11.0 to 4.12.0
  • chore(deps): bump com.squareup.okhttp3:okhttp from 4.11.0 to 4.12.0
  • chore(deps): bump com.squareup.okhttp3:okhttp in /android
  • chore(deps): bump com.azure:azure-core from 1.44.0 to 1.44.1
  • chore(deps): bump com.azure:azure-core from 1.44.0 to 1.44.1 in /android
  • chore(deps): bump com.azure:azure-identity
  • chore(deps): bump com.azure:azure-core from 1.44.0 to 1.44.1
  • chore(deps): bump com.azure:azure-identity in /samples/deviceCodeSample
  • chore(deps): bump com.github.spotbugs in /samples/deviceCodeSample
  • Update CHANGELOG.md
  • Prepare for version 2.0.20
  • chore(deps): bump rickstaa/action-create-tag from 1.6.4 to 1.6.6
  • chore(deps): bump com.azure:azure-core from 1.44.1 to 1.45.0
  • chore(deps): bump org.junit.jupiter:junit-jupiter-params in /android
  • chore(deps): bump org.junit.jupiter:junit-jupiter-params
  • chore(deps): bump com.azure:azure-core from 1.44.1 to 1.45.0
  • chore(deps): bump com.azure:azure-core from 1.44.1 to 1.45.0 in /android
  • chore(deps-dev): bump org.junit.jupiter:junit-jupiter-params
  • chore(deps-dev): bump org.junit.jupiter:junit-jupiter-api
  • chore(deps): bump org.junit.jupiter:junit-jupiter-api in /android
  • chore(deps): bump org.junit.jupiter:junit-jupiter-engine
  • chore(deps): bump com.github.spotbugs
  • chore(deps): bump com.github.spotbugs:spotbugs-annotations
  • chore(deps): bump com.github.spotbugs:spotbugs-annotations
  • chore(deps): bump com.android.tools.build:gradle in /android
  • chore(deps): bump com.azure:azure-identity in /samples/deviceCodeSample
  • chore(deps): bump com.azure:azure-identity
  • Use parent Call.Factory of OkHttpClient to be able to use OpenTelemetry
  • Remove usage of generics
  • Update changelog and add info how to use OpenTelemetry with GraphServiceClient
    • bumps patch version
    • adds a check secret step for the sonarcloud workflow to avoid failures on PRs
  • chore(deps): bump rickstaa/action-create-tag from 1.6.6 to 1.7.1
  • chore(deps): bump com.android.tools.build:gradle in /android
  • chore(deps): bump com.github.ben-manes:gradle-versions-plugin
  • chore(deps): bump android-actions/setup-android from 3.0.0 to 3.1.0
  • chore(deps): bump com.github.spotbugs
  • chore(deps): bump android-actions/setup-android from 3.1.0 to 3.2.0
  • chore(deps): bump com.github.spotbugs:spotbugs-annotations
  • chore(deps): bump com.github.spotbugs:spotbugs-annotations in /android
  • chore(deps): bump com.github.spotbugs in /samples/deviceCodeSample
  • chore(deps): bump actions/setup-java from 3 to 4
  • chore(deps): bump com.android.tools.build:gradle in /android
    • upgrades to gradle wrapper 8.5
  • chore(deps): bump com.azure:azure-core from 1.45.0 to 1.45.1 in /android
  • chore(deps): bump com.azure:azure-core from 1.45.0 to 1.45.1
    • upgrades to gradle wrapper 8.5
  • chore(deps): bump com.azure:azure-identity in /samples/deviceCodeSample
  • chore(deps): bump com.github.spotbugs in /samples/deviceCodeSample
  • chore(deps): bump com.azure:azure-identity
  • chore(deps): bump com.github.spotbugs from 6.0.1 to 6.0.2
  • chore(deps): bump com.gradle:gradle-enterprise-gradle-plugin in /android
    • adds groups configuration
  • chore(deps): bump rickstaa/action-create-tag from 1.7.1 to 1.7.2
  • chore(deps): bump dawidd6/action-download-artifact from 2.28.0 to 3.0.0
  • chore(deps): bump com.github.spotbugs:spotbugs-annotations
  • chore(deps): bump com.github.spotbugs:spotbugs-annotations in /android
  • chore(deps): bump github/codeql-action from 2 to 3
  • chore(deps): bump com.github.spotbugs in /samples/deviceCodeSample
  • chore(deps): bump actions/upload-artifact from 3 to 4
  • chore(deps): bump com.gradle:gradle-enterprise-gradle-plugin in /android
  • chore(deps): bump com.google.guava:guava in /android
  • chore(deps): bump com.google.guava:guava from 32.1.3-jre to 33.0.0-jre
  • chore(deps): bump com.google.guava:guava from 32.1.3-jre to 33.0.0-jre
  • chore(deps): bump com.android.tools.build:gradle in /android
  • chore(deps): bump com.github.spotbugs from 6.0.4 to 6.0.5
  • chore(deps): bump com.github.spotbugs in /samples/deviceCodeSample
  • chore(deps): bump actions/cache from 3 to 4
  • chore(deps): bump anton-yurchenko/git-release from 5.0 to 6.0
  • chore(deps): bump com.github.ben-manes:gradle-versions-plugin
  • chore(deps): bump com.android.tools.build:gradle in /android
  • chore(deps): bump com.github.spotbugs
  • chore(deps): bump com.gradle:gradle-enterprise-gradle-plugin in /android
  • chore(deps): bump com.azure:azure-core from 1.45.1 to 1.46.0
  • chore(deps): bump org.junit.jupiter:junit-jupiter-engine in /android
  • chore(deps): bump org.junit.jupiter:junit-jupiter-engine
  • chore(deps): bump org.junit.jupiter:junit-jupiter-params in /android
  • chore(deps): bump org.junit.jupiter:junit-jupiter-params
  • chore(deps): bump org.junit.jupiter:junit-jupiter-api in /android
  • chore(deps-dev): bump org.junit.jupiter:junit-jupiter-api
  • chore(deps-dev): bump org.junit.jupiter:junit-jupiter-params
  • chore(deps): bump com.azure:azure-core from 1.45.1 to 1.46.0
  • chore(deps): bump com.azure:azure-identity in /samples/deviceCodeSample
  • chore(deps): bump com.azure:azure-identity

baywet and others added 30 commits April 17, 2023 16:50
Bumps com.github.spotbugs from 5.1.5 to 5.2.0.

---
updated-dependencies:
- dependency-name: com.github.spotbugs
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps com.github.spotbugs from 5.1.5 to 5.2.0.

---
updated-dependencies:
- dependency-name: com.github.spotbugs
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…s/interactiveBrowserSample/com.github.spotbugs-5.2.0

chore(deps): bump com.github.spotbugs from 5.1.5 to 5.2.0 in /samples/interactiveBrowserSample
…s/deviceCodeSample/com.github.spotbugs-5.2.0

chore(deps): bump com.github.spotbugs from 5.1.5 to 5.2.0 in /samples/deviceCodeSample
Bumps [rickstaa/action-create-tag](https://github.com/rickstaa/action-create-tag) from 1.6.3 to 1.6.4.
- [Release notes](https://github.com/rickstaa/action-create-tag/releases)
- [Commits](rickstaa/action-create-tag@v1.6.3...v1.6.4)

---
updated-dependencies:
- dependency-name: rickstaa/action-create-tag
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…s/rickstaa/action-create-tag-1.6.4

chore(deps): bump rickstaa/action-create-tag from 1.6.3 to 1.6.4
Bumps [com.squareup.okhttp3:okhttp](https://github.com/square/okhttp) from 4.11.0 to 4.12.0.
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](square/okhttp@parent-4.11.0...parent-4.12.0)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…areup.okhttp3-okhttp-4.12.0

chore(deps): bump com.squareup.okhttp3:okhttp from 4.11.0 to 4.12.0
Bumps [com.squareup.okhttp3:okhttp](https://github.com/square/okhttp) from 4.11.0 to 4.12.0.
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](square/okhttp@parent-4.11.0...parent-4.12.0)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [com.squareup.okhttp3:okhttp](https://github.com/square/okhttp) from 4.11.0 to 4.12.0.
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](square/okhttp@parent-4.11.0...parent-4.12.0)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…d/com.squareup.okhttp3-okhttp-4.12.0

chore(deps): bump com.squareup.okhttp3:okhttp from 4.11.0 to 4.12.0 in /android
…uareup.okhttp3-okhttp-4.12.0

chore(deps): bump com.squareup.okhttp3:okhttp from 4.11.0 to 4.12.0
Bumps [com.azure:azure-core](https://github.com/Azure/azure-sdk-for-java) from 1.44.0 to 1.44.1.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](Azure/azure-sdk-for-java@azure-core_1.44.0...azure-core_1.44.1)

---
updated-dependencies:
- dependency-name: com.azure:azure-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [com.azure:azure-core](https://github.com/Azure/azure-sdk-for-java) from 1.44.0 to 1.44.1.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](Azure/azure-sdk-for-java@azure-core_1.44.0...azure-core_1.44.1)

---
updated-dependencies:
- dependency-name: com.azure:azure-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…ure-azure-core-1.44.1

chore(deps): bump com.azure:azure-core from 1.44.0 to 1.44.1
…d/com.azure-azure-core-1.44.1

chore(deps): bump com.azure:azure-core from 1.44.0 to 1.44.1 in /android
Bumps [com.azure:azure-identity](https://github.com/Azure/azure-sdk-for-java) from 1.10.3 to 1.10.4.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](Azure/azure-sdk-for-java@azure-identity_1.10.3...azure-identity_1.10.4)

---
updated-dependencies:
- dependency-name: com.azure:azure-identity
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…s/interactiveBrowserSample/com.azure-azure-identity-1.10.4

chore(deps): bump com.azure:azure-identity from 1.10.3 to 1.10.4 in /samples/interactiveBrowserSample
Bumps [com.azure:azure-core](https://github.com/Azure/azure-sdk-for-java) from 1.44.0 to 1.44.1.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](Azure/azure-sdk-for-java@azure-core_1.44.0...azure-core_1.44.1)

---
updated-dependencies:
- dependency-name: com.azure:azure-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…re-azure-core-1.44.1

chore(deps): bump com.azure:azure-core from 1.44.0 to 1.44.1
Bumps [com.azure:azure-identity](https://github.com/Azure/azure-sdk-for-java) from 1.10.3 to 1.10.4.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](Azure/azure-sdk-for-java@azure-identity_1.10.3...azure-identity_1.10.4)

---
updated-dependencies:
- dependency-name: com.azure:azure-identity
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…s/deviceCodeSample/com.azure-azure-identity-1.10.4

chore(deps): bump com.azure:azure-identity from 1.10.3 to 1.10.4 in /samples/deviceCodeSample
Bumps com.github.spotbugs from 5.2.0 to 5.2.1.

---
updated-dependencies:
- dependency-name: com.github.spotbugs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…s/deviceCodeSample/com.github.spotbugs-5.2.1

chore(deps): bump com.github.spotbugs from 5.2.0 to 5.2.1 in /samples/deviceCodeSample
Update changelog for version 2.0.20
andrueastman and others added 23 commits February 5, 2024 12:12
…ure-azure-core-1.46.0

chore(deps): bump com.azure:azure-core from 1.45.1 to 1.46.0
Bumps [org.junit.jupiter:junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.10.1 to 5.10.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit-framework@r5.10.1...r5.10.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [org.junit.jupiter:junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.10.1 to 5.10.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit-framework@r5.10.1...r5.10.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…nit.jupiter-junit-jupiter-engine-5.10.2

chore(deps): bump org.junit.jupiter:junit-jupiter-engine from 5.10.1 to 5.10.2
Bumps [org.junit.jupiter:junit-jupiter-params](https://github.com/junit-team/junit5) from 5.10.1 to 5.10.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit-framework@r5.10.1...r5.10.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-params
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [org.junit.jupiter:junit-jupiter-params](https://github.com/junit-team/junit5) from 5.10.1 to 5.10.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit-framework@r5.10.1...r5.10.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-params
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…d/org.junit.jupiter-junit-jupiter-engine-5.10.2

chore(deps): bump org.junit.jupiter:junit-jupiter-engine from 5.10.1 to 5.10.2 in /android
…nit.jupiter-junit-jupiter-params-5.10.2

chore(deps): bump org.junit.jupiter:junit-jupiter-params from 5.10.1 to 5.10.2
…d/org.junit.jupiter-junit-jupiter-params-5.10.2

chore(deps): bump org.junit.jupiter:junit-jupiter-params from 5.10.1 to 5.10.2 in /android
Bumps [org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit5) from 5.10.1 to 5.10.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit-framework@r5.10.1...r5.10.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…d/org.junit.jupiter-junit-jupiter-api-5.10.2

chore(deps): bump org.junit.jupiter:junit-jupiter-api from 5.10.1 to 5.10.2 in /android
Bumps [org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit5) from 5.10.1 to 5.10.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit-framework@r5.10.1...r5.10.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…it.jupiter-junit-jupiter-api-5.10.2

chore(deps-dev): bump org.junit.jupiter:junit-jupiter-api from 5.10.1 to 5.10.2
Bumps [org.junit.jupiter:junit-jupiter-params](https://github.com/junit-team/junit5) from 5.10.1 to 5.10.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit-framework@r5.10.1...r5.10.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-params
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…it.jupiter-junit-jupiter-params-5.10.2

chore(deps-dev): bump org.junit.jupiter:junit-jupiter-params from 5.10.1 to 5.10.2
Bumps [com.azure:azure-core](https://github.com/Azure/azure-sdk-for-java) from 1.45.1 to 1.46.0.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](Azure/azure-sdk-for-java@azure-core_1.45.1...azure-core_1.46.0)

---
updated-dependencies:
- dependency-name: com.azure:azure-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…re-azure-core-1.46.0

chore(deps): bump com.azure:azure-core from 1.45.1 to 1.46.0
Bumps [com.azure:azure-identity](https://github.com/Azure/azure-sdk-for-java) from 1.11.1 to 1.11.2.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](Azure/azure-sdk-for-java@azure-identity_1.11.1...azure-identity_1.11.2)

---
updated-dependencies:
- dependency-name: com.azure:azure-identity
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…s/deviceCodeSample/com.azure-azure-identity-1.11.2

chore(deps): bump com.azure:azure-identity from 1.11.1 to 1.11.2 in /samples/deviceCodeSample
Bumps [com.azure:azure-identity](https://github.com/Azure/azure-sdk-for-java) from 1.11.1 to 1.11.2.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](Azure/azure-sdk-for-java@azure-identity_1.11.1...azure-identity_1.11.2)

---
updated-dependencies:
- dependency-name: com.azure:azure-identity
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…s/interactiveBrowserSample/com.azure-azure-identity-1.11.2

chore(deps): bump com.azure:azure-identity from 1.11.1 to 1.11.2 in /samples/interactiveBrowserSample
@baywet baywet requested a review from a team as a code owner February 7, 2024 20:36
@baywet baywet self-assigned this Feb 7, 2024
@baywet baywet enabled auto-merge February 7, 2024 20:36
@sonarqubecloud
Copy link

sonarqubecloud bot commented Feb 7, 2024

Quality Gate Passed Quality Gate passed

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

@baywet baywet merged commit e08fff1 into v3/longTermBranch Feb 7, 2024
@baywet baywet deleted the release/v3 branch February 7, 2024 20:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants