Skip to content

Commit 0d72a1e

Browse files
Merge pull request #1251 from microsoftgraph/dev
Update Dependencies
2 parents 3dd51ae + 3140ef9 commit 0d72a1e

40 files changed

+378
-789
lines changed

.github/fabricbot.json

Lines changed: 0 additions & 628 deletions
This file was deleted.

.github/policies/msgraph-sdk-java-core-branch-protection.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ configuration:
2626
# Specifies the number of pull request reviews before merging. int (0-6). Should be null/empty if PRs are not required
2727
requiredApprovingReviewsCount: 1
2828
# Require review from Code Owners. Requires requiredApprovingReviewsCount. boolean
29-
requireCodeOwnersReview: false
29+
requireCodeOwnersReview: true
3030
# Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines.
3131
requiresCommitSignatures: false
3232
# Are conversations required to be resolved before merging? boolean
@@ -38,10 +38,10 @@ configuration:
3838
- license/cla
3939
- Build
4040
- lint-api-level
41-
- Analyze
41+
- Analyze (java)
4242
- build
4343
# Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
44-
requiresStrictStatusChecks: false
44+
requiresStrictStatusChecks: true
4545
# Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
4646
restrictsPushes: false
4747
# Restrict who can dismiss pull request reviews. boolean
@@ -64,7 +64,7 @@ configuration:
6464
# Specifies the number of pull request reviews before merging. int (0-6). Should be null/empty if PRs are not required
6565
requiredApprovingReviewsCount: 1
6666
# Require review from Code Owners. Requires requiredApprovingReviewsCount. boolean
67-
requireCodeOwnersReview: false
67+
requireCodeOwnersReview: true
6868
# Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines.
6969
requiresCommitSignatures: false
7070
# Are conversations required to be resolved before merging? boolean
@@ -76,10 +76,10 @@ configuration:
7676
- license/cla
7777
- Build
7878
- lint-api-level
79-
- Analyze
79+
- Analyze (java)
8080
- build
8181
# Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
82-
requiresStrictStatusChecks: false
82+
requiresStrictStatusChecks: true
8383
# Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
8484
restrictsPushes: false
8585
# Restrict who can dismiss pull request reviews. boolean
@@ -106,18 +106,18 @@ configuration:
106106
# Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines.
107107
requiresCommitSignatures: false
108108
# Are conversations required to be resolved before merging? boolean
109-
requiresConversationResolution: false
109+
requiresConversationResolution: true
110110
# Are merge commits prohibited from being pushed to this branch. boolean
111111
requiresLinearHistory: false
112112
# 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
113113
requiredStatusChecks:
114-
- Analyze
114+
- Analyze (java)
115115
- Build
116116
- build
117117
- license/cla
118118
- lint-api-level
119119
# Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
120-
requiresStrictStatusChecks: false
120+
requiresStrictStatusChecks: true
121121
# Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
122122
restrictsPushes: false
123123
# Restrict who can dismiss pull request reviews. boolean
Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
id:
2+
name: GitOps.PullRequestIssueManagement
3+
description: GitOps.PullRequestIssueManagement primitive
4+
owner:
5+
resource: repository
6+
disabled: false
7+
where:
8+
configuration:
9+
resourceManagementConfiguration:
10+
scheduledSearches:
11+
- description:
12+
frequencies:
13+
- hourly:
14+
hour: 6
15+
filters:
16+
- isIssue
17+
- isOpen
18+
- hasLabel:
19+
label: 'Needs: author feedback'
20+
- hasLabel:
21+
label: no-recent-activity
22+
- noActivitySince:
23+
days: 3
24+
- isNotLabeledWith:
25+
label: service bug
26+
actions:
27+
- closeIssue
28+
- description:
29+
frequencies:
30+
- hourly:
31+
hour: 6
32+
filters:
33+
- isIssue
34+
- isOpen
35+
- hasLabel:
36+
label: 'Needs: author feedback'
37+
- noActivitySince:
38+
days: 4
39+
- isNotLabeledWith:
40+
label: no-recent-activity
41+
actions:
42+
- addLabel:
43+
label: no-recent-activity
44+
- addReply:
45+
reply: This issue has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for **4 days**. It will be closed if no further activity occurs **within 3 days of this comment**.
46+
- description:
47+
frequencies:
48+
- hourly:
49+
hour: 6
50+
filters:
51+
- isIssue
52+
- isOpen
53+
- hasLabel:
54+
label: duplicate
55+
- noActivitySince:
56+
days: 1
57+
actions:
58+
- addReply:
59+
reply: This issue has been marked as duplicate and has not had any activity for **1 day**. It will be closed for housekeeping purposes.
60+
- closeIssue
61+
eventResponderTasks:
62+
- if:
63+
- payloadType: Issue_Comment
64+
- isAction:
65+
action: Created
66+
- isActivitySender:
67+
issueAuthor: True
68+
- hasLabel:
69+
label: 'Needs: author feedback'
70+
then:
71+
- addLabel:
72+
label: needs attention
73+
- removeLabel:
74+
label: 'Needs: author feedback'
75+
description:
76+
- if:
77+
- payloadType: Issues
78+
- not:
79+
isAction:
80+
action: Closed
81+
- hasLabel:
82+
label: no-recent-activity
83+
then:
84+
- removeLabel:
85+
label: no-recent-activity
86+
description:
87+
- if:
88+
- payloadType: Issues
89+
- labelAdded:
90+
label: service bug
91+
then: []
92+
description:
93+
- if:
94+
- payloadType: Issue_Comment
95+
- activitySenderHasAssociation:
96+
association: Contributor
97+
- bodyContains:
98+
pattern: '?'
99+
isRegex: False
100+
- bodyContains:
101+
pattern: '@'
102+
isRegex: False
103+
then:
104+
- addLabel:
105+
label: 'Needs: author feedback'
106+
description:
107+
- if:
108+
- payloadType: Issues
109+
- or:
110+
- isAssignedToSomeone
111+
- isAction:
112+
action: Closed
113+
then:
114+
- removeLabel:
115+
label: ToTriage
116+
description:
117+
onFailure:
118+
onSuccess:

