Skip to content

Commit 64b2376

Browse files
authored
Merge branch 'dev' into v1.0/pipelinebuild/147067
2 parents b02e9e8 + e53ff60 commit 64b2376

File tree

9 files changed

+53
-105
lines changed

9 files changed

+53
-105
lines changed

.secrets.baseline

Lines changed: 47 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.0.3",
2+
"version": "1.5.0",
33
"plugins_used": [
44
{
55
"name": "ArtifactoryDetector"
@@ -20,6 +20,15 @@
2020
{
2121
"name": "CloudantDetector"
2222
},
23+
{
24+
"name": "DiscordBotTokenDetector"
25+
},
26+
{
27+
"name": "GitHubTokenDetector"
28+
},
29+
{
30+
"name": "GitLabTokenDetector"
31+
},
2332
{
2433
"name": "HexHighEntropyString",
2534
"limit": 3.0
@@ -30,6 +39,9 @@
3039
{
3140
"name": "IbmCosHmacDetector"
3241
},
42+
{
43+
"name": "IPPublicDetector"
44+
},
3345
{
3446
"name": "JwtTokenDetector"
3547
},
@@ -43,9 +55,18 @@
4355
{
4456
"name": "NpmDetector"
4557
},
58+
{
59+
"name": "OpenAIDetector"
60+
},
4661
{
4762
"name": "PrivateKeyDetector"
4863
},
64+
{
65+
"name": "PypiTokenDetector"
66+
},
67+
{
68+
"name": "SendGridDetector"
69+
},
4970
{
5071
"name": "SlackDetector"
5172
},
@@ -58,6 +79,9 @@
5879
{
5980
"name": "StripeDetector"
6081
},
82+
{
83+
"name": "TelegramBotTokenDetector"
84+
},
6185
{
6286
"name": "TwilioKeyDetector"
6387
}
@@ -66,6 +90,10 @@
6690
{
6791
"path": "detect_secrets.filters.allowlist.is_line_allowlisted"
6892
},
93+
{
94+
"path": "detect_secrets.filters.common.is_baseline_file",
95+
"filename": ".secrets.baseline"
96+
},
6997
{
7098
"path": "detect_secrets.filters.common.is_ignored_due_to_verification_policies",
7199
"min_level": 2
@@ -76,6 +104,12 @@
76104
{
77105
"path": "detect_secrets.filters.heuristic.is_likely_id_string"
78106
},
107+
{
108+
"path": "detect_secrets.filters.heuristic.is_lock_file"
109+
},
110+
{
111+
"path": "detect_secrets.filters.heuristic.is_not_alphanumeric_string"
112+
},
79113
{
80114
"path": "detect_secrets.filters.heuristic.is_potential_uuid"
81115
},
@@ -85,60 +119,25 @@
85119
{
86120
"path": "detect_secrets.filters.heuristic.is_sequential_string"
87121
},
122+
{
123+
"path": "detect_secrets.filters.heuristic.is_swagger_file"
124+
},
88125
{
89126
"path": "detect_secrets.filters.heuristic.is_templated_secret"
90127
},
128+
{
129+
"path": "detect_secrets.filters.HexHighEntropyString.should_exclude_file",
130+
"pattern": [
131+
"release-please-config.json"
132+
]
133+
},
91134
{
92135
"path": "detect_secrets.filters.regex.should_exclude_file",
93136
"pattern": [
94-
"gradle.properties"
137+
"release-please-config.json"
95138
]
96139
}
97140
],
98-
"results": {
99-
"src\\main\\java\\com\\microsoft\\graph\\info\\Constants.java": [
100-
{
101-
"type": "Secret Keyword",
102-
"filename": "src\\main\\java\\com\\microsoft\\graph\\info\\Constants.java",
103-
"hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
104-
"is_verified": false,
105-
"line_number": 15
106-
},
107-
{
108-
"type": "Secret Keyword",
109-
"filename": "src\\main\\java\\com\\microsoft\\graph\\info\\Constants.java",
110-
"hashed_secret": "8b142a91cfb6e617618ad437cedf74a6745f8926",
111-
"is_verified": false,
112-
"line_number": 19
113-
}
114-
],
115-
"src\\test\\java\\com\\microsoft\\graph\\functional\\OutlookTests.java": [
116-
{
117-
"type": "Base64 High Entropy String",
118-
"filename": "src\\test\\java\\com\\microsoft\\graph\\functional\\OutlookTests.java",
119-
"hashed_secret": "aa77b4dc79cbcfe055b89fe82a7798b6a67257f8",
120-
"is_verified": false,
121-
"line_number": 367
122-
}
123-
],
124-
"src\\test\\java\\com\\microsoft\\graph\\functional\\PlannerTests.java": [
125-
{
126-
"type": "Base64 High Entropy String",
127-
"filename": "src\\test\\java\\com\\microsoft\\graph\\functional\\PlannerTests.java",
128-
"hashed_secret": "9606cd64700044d798023aef5dd6fef07852662f",
129-
"is_verified": false,
130-
"line_number": 410
131-
}
132-
],
133-
"src\\test\\java\\com\\microsoft\\graph\\serialization\\DefaultSerializerTests.java": [
134-
{
135-
"type": "Hex High Entropy String",
136-
"filename": "src\\test\\java\\com\\microsoft\\graph\\serialization\\DefaultSerializerTests.java",
137-
"hashed_secret": "a354361806d535abc1f2298adc8b1d245a99d249",
138-
"is_verified": false,
139-
"line_number": 55
140-
}
141-
]
142-
},
143-
"generated_at": "2021-09-13T18:55:46Z"
141+
"results": {},
142+
"generated_at": "2024-05-08T12:56:29Z"
144143
}

android/gradle.properties

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,6 @@ mavenMinorVersion = 1
3030
mavenPatchVersion = 0
3131
mavenArtifactSuffix =
3232

33-
#These values are used to run functional tests
34-
#If you wish to run the functional tests, edit the gradle.properties
35-
#file in your user directory instead of adding them here.
36-
#ex: C:\Users\username\.gradle\gradle.properties
37-
ClientId="CLIENT_ID"
38-
Username="USERNAME"
39-
Password="PASSWORD"
40-
4133
#enable mavenCentralPublishingEnabled to publish to maven central
4234
mavenCentralSnapshotArtifactSuffix = -SNAPSHOT
4335
mavenCentralPublishingEnabled=true

gradle.properties

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,6 @@ mavenPatchVersion = 0
3636
# x-release-please-end
3737
mavenArtifactSuffix =
3838

39-
#These values are used to run functional tests
40-
#If you wish to run the functional tests, edit the gradle.properties
41-
#file in your user directory instead of adding them here.
42-
#ex: C:\Users\username\.gradle\gradle.properties
43-
ClientId="CLIENT_ID"
44-
Username="USERNAME"
45-
Password="PASSWORD"
46-
4739
#enable mavenCentralPublishingEnabled to publish to maven central
4840
mavenCentralSnapshotArtifactSuffix = -SNAPSHOT
4941
mavenCentralPublishingEnabled=true

gradle/dependencies.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ dependencies {
99

1010
// Core Http library
1111
api 'com.microsoft.graph:microsoft-graph-core:3.1.9'
12-
implementation 'com.microsoft.kiota:microsoft-kiota-authentication-azure:1.1.9'
13-
implementation 'com.microsoft.kiota:microsoft-kiota-http-okHttp:1.1.9'
14-
implementation 'com.microsoft.kiota:microsoft-kiota-serialization-json:1.1.9'
15-
implementation 'com.microsoft.kiota:microsoft-kiota-serialization-text:1.1.9'
16-
implementation 'com.microsoft.kiota:microsoft-kiota-serialization-form:1.1.9'
17-
implementation 'com.microsoft.kiota:microsoft-kiota-serialization-multipart:1.1.9'
12+
implementation 'com.microsoft.kiota:microsoft-kiota-authentication-azure:1.1.11'
13+
implementation 'com.microsoft.kiota:microsoft-kiota-http-okHttp:1.1.11'
14+
implementation 'com.microsoft.kiota:microsoft-kiota-serialization-json:1.1.11'
15+
implementation 'com.microsoft.kiota:microsoft-kiota-serialization-text:1.1.11'
16+
implementation 'com.microsoft.kiota:microsoft-kiota-serialization-form:1.1.11'
17+
implementation 'com.microsoft.kiota:microsoft-kiota-serialization-multipart:1.1.11'
1818
}

src/main/java/kiota-lock.json

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

src/test/resources/document.pdf

-237 KB
Binary file not shown.

src/test/resources/hamilton.jpg

-174 KB
Binary file not shown.
-10.2 MB
Binary file not shown.
-320 KB
Binary file not shown.

0 commit comments

Comments
 (0)