Skip to content

Commit 62d6deb

Browse files
authored
Merge pull request #1479 from microsoftgraph/v3/longTermBranch
v3 release
2 parents aa82643 + e08fff1 commit 62d6deb

File tree

240 files changed

+6262
-16502
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

240 files changed

+6262
-16502
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ on:
66
branches:
77
- dev
88
- master
9+
- v3/longTermBranch
910
pull_request:
1011
branches:
1112
- dev
1213
- master
14+
- v3/longTermBranch
1315

1416
jobs:
1517
lint-api-level:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
with:
110110
tag: ${{ steps.GetVersion.outputs.tag }}
111111
- name: Queue Git Release
112-
uses: benc-uk/workflow-dispatch@v1
112+
uses: benc-uk/workflow-dispatch@v121
113113
with:
114114
workflow: Git Release
115115
token: ${{ secrets.PERSONAL_TOKEN }}

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ name: "CodeQL"
1313

1414
on:
1515
push:
16-
branches: [ "dev", "master" ]
16+
branches: ["dev", "master", "v3/longTermBranch"]
1717
pull_request:
1818
# The branches below must be a subset of the branches above
19-
branches: [ "dev" ]
19+
branches: ["dev", "v3/longTermBranch"]
2020
schedule:
2121
- cron: '0 1 * * 4'
2222
workflow_dispatch:

.github/workflows/gradle-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Java CI with Gradle
22

