Skip to content

Commit 8564ab2

Browse files
committed
Merge branch 'feature/6.0' into release/v6
Signed-off-by: Vincent Biret <[email protected]>
2 parents 3d389c1 + c474d02 commit 8564ab2

File tree

6 files changed

+18
-13
lines changed

6 files changed

+18
-13
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ 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+
1419
## [5.80.0] - 2024-01-23
1520

1621
### Added

README.md

Lines changed: 1 addition & 1 deletion
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

android/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ org.gradle.caching=true
2626
mavenGroupId = com.microsoft.graph
2727
mavenArtifactId = microsoft-graph
2828
mavenMajorVersion = 6
29-
mavenMinorVersion = 0
29+
mavenMinorVersion = 1
3030
mavenPatchVersion = 0
3131
mavenArtifactSuffix =
3232

@@ -40,4 +40,4 @@ Password="PASSWORD"
4040

4141
#enable mavenCentralPublishingEnabled to publish to maven central
4242
mavenCentralSnapshotArtifactSuffix = -SNAPSHOT
43-
mavenCentralPublishingEnabled=false
43+
mavenCentralPublishingEnabled=true

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Password="PASSWORD"
4040

4141
#enable mavenCentralPublishingEnabled to publish to maven central
4242
mavenCentralSnapshotArtifactSuffix = -SNAPSHOT
43-
mavenCentralPublishingEnabled=false
43+
mavenCentralPublishingEnabled=true
4444

4545

4646

gradle/dependencies.gradle

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

1212
// Core Http library
1313
api 'com.microsoft.graph:microsoft-graph-core:3.1.0'
14-
implementation 'com.microsoft.kiota:microsoft-kiota-authentication-azure:0.12.2'
15-
implementation 'com.microsoft.kiota:microsoft-kiota-http-okHttp:0.12.2'
16-
implementation 'com.microsoft.kiota:microsoft-kiota-serialization-json:0.12.2'
17-
implementation 'com.microsoft.kiota:microsoft-kiota-serialization-text:0.12.2'
18-
implementation 'com.microsoft.kiota:microsoft-kiota-serialization-form:0.12.2'
19-
implementation 'com.microsoft.kiota:microsoft-kiota-serialization-multipart:0.12.2'
14+
implementation 'com.microsoft.kiota:microsoft-kiota-authentication-azure:1.0.0'
15+
implementation 'com.microsoft.kiota:microsoft-kiota-http-okHttp:1.0.0'
16+
implementation 'com.microsoft.kiota:microsoft-kiota-serialization-json:1.0.0'
17+
implementation 'com.microsoft.kiota:microsoft-kiota-serialization-text:1.0.0'
18+
implementation 'com.microsoft.kiota:microsoft-kiota-serialization-form:1.0.0'
19+
implementation 'com.microsoft.kiota:microsoft-kiota-serialization-multipart:1.0.0'
2020
}

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
as the dependency graph is not compatible with gradle https://docs.github.com/en/free-pro-team@latest/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#supported-package-ecosystems
55
build.gradle is the source of truth
66
-->
7-
<modelVersion>5.0.0</modelVersion>
7+
<modelVersion>6.0.0</modelVersion>
88

99
<groupId>com.microsoft.graph</groupId>
1010
<artifactId>microsoft-graph</artifactId>
11-
<version>3.3.0</version>
11+
<version>6.1.0</version>
1212
<packaging>pom</packaging>
1313

1414
<properties>
@@ -35,7 +35,7 @@
3535
<dependency>
3636
<groupId>com.microsoft.graph</groupId>
3737
<artifactId>microsoft-graph-core</artifactId>
38-
<version>2.0.21</version>
38+
<version>3.1.0</version>
3939
</dependency>
4040
<dependency>
4141
<groupId>org.junit.jupiter</groupId>

0 commit comments

Comments
 (0)