Skip to content

Commit be93e35

Browse files
baywetbaywet
authored
Merge pull request #1780 from microsoftgraph/release/v6
handles merge conflicts for release
2 parents 0e5b171 + e2be931 commit be93e35

File tree

13 files changed

+883
-32
lines changed

13 files changed

+883
-32
lines changed

‎.github/dependabot.yml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,68 @@ updates:
55
schedule:
66
interval: daily
77
open-pull-requests-limit: 10
8+
groups:
9+
kiota-dependencies:
10+
patterns:
11+
- "*kiota*"
812
- package-ecosystem: gradle
913
directory: "/android"
1014
schedule:
1115
interval: daily
1216
open-pull-requests-limit: 10
17+
groups:
18+
kiota-dependencies:
19+
patterns:
20+
- "*kiota*"
1321
- package-ecosystem: maven
1422
directory: "/"
1523
schedule:
1624
interval: daily
1725
open-pull-requests-limit: 10
26+
groups:
27+
kiota-dependencies:
28+
patterns:
29+
- "*kiota*"
1830
- package-ecosystem: github-actions
1931
directory: "/"
2032
schedule:
2133
interval: daily
2234
open-pull-requests-limit: 10
35+
36+
# remove once v5 GAs
37+
- package-ecosystem: gradle
38+
directory: "/"
39+
schedule:
40+
interval: daily
41+
open-pull-requests-limit: 10
42+
target-branch: feature/6.0
43+
groups:
44+
kiota-dependencies:
45+
patterns:
46+
- "*kiota*"
47+
- package-ecosystem: gradle
48+
directory: "/android"
49+
schedule:
50+
interval: daily
51+
open-pull-requests-limit: 10
52+
target-branch: feature/6.0
53+
groups:
54+
kiota-dependencies:
55+
patterns:
56+
- "*kiota*"
57+
- package-ecosystem: maven
58+
directory: "/"
59+
schedule:
60+
interval: daily
61+
open-pull-requests-limit: 10
62+
target-branch: feature/6.0
63+
groups:
64+
kiota-dependencies:
65+
patterns:
66+
- "*kiota*"
67+
- package-ecosystem: github-actions
68+
directory: "/"
69+
schedule:
70+
interval: daily
71+
open-pull-requests-limit: 10
72+
target-branch: feature/6.0

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@ configuration:
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
33-
requiresConversationResolution: false
33+
requiresConversationResolution: true
3434
# Are merge commits prohibited from being pushed to this branch. boolean
3535
requiresLinearHistory: false
3636
# 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
3737
requiredStatusChecks:
38-
- CodeQL
38+
- Analyze (java)
3939
- lint-api-level
4040
- license/cla
4141
- build
4242
# Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
43-
requiresStrictStatusChecks: false
43+
requiresStrictStatusChecks: true
4444
# Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
4545
restrictsPushes: false
4646
# Restrict who can dismiss pull request reviews. boolean
@@ -67,17 +67,17 @@ configuration:
6767
# Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines.
6868
requiresCommitSignatures: false
6969
# Are conversations required to be resolved before merging? boolean
70-
requiresConversationResolution: false
70+
requiresConversationResolution: true
7171
# Are merge commits prohibited from being pushed to this branch. boolean
7272
requiresLinearHistory: false
7373
# 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
7474
requiredStatusChecks:
75-
- CodeQL
75+
- Analyze (java)
7676
- lint-api-level
7777
- license/cla
7878
- build
7979
# Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
80-
requiresStrictStatusChecks: false
80+
requiresStrictStatusChecks: true
8181
# Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
8282
restrictsPushes: false
8383
# Restrict who can dismiss pull request reviews. boolean