33
on:
44
pull_request:
5-
branches: [ dev, master ]
5+
branches: [ dev, master, v3/longTermBranch ]
66
paths-ignore:
77
- '.gradle/wrapper'
88
- '.gitignore'
@@ -42,4 +42,4 @@ jobs:
4242
settings.gradle
4343
gradle.properties
4444
**/gradle/**
45-
Scripts/**
45+
Scripts/**

.github/workflows/sample-build-check.yml

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

CHANGELOG.md

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

1212
### Changed
1313

14+
## [3.1.0] - 2024-02-07
15+
16+
### Changed
17+
18+
- Version bump for Java SDK GA release.
19+
- Bumps Kiota-Java abstractions, authentication, http, and serialization components for Java SDK 6.1.0 release.
20+
21+
## [3.0.12] - 2023-12-15
22+
23+
### Fixed
24+
25+
- Fixes a bug where a null collection for allowedHosts would result in failure to initialize client. [#1411](https://github.com/microsoftgraph/msgraph-sdk-java-core/pull/1411)
26+
27+
## [3.0.11] - 2023-12-08
28+
29+
### Changed
30+
31+
- Parent namespace for all classes has been changed from com.microsoft.graph.* to com.microsoft.graph.core.* in order to avoid conflicts with the generated service libraries.
32+
- This change is not backwards compatible and will require changes to your code.
33+
34+
## [3.0.10] - 2023-11-27
35+
36+
### Changed
37+
38+
- Removed the usage of reflection for enum deserialization and reordered RequestAdapter method arguments. [Kiota-Java #840](https://github.com/microsoft/kiota-java/issues/840)
39+
40+
## [3.0.9] - 2023-11-14
41+
42+
### Changed
43+
44+
- Kiota-Java has moved away from Async/Completable futures, thus Async components are no longer utilized and have been removed. Furthermore, requestAdapter methods no longer use the async suffix. [Kiota-Java #175](https://github.com/microsoft/kiota-java/issues/175)
45+
- ApiException class now extends RuntimeException instead of Exception.
46+
47+
### Removed
48+
49+
- ServiceException class has been removed.
50+
51+
## [3.0.8] - 2023-08-09
52+
53+
### Changed
54+
55+
- Replaces Javax annotations in favor of Jakarta annotations.
56+
57+
### Removed
58+
59+
- Removes 'SuppressFBWarnings' annotations and dependency.
60+
61+
## [3.0.7] - 2023-07-20
62+
63+
### Added
64+
65+
- Adds graph-java-sdk implementation of the `UrlReplaceHandler` middleware including default replacement pairs.
66+
- Default replacement pair: '/users/TokenToReplace' -> '/me'
67+
68+
## [3.0.6] - 2023-07-11
69+
70+
### Added
71+
72+
- Added the PageIterator functionality for Kiota generated service libraries.
73+
74+
## [3.0.5] - 2023-06-15
75+
76+
### Added
77+
78+
- Added Batch Request and Batch Request Collection functionality for Kiota generated service libraries.
79+
80+
## [3.0.4] - 2023-05-03
81+
82+
### Added
83+
84+
- Added LargeFileUploadTask functionality for kiota generated service libraries.
85+
86+
### Fixed
87+
88+
- Fixes formatting used in the headers added by the telemetry handler to align with the [msGraph sdk spec.](https://github.com/microsoftgraph/msgraph-sdk-design/blob/master/middleware/TelemetryHandler.md)
89+
90+
## [3.0.3] - 2023-04-06
91+
92+
### Changed
93+
94+
- Bumps Kiota-Java abstractions, authentication, http, and serialization components.
95+
96+
## [3.0.2] - 2022-10-10
97+
98+
### Changed
99+
100+
- Bumps Kiota-Java abstractions, authentication, http, and serialization components.
101+
102+
## [3.0.1] - 2022-09-20
103+
104+
### Added
105+
106+
- Uses [Kiota-Java](https://github.com/microsoft/kiota-java) libraries as underlying framework.
107+
- BaseGraphRequestAdapter for use with v1 and beta service libraries.
108+
109+
### Changed
110+
111+
- Removes Request Builders.
112+
- GraphClientFactory to handle OkHttp client creation.
113+
- BaseClient refactored to use Kiota framework.
114+
14115
## [2.0.21] - 2023-11-08
15116

16117
### Changed

android/build.gradle

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ buildscript {
22
repositories {
33
google()
44
gradlePluginPortal()
5-
maven {
6-
url "https://plugins.gradle.org/m2/"
7-
}
85
}
96

107
dependencies {
@@ -17,6 +14,7 @@ buildscript {
1714
repositories {
1815
google()
1916
gradlePluginPortal()
17+
mavenCentral()
2018
}
2119

2220
apply plugin: "com.android.library"
@@ -56,18 +54,18 @@ android {
5654
disable "ResourceType" // Annotation binding
5755
disable "GradleDependency"
5856
disable "NewerVersionAvailable"
59-
disable "DuplicatePlatformClasses" // xpp3 added by azure-identity
57+
disable "DuplicatePlatformClasses" // xpp3 added by azure-identity
58+
}
59+
sourceSets {
60+
main {
61+
java.srcDirs = ['../src/main/java']
62+
res.srcDirs = ['../src/main/java']
63+
manifest.srcFile 'AndroidManifest.xml'
64+
}
65+
androidTest {
66+
setRoot '../src/test'
67+
}
6068
}
61-
sourceSets {
62-
main {
63-
java.srcDirs = ['../src/main/java']
64-
res.srcDirs = ['../src/main/java']
65-
manifest.srcFile 'AndroidManifest.xml'
66-
}
67-
androidTest {
68-
setRoot '../src/test'
69-
}
70-
}
7169
}
7270

7371
apply from: "../gradle/dependencies.gradle"

android/gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ org.gradle.caching=true
2525

2626
mavenGroupId = com.microsoft.graph
2727
mavenArtifactId = microsoft-graph-core
28-
mavenMajorVersion = 2
29-
mavenMinorVersion = 3
30-
mavenPatchVersion = 3
28+
mavenMajorVersion = 3
29+
mavenMinorVersion = 1
30+
mavenPatchVersion = 0
3131
mavenArtifactSuffix =
3232

3333
#These values are used to run functional tests

build.gradle

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
plugins {
22
// Apply the java-library plugin to add support for Java Library
33
id 'java-library'
4-
id 'java'
54
id 'eclipse'
65
id 'maven-publish'
76
id 'signing'
@@ -84,11 +83,11 @@ def pomConfig = {
8483
}
8584

8685
sonarqube {
87-
properties {
88-
property "sonar.projectKey", "microsoftgraph_msgraph-sdk-java-core"
89-
property "sonar.organization", "microsoftgraph2"
90-
property "sonar.host.url", "https://sonarcloud.io"
91-
}
86+
properties {
87+
property "sonar.projectKey", "microsoftgraph_msgraph-sdk-java-core"
88+
property "sonar.organization", "microsoftgraph2"
89+
property "sonar.host.url", "https://sonarcloud.io"
90+
}
9291
}
9392

9493
//Publishing tasks-
@@ -132,7 +131,7 @@ publishing {
132131
writeTo(pomFile)
133132
}
134133
}
135-
134+
136135
mavenCentralRelease(MavenPublication) {
137136
customizePom(pom)
138137
groupId project.property('mavenGroupId')
@@ -145,32 +144,32 @@ publishing {
145144
}
146145
}
147146
}
148-
repositories {
147+
repositories {
149148
maven {
150149
url = 'https://oss.sonatype.org/content/repositories/snapshots'
151150
name = 'sonatypeSnapshot'
152-
151+
153152
credentials {
154-
if (project.rootProject.file('local.properties').exists()) {
155-
Properties properties = new Properties()
156-
properties.load(project.rootProject.file('local.properties').newDataInputStream())
157-
username = properties.getProperty('sonatypeUsername')
158-
password = properties.getProperty('sonatypePassword')
159-
}
153+
if (project.rootProject.file('local.properties').exists()) {
154+
Properties properties = new Properties()
155+
properties.load(project.rootProject.file('local.properties').newDataInputStream())
156+
username = properties.getProperty('sonatypeUsername')
157+
password = properties.getProperty('sonatypePassword')
158+
}
160159
}
161160
}
162-
161+
163162
maven {
164163
url = 'https://oss.sonatype.org/service/local/staging/deploy/maven2'
165164
name = 'sonatype'
166165

167166
credentials {
168-
if (project.rootProject.file('local.properties').exists()) {
169-
Properties properties = new Properties()
170-
properties.load(project.rootProject.file('local.properties').newDataInputStream())
171-
username = properties.getProperty('sonatypeUsername')
172-
password = properties.getProperty('sonatypePassword')
173-
}
167+
if (project.rootProject.file('local.properties').exists()) {
168+
Properties properties = new Properties()
169+
properties.load(project.rootProject.file('local.properties').newDataInputStream())
170+
username = properties.getProperty('sonatypeUsername')
171+
password = properties.getProperty('sonatypePassword')
172+
}
174173
}
175174
}
176175
}
@@ -181,7 +180,7 @@ signing {
181180
}
182181
tasks.withType(Sign)*.enabled = mavenCentralPublishingEnabled.toBoolean()
183182

184-
def fixAscNames = { name ->
183+
def fixAscNames = { name ->
185184
if(name.contains('pom')) {
186185
"${project.property('mavenArtifactId')}-${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}.pom.asc"
187186
} else {
@@ -232,8 +231,8 @@ def customizePom(pom) {
232231
licenses {
233232
license {
234233
name "MIT License"
235-
url "http://opensource.org/licenses/MIT"
236-
distribution "repo"
234+
url "http://opensource.org/licenses/MIT"
235+
distribution "repo"
237236
}
238237
}
239238
scm {

gradle.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ org.gradle.jvmargs=-Xmx2g
2323

2424
mavenGroupId = com.microsoft.graph
2525
mavenArtifactId = microsoft-graph-core
26-
mavenMajorVersion = 2
27-
mavenMinorVersion = 0
28-
mavenPatchVersion = 21
29-
mavenArtifactSuffix =
26+
mavenMajorVersion = 3
27+
mavenMinorVersion = 1
28+
mavenPatchVersion = 0
29+
mavenArtifactSuffix =
3030

3131
#These values are used to run functional tests
3232
#If you wish to run the functional tests, edit the gradle.properties

0 commit comments

Comments
 (0)