.github/workflows/api-level-lint.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ jobs:
1515
lint-api-level:
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
- uses: actions/setup-java@v3
2020
with:
21-
distribution: 'adopt'
22-
java-version: 18
21+
distribution: 'temurin'
22+
java-version: 20
2323
- name: Setup Android SDK
24-
uses: android-actions/setup-android@v2.0.10
24+
uses: android-actions/setup-android@v3.0.0
2525
- name: Add execution right to the script
2626
run: chmod +x gradlew
2727
working-directory: ./android

.github/workflows/auto-merge-dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
- name: Dependabot metadata
2121
id: metadata
22-
uses: dependabot/fetch-metadata@v1.5.1
22+
uses: dependabot/fetch-metadata@v1.6.0
2323
with:
2424
github-token: "${{ secrets.GITHUB_TOKEN }}"
2525

.github/workflows/build-and-publish.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ jobs:
2020
name: maven_central_snapshot
2121
runs-on: ubuntu-latest
2222
steps:
23-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
2424
- name: Easy detect-secrets
2525
uses: RobertFischer/[email protected]
2626
- name: Set up JDK
2727
uses: actions/setup-java@v3
2828
with:
29-
java-version: 18
30-
distribution: 'adopt'
29+
java-version: 20
30+
distribution: 'temurin'
3131
cache: gradle
3232
- name: Download file
3333
run: .\scripts\decodeAndWrite.ps1 -encodedValue $env:ENCODED_VALUE -outputPath $env:OUTPUT_PATH
@@ -52,14 +52,14 @@ jobs:
5252
name: maven_central_release
5353
runs-on: ubuntu-latest
5454
steps:
55-
- uses: actions/checkout@v3
55+
- uses: actions/checkout@v4
5656
- name: Easy detect-secrets
5757
uses: RobertFischer/[email protected]
5858
- name: Set up JDK
5959
uses: actions/setup-java@v3
6060
with:
61-
java-version: 18
62-
distribution: 'adopt'
61+
java-version: 20
62+
distribution: 'temurin'
6363
cache: gradle
6464
- name: Download file
6565
run: .\scripts\decodeAndWrite.ps1 -encodedValue $env:ENCODED_VALUE -outputPath $env:OUTPUT_PATH
@@ -99,13 +99,13 @@ jobs:
9999
env:
100100
RELEASE_TAG: ""
101101
steps:
102-
- uses: actions/checkout@v3
102+
- uses: actions/checkout@v4
103103
- name: Get Version
104104
id: GetVersion
105105
run: .\scripts\getLatestVersion.ps1
106106
shell: pwsh
107107
- name: Create tag
108-
uses: rickstaa/[email protected].2
108+
uses: rickstaa/[email protected].4
109109
with:
110110
tag: ${{ steps.GetVersion.outputs.tag }}
111111
- name: Queue Git Release
Lines changed: 55 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,86 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
#
7+
# ******** NOTE ********
8+
# We have attempted to detect the languages in your repository. Please check
9+
# the `language` matrix defined below to confirm you have the correct set of
10+
# supported CodeQL languages.
11+
#
112
name: "CodeQL"
213