‎.github/workflows/preview-and-release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- name: Upload Build Artifact
5151
uses: actions/upload-artifact@v4
5252
with:
53-
name: kiota-drop
53+
name: drop
5454
path: |
5555
**/libs/*
5656
build/generated-pom.xml
@@ -97,7 +97,7 @@ jobs:
9797
- name: Upload Build Artifact
9898
uses: actions/upload-artifact@v4
9999
with:
100-
name: kiota-drop
100+
name: drop
101101
path: |
102102
**/libs/*
103103
build/generated-pom.xml

‎CHANGELOG.md‎

Lines changed: 224 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,230 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111

1212
### Changed
1313

14+
## [6.1.0] - 2024-02-07
15+
16+
- Major Version 6.1.0 now Generally Available.
17+
- See [Upgrade Guide](https://github.com/microsoftgraph/msgraph-sdk-java/blob/dev/docs/upgrade-to-v6.md) for more information.
18+
19+
## [5.80.0] - 2024-01-23
20+
21+
### Added
22+
23+
- AccessPackageResource model and derived models and requests.
24+
- CallSendDtmfTonesParameterSet model and derived requests.
25+
- EducationGradingCategory model and derived requests.
26+
- SendDtmfCompletionReason model.
27+
- SendDtmfTonesOperation model and derived requests.
28+
- SocialIdentitySource model.
29+
- SocialIdentitySourceType model.
30+
- GitHubOrganizationEvidence model.
31+
- GitHubRepoEvidence model.
32+
- GitHubUserEvidence model.
33+
- HostLogonSessionEvidence model.
34+
- IoTDeviceEvidence model.
35+
- IoTDeviceImportanceType model.
36+
- MalwareEvidence model.
37+
- NetworkConnectionEvidence model.
38+
- NicEvidence model.
39+
- ProtocolType model.
40+
- SasTokenEvidence model.
41+
- ServicePrincipalEvidence model.
42+
- ServicePrincipalType model.
43+
- SubmissionMailEvidence model.
44+
45+
### Changed
46+
47+
- AccessPackageResource model.
48+
- ChatSendActivityNotificationParameterSet model and derived requests.
49+
- EducationAssignment model and derived requests.
50+
- EducationAssignmentSettings model and derived requests.
51+
- EducationSubmission model.
52+
- TeamsAppSettings model.
53+
- TeamSendActivityNotificationParameterSet model and derived requests.
54+
- User model and derived requests.
55+
- UserTeamworkSendActivityNotificationParameterSet model and derived requests.
56+
- CallRequestBuilder request.
57+
- Workbook*Range request builders changed to remove "sort", "format", and "worksheet" functions.
58+
- Sort, Format, and Worksheet properties still available via the WorkbookRange entity returned from these requests.
59+
60+
61+
## [5.79.0] - 2023-12-21
62+
63+
### Added
64+
65+
- CallSendDtmfTonesParameterSet model and derived requests.
66+
- SendDtmfCompletionReason model.
67+
- SendDtmfTonesOperation model and derived requests.
68+
69+
### Changed
70+
71+
- CallRequestBuilder request.
72+
73+
## [5.78.0] - 2023-12-14
74+
75+
### Added
76+
77+
- DeltaParticipants model and derived requests.
78+
- ListItemCreateLinkParameterSet model and derived requests.
79+
- PronounsSettings model and derived requests.
80+
- RemovedState model.
81+
- VirtualEndpoint model and derived requests.
82+
83+
### Changed
84+
85+
- AppliedConditionalAccessPolicyResult model.
86+
- DeviceManagement model and request builder.
87+
- DriveItemCreateLinkParameterSet model and builder.
88+
- Participant model.
89+
- PeopleAdminSettings model and request builder.
90+
- ListItem request builder.
91+
92+
## [5.77.0] - 2023-11-17
93+
94+
### Added
95+
96+
- ItemRetentionLabel model and derived request.
97+
- MeetingAudience model.
98+
- OnlineMeetingBase model and derived request.
99+
- RetentionLabelSettings model.
100+
- VirtualEvent model and derived requests.
101+
- VirtualEventAttendeeRegistrationStatus model.
102+
- VirtualEventRegistration model and derived requests.
103+
- VirtualEventRegistrationQuestionAnswer model.
104+
- VirtualEventSession model and derived requests.
105+
- VirtualEventsRoot model and derived request.
106+
- VirtualEventStatus model.
107+
- VirtualEventWebinar model and derived requests.
108+
- VirtualEventWebinarGetByUserIdAndRoleParameterSet model and derived requests.
109+
- VirtualEventWebinarGetByUserRoleParameterSet model and derived requests.
110+
- BehaviorDuringRetentionPeriod model.
111+
112+
### Changed
113+
114+
- DriveItem model and derived request.
115+
- OnlineMeeting model.
116+
- SolutionsRoot model and derived request.
117+
118+
## [5.76.0] - 2023-11-10
119+
120+
### Added
121+
122+
- CallRecording model and derived requests.
123+
- ChannelSummary model.
124+
- DeviceLocalCredential and DeviceLocalCredentialInfo models and derived requests.
125+
- RemoteDesktopSecurityConfiguration model and derived requests.
126+
- SiteDeltaParameterSet model and derived requests.
127+
- TargetDeviceGroup model and derived requests.
128+
- HostPort, HostPortBanner, HostPortComponent, HostPortProtocol, and HostPortStatus models and derived requests.
129+
130+
### Changed
131+
132+
- ExternalConnection model.
133+
- Channel model.
134+
- DelegatedAdminRelationship model.
135+
- Directory model and request builder.
136+
- ExtensionProperty model.
137+
- OnlineMeeting model and request builder.
138+
- ServicePrincipal model and request builder.
139+
- SiteCollection request builder.
140+
- Alert model.
141+
- DetectionSource model.
142+
- Host model and request builder.
143+
- ServiceSource model.
144+
- ThreatIntelligence model and request builder.
145+
- Hostname request builder.
146+
- IpAddress request builder.
147+
148+
## [5.75.0] - 2023-10-20
149+
150+
### Added
151+
152+
- AzureCommunicationServicesUserIdentity, CommunicationsApplicationIdentity, CommunicationsApplicationInstanceIdentity, CommunicationsEncryptedIdentity, CommunicationsGuestIdentity, CommunicationsIdentitySet, CommunicationsPhoneIdentity, and CommunicationsUserIdentity models.
153+
- PeopleAdminSettings model and derived request.
154+
- ProfileCardAnnotation and ProfileCardProperty models and derived requests.
155+
156+
### Changed
157+
158+
- Admin model and derived request.
159+
160+
## [5.74.0] - 2023-10-13
161+
162+
### Changed
163+
164+
- External/InternalSponsors for ConnectedOrganizationRequestBuilder are accessed via DirectoryObjectWithReferenceRequestBuilder, no longer DirectoryObjectRequestBuilder.
165+
166+
## [5.73.0] - 2023-10-06
167+
168+
### Added
169+
170+
- AccountTargetContent, AccountTargetContentType, AddressBookAccountTargetContent, IncludeAllAccountTargetContent models and derived requests.
171+
- AttackSimulationOperation, AttackSimulationOperationType, AttackSimulationRoot, SimulationContentSource, SimulationContentStatus, SimulationNotification, TargettedUserType models and derived requests.
172+
- BaseEndUserNotification, EndUserNotification, EndUserNotificationDetail, EndUserNotificationPreference, EndUserNotificationSetting, EndUserNotificationSettingType, EndUserNotificationType, NotificationDeliveryFrequency, NotificationDeliveryPreference, PositiveReinforcementNotification, TrainingReminderNotification models and derived requests.
173+
- CallTranscript, CallTranscriptContentStream, CallTranscriptMetadataContentStream models and derived requests.
174+
- CoachmarkLocation, CoachmarkLocationType, PayloadCoachmark models.
175+
- CustomTrainingSetting, MicrosoftCustomTrainingSetting, MicrosoftManagedTrainingSetting, MicrosoftTrainingAssignmentMapping, NoTrainingNotificationSetting, NoTrainingSetting, Training, TrainingAssignedTo, TrainingAvailabilityStatus, TrainingCompletionDuration, TrainingLanguageDetail, TrainingNotificationSetting, TrainingSetting, TrainingSettingType, TrainingType models and derived requests.
176+
- EmailPayloadDetail model.
177+
- LandingPage, LandingPageDetail, LoginPage models and derived requests.
178+
- OAuthAppScope, OAuthConsentAppDetail models.
179+
- Payload, PayloadBrand, PayloadComplexity, PayloadDetail, PayloadIndustry, PayloadTheme models and derived requests.
180+
- HostPair, HostSslCertificate, HostSslCertificatePort, SslCertificate, SslCertificateEntity, Subdomain models and derived requests.
181+
- WhoisBaseRecord, WhoisContact, WhoisDomainStatus, WhoisHistoryRecord, WhoisNameserver, WhoisRecord models and derived requests.
182+
183+
### Changed
184+
185+
- Label, OnlineMeeting, Simulation, ThreatIntelligence models and derived requests.
186+
- Host, Hostname, IpAddress, AttackSimulationRoot, OnlineMeeting, Simulation, ThreatIntelligence request builders.
187+
188+
## [5.72.0] - 2023-09-29
189+
190+
### Added
191+
192+
- AssignmentSchedule, EligibilitySchedule, PrivilegedAccessGroup, PrivilegedAccessRoot, ResellerDelegatedAdminRelationship models and derived requests.
193+
- ScheduleRequestActions model.
194+
195+
### Changed
196+
197+
- DelegatedAdminRelationshipRequest, DirectoryRequestBuilder, IdentityGovernance, IdentityGovernanceRequestBuilder, Incident, SubjectRightsRequest classes.
198+
199+
## [5.71.0] - 2023-09-22
200+
201+
### Added
202+
203+
- MacOSDmgApp model and derived requests.
204+
- MacOSIncludedApp model.
205+
- RotateBitLockerKeysDeviceActionResult model.
206+
- UserExperienceAnalyticsDeviceStartupProcessPerformance model and derived requests.
207+
208+
### Removed
209+
210+
- ManagedMobileLobApp and MobileLobApp requests.
211+
212+
## [5.70.0] - 2023-09-08
213+
214+
### Added
215+
216+
- PresenceStatusMessage derived types and requests.
217+
- SubjectRightsRequest derived types.
218+
219+
## [5.69.0] - 2023-09-01
220+
221+
### Added
222+
223+
- Action models.
224+
- GroupRetryServiceProvisioning derived types and requests.
225+
- OrgContactRetryServiceProvisioning derived types and requests.
226+
- ServicePrincipalLockConfiguration model.
227+
- ServiceProvisioningError model.
228+
- ServiceProvisioningXmlError model.
229+
- UserRetryServiceProvisioning derived types and requests.
230+
231+
## [5.68.0] - 2023-08-18
232+
233+
### Changed
234+
235+
- Added properties to the PublicationFacet model.
236+
- Added properties to the Alert and Incident models in the security namespace.
237+
14238
## [5.67.0] - 2023-08-10
15239

16240
### Added

‎README.md‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Microsoft Graph SDK for Java
2-
## Version 6.0.2 now in Release Candidate stage!
2+
## Version 6.1.0 now Generally Available (GA)!
33

44
[![Download](https://img.shields.io/maven-central/v/com.microsoft.graph/microsoft-graph.svg)](https://search.maven.org/artifact/com.microsoft.graph/microsoft-graph)
55

@@ -16,12 +16,11 @@ Add the repository and a compile dependency for `microsoft-graph` to your projec
1616
```groovy
1717
repositories {
1818
mavenCentral()
19-
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
2019
}
2120
2221
dependencies {
2322
// Include the sdk as a dependency
24-
implementation 'com.microsoft.graph:microsoft-graph:6.0.2-SNAPSHOT'
23+
implementation 'com.microsoft.graph:microsoft-graph:6.1.0'
2524
// Uncomment the line below if you are building an android application
2625
//implementation 'com.google.guava:guava:30.1.1-android'
2726
// This dependency is only needed if you are using a TokenCredential object for authentication
@@ -38,7 +37,7 @@ Add the dependency in `dependencies` in pom.xml
3837
<!-- Include the sdk as a dependency -->
3938
<groupId>com.microsoft.graph</groupId>
4039
<artifactId>microsoft-graph</artifactId>
41-
<version>6.0.2-SNAPSHOT</version>
40+
<version>6.1.0</version>
4241
</dependency>
4342
<dependency>
4443
<!-- This dependency is only needed if you are using a TokenCredential object for authentication -->

‎android/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ buildscript {
1616
repositories {
1717
google()
1818
gradlePluginPortal()
19-
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
2019
}
2120

2221
apply plugin: "com.android.library"

0 commit comments

Comments
 (0)