Merge pull request #1783 from microsoftgraph/feature/6.0

6.1.0 Release

Author: ramsessanchez

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

@@ -1,6 +1,6 @@
 name: "Checks the SDK only using APIs from the targeted API level"
 
-on: 
+on:
   workflow_dispatch:
   push:
     branches:
@@ -13,7 +13,7 @@ on:
 
 jobs:
   lint-api-level:
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, 1ES.Pool=1es-ubuntu-msgraph-sdk-java-memory-latest]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
@@ -34,4 +34,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: lint-report
-          path: ./android/build/reports
+          path: ./android/build/reports

.github/workflows/git-release.yml

@@ -23,11 +23,11 @@ jobs:
       - name: Github Release
         uses: anton-yurchenko/[email protected]
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN}}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           DRAFT_RELEASE: "false"
           PRE_RELEASE: "false"
           CHANGELOG_FILE: "CHANGELOG.md"
           ALLOW_EMPTY_CHANGELOG: "true"
         with:
           args: |
-              drop/build/**/*.jar
+            drop/build/**/*.jar

.github/workflows/gradle-build.yml

@@ -1,4 +1,4 @@
-name: Java CI with Gradle
+name: Gradle Build and Compare Package
 
 on:
   push:
@@ -24,9 +24,9 @@ jobs:
           java-version: 18
           distribution: 'adopt'
           cache: gradle
-      - name: Easy detect-secrets
+      - name: Detect Secrets
         uses: RobertFischer/[email protected]
-      - name: Grant execute permission for gradlew
+      - name: Grant Execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
         run: ./gradlew build
@@ -41,7 +41,7 @@ jobs:
       - name: Upload a Build Artifact
         uses: actions/upload-artifact@v4
         with:
-          name: drop
+          name: kiota-drop
           path: |
             **/libs/*
             build/generated-pom.xml
@@ -58,8 +58,8 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     env: 
-      CURRENT_PKG_DIFF: ./artifacts/current/build/libs/msgraph-sdk-java.jar 
-      PRIOR_PKG_DIFF: ./artifacts/previous/build/libs/msgraph-sdk-java.jar
+      CURRENT_PKG_DIFF: ./artifacts/current-kiota/build/libs/msgraph-sdk-java.jar 
+      PRIOR_PKG_DIFF: ./artifacts/previous-kiota/build/libs/msgraph-sdk-java.jar
     steps: 
       - uses: actions/checkout@v4
       - name: Set up JDK
@@ -71,17 +71,17 @@ jobs:
       - name: Download Current Build
         uses: actions/download-artifact@v4
         with: 
-          name: drop
-          path: artifacts/current/
+          name: kiota-drop
+          path: artifacts/current-kiota/
       - name: Download Last Successful Build
         uses: dawidd6/[email protected]
         with: 
           workflow: preview-and-release.yml
           workflow_conclusion: success
-          branch: dev
+          branch: feature/6.0
           event: push
-          name: drop
-          path: artifacts/previous/
+          name: kiota-drop
+          path: artifacts/previous-kiota/
       - name: Run PKG Diff 
         continue-on-error: true
         run: |

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

@@ -2,7 +2,7 @@ name: Maven Preview/Release and Github Release
 
 on:
   push:
-    branches: [ dev, feature/6.0 ]
+    branches: [ "dev", "feature/6.0" ]
     paths-ignore:
      - '.gradle/wrapper'
      - '.gitignore'
@@ -47,6 +47,21 @@ jobs:
         run: chmod +x gradlew
       - name: Publish
         run: ./gradlew $PREVIEW_TASK 
+      - name: Upload Build Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: drop
+          path: |
+            **/libs/*
+            build/generated-pom.xml
+            build/generated-pom.xml.asc
+            build.gradle
+            gradlew
+            gradlew.bat
+            settings.gradle
+            gradle.properties
+            **/gradle/**
+            Scripts/**
   
   maven_Release:
     if: ${{ github.ref == 'refs/heads/dev' }}
@@ -111,7 +126,7 @@ jobs:
         with:
           tag: ${{ steps.GetVersion.outputs.tag }}
       - name: Queue Git Release
-        uses: benc-uk/workflow-dispatch@v1
+        uses: benc-uk/workflow-dispatch@v121
         with:
           workflow: Git Release
           token: ${{ secrets.PERSONAL_TOKEN }}

CHANGELOG.md

@@ -11,6 +11,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+## [6.1.0] - 2024-02-07
+
+- Major Version 6.1.0 now Generally Available.
+- See [Upgrade Guide](https://github.com/microsoftgraph/msgraph-sdk-java/blob/dev/docs/upgrade-to-v6.md) for more information. 
+
 ## [5.80.0] - 2024-01-23
 
 ### Added 

README.md

@@ -1,4 +1,5 @@
 # Microsoft Graph SDK for Java
+## Version 6.1.0 now Generally Available (GA)! 
 
 [![Download](https://img.shields.io/maven-central/v/com.microsoft.graph/microsoft-graph.svg)](https://search.maven.org/artifact/com.microsoft.graph/microsoft-graph)
 
@@ -19,11 +20,11 @@ repositories {
 
 dependencies {
     // Include the sdk as a dependency
-    implementation 'com.microsoft.graph:microsoft-graph:5.80.0'
+    implementation 'com.microsoft.graph:microsoft-graph:6.1.0'
     // Uncomment the line below if you are building an android application
     //implementation 'com.google.guava:guava:30.1.1-android'
-    // This dependency is only needed if you are using the TokenCrendentialAuthProvider
-    implementation 'com.azure:azure-identity:1.2.5'
+    // This dependency is only needed if you are using a TokenCredential object for authentication
+    implementation 'com.azure:azure-identity:1.11.0'
 }
 ```
 
@@ -36,13 +37,13 @@ Add the dependency in `dependencies` in pom.xml
   <!-- Include the sdk as a dependency -->
   <groupId>com.microsoft.graph</groupId>
   <artifactId>microsoft-graph</artifactId>
-  <version>5.80.0</version>
+  <version>6.1.0</version>
 </dependency>
 <dependency>
-  <!-- This dependency is only needed if you are using the TokenCredentialAuthProvider -->
+  <!-- This dependency is only needed if you are using a TokenCredential object for authentication -->
   <groupId>com.azure</groupId>
   <artifactId>azure-identity</artifactId>
-  <version>1.2.5</version>
+  <version>1.11.0</version>
 </dependency>
 ```
 
@@ -58,7 +59,7 @@ Register your application by following the steps at [Register your app with the
 
 ### 2.2 Create an IAuthenticationProvider object
 
-An instance of the **GraphServiceClient** class handles building requests, sending them to the Microsoft Graph API, and processing the responses. To create a new instance of this class, you need to provide an instance of `IAuthenticationProvider`, which can authenticate requests to Microsoft Graph.
+An instance of the **GraphServiceClient** class handles building requests, sending them to the Microsoft Graph API, and processing the responses. To create a new instance of this class, you need to provide an instance of `AuthenticationProvider`, which can authenticate requests to Microsoft Graph.
 
 For an example of how to get an authentication provider, see [choose a Microsoft Graph authentication provider](https://docs.microsoft.com/graph/sdks/choose-authentication-providers?tabs=Java).
 
@@ -67,43 +68,26 @@ For an example of how to get an authentication provider, see [choose a Microsoft
 After you have set the correct application ID and URL, you must get a **GraphServiceClient** object to make requests against the service. The SDK stores the account information for you, but when a user signs in for the first time, it invokes the UI to get the user's account information.
 
 ```java
-GraphServiceClient<Request> graphClient = 
-  GraphServiceClient
-    .builder()
-    .authenticationProvider(authenticationProvider)
-    .buildClient();
+final AzureIdentityAuthenticationProvider authenticationProvider = 
+        new AzureIdentityAuthenticationProvider(credential, null, scopes);
+GraphServiceClient graphClient = new GraphServiceClient(authenticationProvider)
+
+//Alternatively
+GraphServiceClient graphClient = new GraphServiceClient(credential, scopes);
 ```
 
 ## 3. Make requests against the service
 
 After you have a GraphServiceClient that is authenticated, you can begin making calls against the service. The requests against the service look like our [REST API](https://developer.microsoft.com/en-us/graph/docs/concepts/overview).
 
-### 3.1 Get the user's drive
-
-To retrieve the user's drive:
-
-```java
-final Drive result = graphClient
-  .me()
-  .drive()
-  .buildRequest()
-  .get();
-System.out.println("Found Drive " + result.id);
-```
+### 3.1 Get the user info
 
-Or with the asynchronous API.
+To retrieve the user's information:
 
 ```java
-graphClient
-  .me()
-  .drive()
-  .buildRequest()
-  .futureGet()
-  .thenApply(result -> {
-    System.out.println("Found Drive " + result.id);
-  });
+User me = graphClient.me().get();
+System.out.printf("Hello %s, your ID is %s%n", me.getDisplayName(), me.getId());
 ```
-
 ## 4. Documentation
 
 For more detailed documentation, see:
@@ -134,82 +118,3 @@ Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the [MI
 ## 9. Third-party notices
 
 [Third-party notices](THIRD%20PARTY%20NOTICES)
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

android/build.gradle

@@ -2,15 +2,14 @@ buildscript {
     repositories {
         google()
         gradlePluginPortal()
-		maven {
-			url "https://plugins.gradle.org/m2/"
-		}
+		maven { url 'https://plugins.gradle.org/m2/' }
     }
 
     dependencies {
         classpath "com.gradle:gradle-enterprise-gradle-plugin:3.16.2"
-        classpath "com.android.tools.build:gradle:8.2.2"
+        classpath "gradle.plugin.com.github.viswaramamoorthy:gradle-util-plugins:0.1.0-RELEASE"
         classpath "com.github.ben-manes:gradle-versions-plugin:0.51.0"
+        classpath "com.android.tools.build:gradle:8.2.2"
     }
 }
 
@@ -21,6 +20,7 @@ repositories {
 
 apply plugin: "com.android.library"
 apply plugin: "com.github.ben-manes.versions"
+apply plugin: "com.github.ManifestClasspath"
 
 android {
     namespace 'com.microsoft.graph'

android/gradle.properties

@@ -19,15 +19,15 @@
 
 # The size of the library demands a large amount of RAM to build. Increase as necessary if you get GC errors
 ## linux requires 10G, OSX requires 11G
-org.gradle.jvmargs=-Xmx2g
+org.gradle.jvmargs=-Xmx16g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 org.gradle.parallel=true
 org.gradle.caching=true
 
 mavenGroupId         = com.microsoft.graph
 mavenArtifactId      = microsoft-graph
-mavenMajorVersion    = 2
-mavenMinorVersion    = 3
-mavenPatchVersion    = 1
+mavenMajorVersion    = 6
+mavenMinorVersion    = 1
+mavenPatchVersion    = 0
 mavenArtifactSuffix = 
 
 #These values are used to run functional tests
@@ -40,4 +40,4 @@ Password="PASSWORD"
 
 #enable mavenCentralPublishingEnabled to publish to maven central
 mavenCentralSnapshotArtifactSuffix = -SNAPSHOT
-mavenCentralPublishingEnabled=false
+mavenCentralPublishingEnabled=true