314
on:
4-
workflow_dispatch:
515
push:
6-
branches: [dev, master]
16+
branches: [ "dev", "master" ]
717
pull_request:
818
# The branches below must be a subset of the branches above
9-
branches: [dev]
19+
branches: [ "dev" ]
1020
schedule:
1121
- cron: '0 1 * * 4'
22+
workflow_dispatch:
1223

1324
jobs:
1425
analyze:
1526
name: Analyze
16-
runs-on: ubuntu-latest
27+
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
28+
timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
29+
permissions:
30+
actions: read
31+
contents: read
32+
security-events: write
33+
34+
strategy:
35+
fail-fast: false
36+
matrix:
37+
language: [ 'java' ]
38+
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby', 'swift' ]
39+
# Use only 'java' to analyze code written in Java, Kotlin or both
40+
# Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
41+
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
1742

1843
steps:
1944
- name: Checkout repository
20-
uses: actions/checkout@v3
45+
uses: actions/checkout@v4
2146

22-
- uses: actions/setup-java@v3
47+
- name: Set up JDK
48+
uses: actions/setup-java@v3
2349
with:
24-
distribution: 'adopt'
25-
java-version: 18
50+
java-version: 20
51+
distribution: 'temurin'
52+
cache: gradle
2653

2754
# Initializes the CodeQL tools for scanning.
2855
- name: Initialize CodeQL
2956
uses: github/codeql-action/init@v2
30-
# Override language selection by uncommenting this and choosing your languages
3157
with:
32-
languages: java
58+
languages: ${{ matrix.language }}
59+
# If you wish to specify custom queries, you can do so here or in a config file.
60+
# By default, queries listed here will override any specified in a config file.
61+
# Prefix the list here with "+" to use these queries and those in the config file.
3362

34-
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
63+
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
64+
# queries: security-extended,security-and-quality
65+
66+
67+
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
3568
# If this step fails, then you should remove it and run the build manually (see below)
36-
- name: Autobuild
37-
uses: github/codeql-action/autobuild@v2
69+
# - name: Autobuild
70+
# uses: github/codeql-action/autobuild@v2
3871

3972
# ℹ️ Command-line programs to run using the OS shell.
40-
# 📚 https://git.io/JvXDl
73+
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
4174

42-
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
43-
# and modify them (or add more) to build your code if your project
44-
# uses a compiled language
75+
# If the Autobuild fails above, remove it and uncomment the following three lines.
76+
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
4577

46-
#- run: |
47-
# make bootstrap
48-
# make release
78+
- name: Grant execute permission for gradlew
79+
run: chmod +x gradlew
80+
- name: Build with Gradle
81+
run: ./gradlew build
4982

5083
- name: Perform CodeQL Analysis
5184
uses: github/codeql-action/analyze@v2
85+
with:
86+
category: "/language:${{matrix.language}}"

.github/workflows/git-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jobs:
1010
Git_Release:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414
- name: Download Build Artifact
15-
uses: dawidd6/action-download-artifact@v2.27.0
15+
uses: dawidd6/action-download-artifact@v2.28.0
1616
with:
1717
workflow: build-and-publish.yml
1818
workflow_conclusion: success

.github/workflows/gradle-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ jobs:
1515
build:
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
- name: Set up JDK
2020
uses: actions/setup-java@v3
2121
with:
22-
java-version: 18
23-
distribution: 'adopt'
22+
java-version: 20
23+
distribution: 'temurin'
2424
cache: gradle
2525
- name: Easy detect-secrets
2626
uses: RobertFischer/[email protected]

0 commit comments

Comments
 (0)