From 0ed6609dfa350a788abe75dbb3dd8fc1e03440b9 Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Mon, 12 Feb 2024 15:14:24 -0800 Subject: [PATCH 01/18] workflow cleanup --- .github/dependabot.yml | 4 -- ...sgraph-sdk-java-core-branch-protection.yml | 39 ------------------- .github/workflows/api-level-lint.yml | 2 - .github/workflows/build-and-publish.yml | 4 +- .github/workflows/codeql-analysis.yml | 4 +- .github/workflows/gradle-build.yml | 2 +- .github/workflows/sonarcloud.yml | 1 - 7 files changed, 5 insertions(+), 51 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index df00628c..5e489af7 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -44,7 +44,6 @@ updates: open-pull-requests-limit: 10 - package-ecosystem: gradle directory: "/" - target-branch: v3/longTermBranch schedule: interval: daily open-pull-requests-limit: 10 @@ -54,7 +53,6 @@ updates: - "*kiota*" - package-ecosystem: gradle directory: "/android" - target-branch: v3/longTermBranch schedule: interval: daily open-pull-requests-limit: 10 @@ -64,7 +62,6 @@ updates: - "*kiota*" - package-ecosystem: maven directory: "/" - target-branch: v3/longTermBranch schedule: interval: daily open-pull-requests-limit: 10 @@ -74,7 +71,6 @@ updates: - "*kiota*" - package-ecosystem: github-actions directory: "/" - target-branch: v3/longTermBranch schedule: interval: daily open-pull-requests-limit: 10 diff --git a/.github/policies/msgraph-sdk-java-core-branch-protection.yml b/.github/policies/msgraph-sdk-java-core-branch-protection.yml index 7f17e970..b3fadec8 100644 --- a/.github/policies/msgraph-sdk-java-core-branch-protection.yml +++ b/.github/policies/msgraph-sdk-java-core-branch-protection.yml @@ -84,42 +84,3 @@ configuration: restrictsPushes: false # Restrict who can dismiss pull request reviews. boolean restrictsReviewDismissals: false - - - branchNamePattern: v3/longTermBranch - # This branch pattern applies to the following branches as of 06/12/2023 10:31:16: - # v3/longTermBranch - - # Specifies whether this branch can be deleted. boolean - allowsDeletions: false - # Specifies whether forced pushes are allowed on this branch. boolean - allowsForcePushes: false - # Specifies whether new commits pushed to the matching branches dismiss pull request review approvals. boolean - dismissStaleReviews: true - # Specifies whether admins can overwrite branch protection. boolean - isAdminEnforced: false - # Indicates whether "Require a pull request before merging" is enabled. boolean - requiresPullRequestBeforeMerging: true - # Specifies the number of pull request reviews before merging. int (0-6). Should be null/empty if PRs are not required - requiredApprovingReviewsCount: 1 - # Require review from Code Owners. Requires requiredApprovingReviewsCount. boolean - requireCodeOwnersReview: true - # Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines. - requiresCommitSignatures: false - # Are conversations required to be resolved before merging? boolean - requiresConversationResolution: true - # Are merge commits prohibited from being pushed to this branch. boolean - requiresLinearHistory: false - # Required status checks to pass before merging. Values can be any string, but if the value does not correspond to any existing status check, the status check will be stuck on pending for status since nothing exists to push an actual status - requiredStatusChecks: - - Analyze (java) - - Build - - build - - license/cla - - lint-api-level - # Require branches to be up to date before merging. Requires requiredStatusChecks. boolean - requiresStrictStatusChecks: true - # Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush. - restrictsPushes: false - # Restrict who can dismiss pull request reviews. boolean - restrictsReviewDismissals: false - diff --git a/.github/workflows/api-level-lint.yml b/.github/workflows/api-level-lint.yml index 95f2863e..12dc6f39 100644 --- a/.github/workflows/api-level-lint.yml +++ b/.github/workflows/api-level-lint.yml @@ -6,12 +6,10 @@ on: branches: - dev - master - - v3/longTermBranch pull_request: branches: - dev - master - - v3/longTermBranch jobs: lint-api-level: diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index eb42bbbd..4a79c3c3 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -2,7 +2,7 @@ name: Build and Publish on: push: - branches: [ dev , master, v3/longTermBranch ] + branches: [ dev , master] paths-ignore: - '.gradle/wrapper' - '.gitignore' @@ -15,7 +15,7 @@ env: jobs: maven_Preview: - if: ${{ github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/v3/longTermBranch'}} + if: ${{ github.ref == 'refs/heads/dev' }} environment: name: maven_central_snapshot runs-on: ubuntu-latest diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 2af747ed..fd49b1ed 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,10 +13,10 @@ name: "CodeQL" on: push: - branches: ["dev", "master", "v3/longTermBranch"] + branches: ["dev", "master"] pull_request: # The branches below must be a subset of the branches above - branches: ["dev", "v3/longTermBranch"] + branches: ["dev"] schedule: - cron: '0 1 * * 4' workflow_dispatch: diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml index 515791a2..bec5c20d 100644 --- a/.github/workflows/gradle-build.yml +++ b/.github/workflows/gradle-build.yml @@ -2,7 +2,7 @@ name: Java CI with Gradle on: pull_request: - branches: [ dev, master, v3/longTermBranch ] + branches: [ dev, master ] paths-ignore: - '.gradle/wrapper' - '.gitignore' diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 4f38cc49..8a8faada 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -5,7 +5,6 @@ on: branches: - master - dev - - feature/v2 pull_request: types: [opened, synchronize, reopened] From 0be9cab8257aade3b17293ccf994255b44521c5e Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Mon, 12 Feb 2024 16:04:51 -0800 Subject: [PATCH 02/18] standardize branch triggers --- .github/workflows/api-level-lint.yml | 8 ++------ .github/workflows/build-and-publish.yml | 2 +- .github/workflows/codeql-analysis.yml | 4 ++-- .github/workflows/conflicting-pr-label.yml | 4 ++-- .github/workflows/gradle-build.yml | 2 +- .github/workflows/sonarcloud.yml | 4 +--- 6 files changed, 9 insertions(+), 15 deletions(-) diff --git a/.github/workflows/api-level-lint.yml b/.github/workflows/api-level-lint.yml index 12dc6f39..31155861 100644 --- a/.github/workflows/api-level-lint.yml +++ b/.github/workflows/api-level-lint.yml @@ -3,13 +3,9 @@ name: "Checks the SDK only using APIs from the targeted API level" on: workflow_dispatch: push: - branches: - - dev - - master + branches: [dev, master] pull_request: - branches: - - dev - - master + branches: [dev, master] jobs: lint-api-level: diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index 4a79c3c3..37466ce4 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -2,7 +2,7 @@ name: Build and Publish on: push: - branches: [ dev , master] + branches: [dev, master] paths-ignore: - '.gradle/wrapper' - '.gitignore' diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index fd49b1ed..c1ebb819 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,10 +13,10 @@ name: "CodeQL" on: push: - branches: ["dev", "master"] + branches: [dev, master] pull_request: # The branches below must be a subset of the branches above - branches: ["dev"] + branches: [dev] schedule: - cron: '0 1 * * 4' workflow_dispatch: diff --git a/.github/workflows/conflicting-pr-label.yml b/.github/workflows/conflicting-pr-label.yml index c8ba2b21..9109f777 100644 --- a/.github/workflows/conflicting-pr-label.yml +++ b/.github/workflows/conflicting-pr-label.yml @@ -7,10 +7,10 @@ name: PullRequestConflicting on: workflow_dispatch: push: - branches: [ master, dev ] + branches: [master, dev] pull_request: types: [synchronize] - branches: [ master, dev ] + branches: [master, dev] # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml index bec5c20d..07fa101b 100644 --- a/.github/workflows/gradle-build.yml +++ b/.github/workflows/gradle-build.yml @@ -2,7 +2,7 @@ name: Java CI with Gradle on: pull_request: - branches: [ dev, master ] + branches: [dev, master] paths-ignore: - '.gradle/wrapper' - '.gitignore' diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 8a8faada..b296feee 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -2,9 +2,7 @@ name: Static analysis with SonarCloud on: workflow_dispatch: push: - branches: - - master - - dev + branches: [master, dev] pull_request: types: [opened, synchronize, reopened] From 4a4bf585d67e2696094bf069f9ea85e7473e292f Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Tue, 13 Feb 2024 11:04:24 -0800 Subject: [PATCH 03/18] clear duplicates from dependabot, add publish permissions --- .github/dependabot.yml | 42 ------------------------- .github/workflows/build-and-publish.yml | 2 ++ 2 files changed, 2 insertions(+), 42 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 5e489af7..70f5420e 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,47 +1,5 @@ version: 2 updates: -- package-ecosystem: gradle - directory: "/" - schedule: - interval: daily - open-pull-requests-limit: 10 - groups: - kiota-dependencies: - patterns: - - "*kiota*" -- package-ecosystem: gradle - directory: "/android" - schedule: - interval: daily - open-pull-requests-limit: 10 - groups: - kiota-dependencies: - patterns: - - "*kiota*" -- package-ecosystem: gradle - directory: "/samples/deviceCodeSample" - schedule: - interval: daily - open-pull-requests-limit: 10 -- package-ecosystem: gradle - directory: "/samples/interactiveBrowserSample" - schedule: - interval: daily - open-pull-requests-limit: 10 -- package-ecosystem: maven - directory: "/" - schedule: - interval: daily - open-pull-requests-limit: 10 - groups: - kiota-dependencies: - patterns: - - "*kiota*" -- package-ecosystem: github-actions - directory: "/" - schedule: - interval: daily - open-pull-requests-limit: 10 - package-ecosystem: gradle directory: "/" schedule: diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index 37466ce4..d57d236b 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -96,6 +96,8 @@ jobs: create_Tag: needs: maven_Release runs-on: ubuntu-latest + permissions: + contents: write env: RELEASE_TAG: "" steps: From 4aaf841175f3ebffcbe2e4d3bd44e9beddc4d9f1 Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Tue, 13 Feb 2024 11:15:20 -0800 Subject: [PATCH 04/18] java 21 bump --- .github/workflows/api-level-lint.yml | 2 +- .github/workflows/build-and-publish.yml | 4 ++-- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/gradle-build.yml | 2 +- .github/workflows/sonarcloud.yml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/api-level-lint.yml b/.github/workflows/api-level-lint.yml index 31155861..2611faf9 100644 --- a/.github/workflows/api-level-lint.yml +++ b/.github/workflows/api-level-lint.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 20 + java-version: 21 - name: Setup Android SDK uses: android-actions/setup-android@v3.2.0 - name: Add execution right to the script diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index d57d236b..db9f633f 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -26,7 +26,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v4 with: - java-version: 20 + java-version: 21 distribution: 'temurin' cache: gradle - name: Download file @@ -58,7 +58,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v4 with: - java-version: 20 + java-version: 21 distribution: 'temurin' cache: gradle - name: Download file diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index c1ebb819..f0e71308 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -47,7 +47,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v4 with: - java-version: 20 + java-version: 21 distribution: 'temurin' cache: gradle diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml index 07fa101b..42187cac 100644 --- a/.github/workflows/gradle-build.yml +++ b/.github/workflows/gradle-build.yml @@ -19,7 +19,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v4 with: - java-version: 20 + java-version: 21 distribution: 'temurin' cache: gradle - name: Easy detect-secrets diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index b296feee..d49d959b 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -32,7 +32,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v4 with: - java-version: 20 + java-version: 21 distribution: 'temurin' cache: gradle - name: Cache SonarCloud packages From 7c8ef1b0743341986432a62600b0715ac355fad9 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Tue, 13 Feb 2024 14:16:40 -0500 Subject: [PATCH 05/18] Delete .github/workflows/projectsbot.yml --- .github/workflows/projectsbot.yml | 87 ------------------------------- 1 file changed, 87 deletions(-) delete mode 100644 .github/workflows/projectsbot.yml diff --git a/.github/workflows/projectsbot.yml b/.github/workflows/projectsbot.yml deleted file mode 100644 index 6f1e8ff5..00000000 --- a/.github/workflows/projectsbot.yml +++ /dev/null @@ -1,87 +0,0 @@ -# This workflow is used to add new issues to GitHub Projects (Beta) - -name: Add PR to project -on: - issues: - types: - - opened -jobs: - track_issue: - runs-on: ubuntu-latest - steps: - - name: Generate token - id: generate_token - uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a - with: - app_id: ${{ secrets.GRAPHBOT_APP_ID }} - private_key: ${{ secrets.GRAPHBOT_APP_PEM }} - - - name: Get project data - env: - GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }} - ORGANIZATION: microsoftgraph - PROJECT_NUMBER: 25 - run: | - gh api graphql -f query=' - query($org: String!, $number: Int!) { - organization(login: $org){ - projectV2(number: $number) { - id - fields(first:20) { - nodes { - ... on ProjectV2SingleSelectField { - id - name - options { - id - name - } - } - } - } - } - } - }' -f org=$ORGANIZATION -F number=$PROJECT_NUMBER > project_data.json - - echo 'PROJECT_ID='$(jq '.data.organization.projectV2.id' project_data.json) >> $GITHUB_ENV - echo 'STATUS_FIELD_ID='$(jq '.data.organization.projectV2.fields.nodes[] | select(.name== "Status") | .id' project_data.json) >> $GITHUB_ENV - echo 'TRIAGE_OPTION_ID='$(jq '.data.organization.projectV2.fields.nodes[] | select(.name== "Status") | .options[] | select(.name=="Needs Triage 🔍") |.id' project_data.json) >> $GITHUB_ENV - - - name: Add Issue to project - env: - GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }} - ISSUE_ID: ${{ github.event.issue.node_id }} - run: | - item_id="$( gh api graphql -f query=' - mutation($project:ID!, $issue:ID!) { - addProjectV2ItemById(input: {projectId: $project, contentId: $issue}) { - item { - id - } - } - }' -f project=$PROJECT_ID -f issue=$ISSUE_ID --jq '.data.addProjectV2ItemById.item.id')" - - echo 'ITEM_ID='$item_id >> $GITHUB_ENV - - - name: Set Triage - env: - GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }} - run: | - gh api graphql -f query=' - mutation ( - $project: ID! - $item: ID! - $status_field: ID! - $status_value: String! - ) { - set_status: updateProjectV2ItemFieldValue(input: { - projectId: $project - itemId: $item - fieldId: $status_field - value: {singleSelectOptionId: $status_value} - }) { - projectV2Item { - id - } - } - }' -f project=$PROJECT_ID -f item=$ITEM_ID -f status_field=$STATUS_FIELD_ID -f status_value=${{ env.TRIAGE_OPTION_ID }} --silent From 20c3540731f9d038eecda9a26e2a283758984851 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Feb 2024 08:58:26 +0000 Subject: [PATCH 06/18] chore(deps): bump the kiota-dependencies group Bumps the kiota-dependencies group in /android with 7 updates: | Package | From | To | | --- | --- | --- | | [com.microsoft.kiota:microsoft-kiota-abstractions](https://github.com/microsoft/kiota-java) | `1.0.1` | `1.0.2` | | [com.microsoft.kiota:microsoft-kiota-authentication-azure](https://github.com/microsoft/kiota-java) | `1.0.1` | `1.0.2` | | [com.microsoft.kiota:microsoft-kiota-http-okHttp](https://github.com/microsoft/kiota-java) | `1.0.1` | `1.0.2` | | [com.microsoft.kiota:microsoft-kiota-serialization-json](https://github.com/microsoft/kiota-java) | `1.0.1` | `1.0.2` | | [com.microsoft.kiota:microsoft-kiota-serialization-text](https://github.com/microsoft/kiota-java) | `1.0.1` | `1.0.2` | | [com.microsoft.kiota:microsoft-kiota-serialization-form](https://github.com/microsoft/kiota-java) | `1.0.1` | `1.0.2` | | [com.microsoft.kiota:microsoft-kiota-serialization-multipart](https://github.com/microsoft/kiota-java) | `1.0.1` | `1.0.2` | Updates `com.microsoft.kiota:microsoft-kiota-abstractions` from 1.0.1 to 1.0.2 - [Release notes](https://github.com/microsoft/kiota-java/releases) - [Changelog](https://github.com/microsoft/kiota-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/microsoft/kiota-java/compare/v1.0.1...v1.0.2) Updates `com.microsoft.kiota:microsoft-kiota-authentication-azure` from 1.0.1 to 1.0.2 - [Release notes](https://github.com/microsoft/kiota-java/releases) - [Changelog](https://github.com/microsoft/kiota-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/microsoft/kiota-java/compare/v1.0.1...v1.0.2) Updates `com.microsoft.kiota:microsoft-kiota-http-okHttp` from 1.0.1 to 1.0.2 - [Release notes](https://github.com/microsoft/kiota-java/releases) - [Changelog](https://github.com/microsoft/kiota-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/microsoft/kiota-java/compare/v1.0.1...v1.0.2) Updates `com.microsoft.kiota:microsoft-kiota-serialization-json` from 1.0.1 to 1.0.2 - [Release notes](https://github.com/microsoft/kiota-java/releases) - [Changelog](https://github.com/microsoft/kiota-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/microsoft/kiota-java/compare/v1.0.1...v1.0.2) Updates `com.microsoft.kiota:microsoft-kiota-serialization-text` from 1.0.1 to 1.0.2 - [Release notes](https://github.com/microsoft/kiota-java/releases) - [Changelog](https://github.com/microsoft/kiota-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/microsoft/kiota-java/compare/v1.0.1...v1.0.2) Updates `com.microsoft.kiota:microsoft-kiota-serialization-form` from 1.0.1 to 1.0.2 - [Release notes](https://github.com/microsoft/kiota-java/releases) - [Changelog](https://github.com/microsoft/kiota-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/microsoft/kiota-java/compare/v1.0.1...v1.0.2) Updates `com.microsoft.kiota:microsoft-kiota-serialization-multipart` from 1.0.1 to 1.0.2 - [Release notes](https://github.com/microsoft/kiota-java/releases) - [Changelog](https://github.com/microsoft/kiota-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/microsoft/kiota-java/compare/v1.0.1...v1.0.2) --- updated-dependencies: - dependency-name: com.microsoft.kiota:microsoft-kiota-abstractions dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kiota-dependencies - dependency-name: com.microsoft.kiota:microsoft-kiota-authentication-azure dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kiota-dependencies - dependency-name: com.microsoft.kiota:microsoft-kiota-http-okHttp dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kiota-dependencies - dependency-name: com.microsoft.kiota:microsoft-kiota-serialization-json dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kiota-dependencies - dependency-name: com.microsoft.kiota:microsoft-kiota-serialization-text dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kiota-dependencies - dependency-name: com.microsoft.kiota:microsoft-kiota-serialization-form dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kiota-dependencies - dependency-name: com.microsoft.kiota:microsoft-kiota-serialization-multipart dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kiota-dependencies ... Signed-off-by: dependabot[bot] --- gradle/dependencies.gradle | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 76cf070b..886abf24 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -16,11 +16,11 @@ dependencies { api 'com.squareup.okhttp3:okhttp:4.12.0' api 'com.azure:azure-core:1.46.0' - api 'com.microsoft.kiota:microsoft-kiota-abstractions:1.0.1' - implementation 'com.microsoft.kiota:microsoft-kiota-authentication-azure:1.0.1' - implementation 'com.microsoft.kiota:microsoft-kiota-http-okHttp:1.0.1' - implementation 'com.microsoft.kiota:microsoft-kiota-serialization-json:1.0.1' - implementation 'com.microsoft.kiota:microsoft-kiota-serialization-text:1.0.1' - implementation 'com.microsoft.kiota:microsoft-kiota-serialization-form:1.0.1' - implementation 'com.microsoft.kiota:microsoft-kiota-serialization-multipart:1.0.1' + api 'com.microsoft.kiota:microsoft-kiota-abstractions:1.0.2' + implementation 'com.microsoft.kiota:microsoft-kiota-authentication-azure:1.0.2' + implementation 'com.microsoft.kiota:microsoft-kiota-http-okHttp:1.0.2' + implementation 'com.microsoft.kiota:microsoft-kiota-serialization-json:1.0.2' + implementation 'com.microsoft.kiota:microsoft-kiota-serialization-text:1.0.2' + implementation 'com.microsoft.kiota:microsoft-kiota-serialization-form:1.0.2' + implementation 'com.microsoft.kiota:microsoft-kiota-serialization-multipart:1.0.2' } From 5a429f439918a9aa41deb651e01194e3143fa9ba Mon Sep 17 00:00:00 2001 From: Philip Gichuhi Date: Wed, 14 Feb 2024 14:08:12 +0300 Subject: [PATCH 07/18] Bump version & update CHANGELOG --- CHANGELOG.md | 6 ++++++ gradle.properties | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ec67b6a..d7bb7f1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +## [3.1.3] - 2024-02-14 + +### Changed + +- Bumps Kiota-Java abstractions, authentication, http, and serialization components + ## [3.1.2] - 2024-02-12 ### Changed diff --git a/gradle.properties b/gradle.properties index 97509fd1..bb163d80 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,7 +25,7 @@ mavenGroupId = com.microsoft.graph mavenArtifactId = microsoft-graph-core mavenMajorVersion = 3 mavenMinorVersion = 1 -mavenPatchVersion = 2 +mavenPatchVersion = 3 mavenArtifactSuffix = #These values are used to run functional tests From b8bbb8c224df4e500f6ea45bf8db45403569336b Mon Sep 17 00:00:00 2001 From: Ramses Sanchez-Hernandez <63934382+ramsessanchez@users.noreply.github.com> Date: Wed, 14 Feb 2024 12:23:50 -0800 Subject: [PATCH 08/18] Branch Protection for support/2.x.x --- ...sgraph-sdk-java-core-branch-protection.yml | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/.github/policies/msgraph-sdk-java-core-branch-protection.yml b/.github/policies/msgraph-sdk-java-core-branch-protection.yml index b3fadec8..76f0e62b 100644 --- a/.github/policies/msgraph-sdk-java-core-branch-protection.yml +++ b/.github/policies/msgraph-sdk-java-core-branch-protection.yml @@ -84,3 +84,41 @@ configuration: restrictsPushes: false # Restrict who can dismiss pull request reviews. boolean restrictsReviewDismissals: false + + - branchNamePattern: support/2.x.x + # This branch pattern applies to the following branches as of 06/12/2023 10:31:16: + # dev + + # Specifies whether this branch can be deleted. boolean + allowsDeletions: false + # Specifies whether forced pushes are allowed on this branch. boolean + allowsForcePushes: false + # Specifies whether new commits pushed to the matching branches dismiss pull request review approvals. boolean + dismissStaleReviews: true + # Specifies whether admins can overwrite branch protection. boolean + isAdminEnforced: false + # Indicates whether "Require a pull request before merging" is enabled. boolean + requiresPullRequestBeforeMerging: true + # Specifies the number of pull request reviews before merging. int (0-6). Should be null/empty if PRs are not required + requiredApprovingReviewsCount: 1 + # Require review from Code Owners. Requires requiredApprovingReviewsCount. boolean + requireCodeOwnersReview: true + # Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines. + requiresCommitSignatures: false + # Are conversations required to be resolved before merging? boolean + requiresConversationResolution: true + # Are merge commits prohibited from being pushed to this branch. boolean + requiresLinearHistory: false + # Required status checks to pass before merging. Values can be any string, but if the value does not correspond to any existing status check, the status check will be stuck on pending for status since nothing exists to push an actual status + requiredStatusChecks: + - license/cla + - Build + - lint-api-level + - Analyze (java) + - build + # Require branches to be up to date before merging. Requires requiredStatusChecks. boolean + requiresStrictStatusChecks: true + # Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush. + restrictsPushes: false + # Restrict who can dismiss pull request reviews. boolean + restrictsReviewDismissals: false From 7f842e83e27234de9404f645f09db84a1d01f8b6 Mon Sep 17 00:00:00 2001 From: Ramses Sanchez-Hernandez <63934382+ramsessanchez@users.noreply.github.com> Date: Wed, 14 Feb 2024 12:24:58 -0800 Subject: [PATCH 09/18] Update msgraph-sdk-java-core-branch-protection.yml --- .github/policies/msgraph-sdk-java-core-branch-protection.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/policies/msgraph-sdk-java-core-branch-protection.yml b/.github/policies/msgraph-sdk-java-core-branch-protection.yml index 76f0e62b..55f1339e 100644 --- a/.github/policies/msgraph-sdk-java-core-branch-protection.yml +++ b/.github/policies/msgraph-sdk-java-core-branch-protection.yml @@ -86,8 +86,8 @@ configuration: restrictsReviewDismissals: false - branchNamePattern: support/2.x.x - # This branch pattern applies to the following branches as of 06/12/2023 10:31:16: - # dev + # This branch pattern applies to the following branches as of 2/14/2024 12:24 + # support/2.x.x # Specifies whether this branch can be deleted. boolean allowsDeletions: false From 44f9788025fb39c5f98399044edd055989b7ba71 Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Wed, 14 Feb 2024 13:10:01 -0800 Subject: [PATCH 10/18] java 20 revert --- .github/workflows/api-level-lint.yml | 2 +- .github/workflows/build-and-publish.yml | 4 ++-- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/gradle-build.yml | 2 +- .github/workflows/sonarcloud.yml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/api-level-lint.yml b/.github/workflows/api-level-lint.yml index 2611faf9..31155861 100644 --- a/.github/workflows/api-level-lint.yml +++ b/.github/workflows/api-level-lint.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 21 + java-version: 20 - name: Setup Android SDK uses: android-actions/setup-android@v3.2.0 - name: Add execution right to the script diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index db9f633f..d57d236b 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -26,7 +26,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v4 with: - java-version: 21 + java-version: 20 distribution: 'temurin' cache: gradle - name: Download file @@ -58,7 +58,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v4 with: - java-version: 21 + java-version: 20 distribution: 'temurin' cache: gradle - name: Download file diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index f0e71308..c1ebb819 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -47,7 +47,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v4 with: - java-version: 21 + java-version: 20 distribution: 'temurin' cache: gradle diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml index 42187cac..07fa101b 100644 --- a/.github/workflows/gradle-build.yml +++ b/.github/workflows/gradle-build.yml @@ -19,7 +19,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v4 with: - java-version: 21 + java-version: 20 distribution: 'temurin' cache: gradle - name: Easy detect-secrets diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index d49d959b..b296feee 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -32,7 +32,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v4 with: - java-version: 21 + java-version: 20 distribution: 'temurin' cache: gradle - name: Cache SonarCloud packages From c5d052a0e02f0bcc3e19e041fa586f1f35ceedac Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Wed, 14 Feb 2024 13:57:02 -0800 Subject: [PATCH 11/18] add permission for gitRelease --- .github/workflows/git-release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/git-release.yml b/.github/workflows/git-release.yml index aa6475c5..b792bffa 100644 --- a/.github/workflows/git-release.yml +++ b/.github/workflows/git-release.yml @@ -9,6 +9,8 @@ on: jobs: Git_Release: runs-on: ubuntu-latest + permissions: + contents: write steps: - uses: actions/checkout@v4 - name: Download Build Artifact From e1c633a7dce2eed00df6666b3fd6d1d5a71063b8 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Thu, 15 Feb 2024 07:56:25 -0500 Subject: [PATCH 12/18] Apply suggestions from code review Co-authored-by: Philip Gichuhi --- .github/workflows/api-level-lint.yml | 2 +- .github/workflows/build-and-publish.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/gradle-build.yml | 2 +- .github/workflows/sonarcloud.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/api-level-lint.yml b/.github/workflows/api-level-lint.yml index 31155861..64c8314e 100644 --- a/.github/workflows/api-level-lint.yml +++ b/.github/workflows/api-level-lint.yml @@ -3,7 +3,7 @@ name: "Checks the SDK only using APIs from the targeted API level" on: workflow_dispatch: push: - branches: [dev, master] + branches: [dev, master, support/2.x.x] pull_request: branches: [dev, master] diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index d57d236b..60228a46 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -2,7 +2,7 @@ name: Build and Publish on: push: - branches: [dev, master] + branches: [dev, master, support/2.x.x] paths-ignore: - '.gradle/wrapper' - '.gitignore' diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index c1ebb819..88afc961 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,7 +13,7 @@ name: "CodeQL" on: push: - branches: [dev, master] + branches: [dev, master, support/2.x.x] pull_request: # The branches below must be a subset of the branches above branches: [dev] diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml index 07fa101b..f774e6ec 100644 --- a/.github/workflows/gradle-build.yml +++ b/.github/workflows/gradle-build.yml @@ -2,7 +2,7 @@ name: Java CI with Gradle on: pull_request: - branches: [dev, master] + branches: [dev, master, support/2.x.x] paths-ignore: - '.gradle/wrapper' - '.gitignore' diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index b296feee..ffd5ede1 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -2,7 +2,7 @@ name: Static analysis with SonarCloud on: workflow_dispatch: push: - branches: [master, dev] + branches: [master, dev, support/2.x.x] pull_request: types: [opened, synchronize, reopened] From a1d39173c358520047c965c52af178aa0bf1954f Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Thu, 15 Feb 2024 10:38:59 -0500 Subject: [PATCH 13/18] Apply suggestions from code review Co-authored-by: Philip Gichuhi --- .github/workflows/api-level-lint.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/conflicting-pr-label.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/api-level-lint.yml b/.github/workflows/api-level-lint.yml index 64c8314e..ded91850 100644 --- a/.github/workflows/api-level-lint.yml +++ b/.github/workflows/api-level-lint.yml @@ -5,7 +5,7 @@ on: push: branches: [dev, master, support/2.x.x] pull_request: - branches: [dev, master] + branches: [dev, master, support/2.x.x] jobs: lint-api-level: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 88afc961..fbc1182d 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -16,7 +16,7 @@ on: branches: [dev, master, support/2.x.x] pull_request: # The branches below must be a subset of the branches above - branches: [dev] + branches: [dev, support/2.x.x] schedule: - cron: '0 1 * * 4' workflow_dispatch: diff --git a/.github/workflows/conflicting-pr-label.yml b/.github/workflows/conflicting-pr-label.yml index 9109f777..23b05340 100644 --- a/.github/workflows/conflicting-pr-label.yml +++ b/.github/workflows/conflicting-pr-label.yml @@ -7,10 +7,10 @@ name: PullRequestConflicting on: workflow_dispatch: push: - branches: [master, dev] + branches: [master, dev, support/2.x.x] pull_request: types: [synchronize] - branches: [master, dev] + branches: [master, dev, support/2.x.x] # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: From c4b3814bb84926e802dd5523ab1956d826335c47 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Feb 2024 05:04:09 +0000 Subject: [PATCH 14/18] chore(deps): bump dawidd6/action-download-artifact from 3.0.0 to 3.1.0 Bumps [dawidd6/action-download-artifact](https://github.com/dawidd6/action-download-artifact) from 3.0.0 to 3.1.0. - [Release notes](https://github.com/dawidd6/action-download-artifact/releases) - [Commits](https://github.com/dawidd6/action-download-artifact/compare/v3.0.0...v3.1.0) --- updated-dependencies: - dependency-name: dawidd6/action-download-artifact dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/git-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/git-release.yml b/.github/workflows/git-release.yml index b792bffa..a40d9917 100644 --- a/.github/workflows/git-release.yml +++ b/.github/workflows/git-release.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Download Build Artifact - uses: dawidd6/action-download-artifact@v3.0.0 + uses: dawidd6/action-download-artifact@v3.1.0 with: workflow: build-and-publish.yml workflow_conclusion: success From 2f63da445ad5f4ce797b6b965a4c503377482ffe Mon Sep 17 00:00:00 2001 From: Philip Gichuhi Date: Fri, 16 Feb 2024 08:15:21 +0300 Subject: [PATCH 15/18] Update dependabot automerge workflow to target --- .github/workflows/auto-merge-dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/auto-merge-dependabot.yml b/.github/workflows/auto-merge-dependabot.yml index 6e5953f5..f4c0fdee 100644 --- a/.github/workflows/auto-merge-dependabot.yml +++ b/.github/workflows/auto-merge-dependabot.yml @@ -2,7 +2,7 @@ name: Auto-merge dependabot updates on: pull_request: - branches: [ main ] + branches: [ dev ] permissions: pull-requests: write From 3575be1a533acb999b66c8ad6a2da71dd8da2220 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Feb 2024 05:17:54 +0000 Subject: [PATCH 16/18] chore(deps): bump io.github.std-uritemplate:std-uritemplate Bumps [io.github.std-uritemplate:std-uritemplate](https://github.com/std-uritemplate/std-uritemplate) from 0.0.52 to 0.0.53. - [Commits](https://github.com/std-uritemplate/std-uritemplate/compare/0.0.52...0.0.53) --- updated-dependencies: - dependency-name: io.github.std-uritemplate:std-uritemplate dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 886abf24..9a407bcc 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -7,7 +7,7 @@ dependencies { testImplementation 'io.opentelemetry:opentelemetry-api:1.35.0' testImplementation 'io.opentelemetry:opentelemetry-context:1.35.0' testImplementation 'io.opentelemetry.semconv:opentelemetry-semconv:1.23.1-alpha' - testImplementation 'io.github.std-uritemplate:std-uritemplate:0.0.52' + testImplementation 'io.github.std-uritemplate:std-uritemplate:0.0.53' implementation 'com.google.code.gson:gson:2.10.1' From 00ee394c725ae5e7ed045d30e4bb629cb36456f6 Mon Sep 17 00:00:00 2001 From: Ramses Sanchez-Hernandez <63934382+ramsessanchez@users.noreply.github.com> Date: Thu, 15 Feb 2024 22:22:12 -0800 Subject: [PATCH 17/18] Update CoreConstants.java 3.1.3 --- src/main/java/com/microsoft/graph/core/CoreConstants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/microsoft/graph/core/CoreConstants.java b/src/main/java/com/microsoft/graph/core/CoreConstants.java index 67e611d8..dee9d424 100644 --- a/src/main/java/com/microsoft/graph/core/CoreConstants.java +++ b/src/main/java/com/microsoft/graph/core/CoreConstants.java @@ -14,7 +14,7 @@ private CoreConstants() {} private static class VersionValues { private static final int MAJOR = 3; private static final int MINOR = 1; - private static final int PATCH = 2; + private static final int PATCH = 3; } /** From 487b43d29119b81f3319c03495a3ae852d2e9891 Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Thu, 15 Feb 2024 22:24:41 -0800 Subject: [PATCH 18/18] Constants --- readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/readme.md b/readme.md index 464339a3..ae39f133 100644 --- a/readme.md +++ b/readme.md @@ -22,7 +22,7 @@ repositories { dependencies { // Include the sdk as a dependency - implementation 'com.microsoft.graph:microsoft-graph-core:3.1.0' + implementation 'com.microsoft.graph:microsoft-graph-core:3.1.3' // This dependency is only needed if you are using the TokenCredentialAuthProvider implementation 'com.azure:azure-identity:1.11.0' } @@ -37,7 +37,7 @@ Add the dependency in `dependencies` in pom.xml com.microsoft.graph microsoft-graph-core - 3.1.0 + 3.1.3 com.azure azure-identity