Merge pull request #858 from microsoftgraph/feature/6.0

6.0.1 Release

Author: baywet

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

@@ -13,7 +13,7 @@ on:
 
 jobs:
   lint-api-level:
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, 1ES.Pool=1es-ubuntu-msgraph-beta-sdk-java-mem-latest]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4

.github/workflows/codeql-analysis.yml

@@ -24,8 +24,8 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
-    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
+    runs-on: macos-latest #[self-hosted, 1ES.Pool=1es-ubuntu-msgraph-beta-sdk-java-mem-latest]
+    #timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
     permissions:
       actions: read
       contents: read
@@ -56,6 +56,11 @@ jobs:
         uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
+          threads: 4
+          #init-heap: 1024M  # Initial heap size
+          #max-heap: 4096M  # Maximum heap size
+          ram: 4096
+        
           # If you wish to specify custom queries, you can do so here or in a config file.
           # By default, queries listed here will override any specified in a config file.
           # Prefix the list here with "+" to use these queries and those in the config file.
@@ -77,10 +82,10 @@ jobs:
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
-      - name: Build with Gradle
-        run: ./gradlew build
-
+      - name: Build #with Gradle
+        run: gradle clean build "-Dorg.gradle.jvmargs=-Xmx4g -Xms1g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8"
+            
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v3
         with:
-          category: "/language:${{matrix.language}}"
+          category: "/language:${{matrix.language}}"

.github/workflows/gradle-build.yml

@@ -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-beta-sdk-java.jar 
-      PRIOR_PKG_DIFF: ./artifacts/previous/build/libs/msgraph-beta-sdk-java.jar
+      CURRENT_PKG_DIFF: ./artifacts/current-kiota/build/libs/msgraph-beta-sdk-java.jar 
+      PRIOR_PKG_DIFF: ./artifacts/previous-kiota/build/libs/msgraph-beta-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/action-download-artifact@v3.0.0
         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 and Github Release
 
 on:
   push:
-    branches: [ dev, feature/6.0 ]
+    branches: [ "dev", "feature/6.0" ]
     paths-ignore:
      - '.gradle/wrapper'
      - '.gitignore'
@@ -13,6 +13,7 @@ on:
 
 env: 
   PREVIEW_TASK: publishSnapshotPublicationToSonatypeSnapshotRepository
+  PUBLISH_TASK:  publishMavenCentralReleasePublicationToSonatypeRepository
 
 jobs:
   maven_Preview:
@@ -62,8 +63,55 @@ jobs:
             **/gradle/**
             Scripts/**
 
+  maven_Release:
+    if: ${{ github.ref == 'refs/heads/dev' }}
+    environment:
+      name: maven_central_release
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: 18
+          distribution: 'adopt'
+          cache: gradle
+      - name: Easy detect-secrets
+        uses: RobertFischer/detect-secrets-action@v2.0.0
+      - name: Download File
+        run: .\Scripts\decodeAndWrite.ps1 -encodedValue $env:ENCODED_VALUE -outputPath $env:OUTPUT_PATH
+        shell: pwsh
+        env:
+          ENCODED_VALUE: ${{ secrets.LOCAL_PROPERTIES }}
+          OUTPUT_PATH: '.\local.properties'
+      - name: Download File
+        run: .\Scripts\decodeAndWrite.ps1 -encodedValue $env:ENCODED_VALUE -outputPath $env:OUTPUT_PATH
+        shell: pwsh
+        env:
+          ENCODED_VALUE: ${{ secrets.SECRING_GPG }}
+          OUTPUT_PATH: '.\secring.gpg'
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Publish
+        run: ./gradlew $PUBLISH_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/**
+
   create_Tag:
-    needs: maven_Preview
+    needs: maven_Release
     runs-on: ubuntu-latest
     env:
       RELEASE_TAG: ""
@@ -78,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

@@ -1,6 +1,6 @@
 # Changelog
 
-All notable changes to this project will be documented in this file.
+All notable changes to this project will be documented in this file
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
@@ -11,6 +11,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+## [6.1.0] - 2024-02-07
+
+### Added
+
+- 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) and README for more information.
+
 ## [0.78.0] - 2023-08-10
 
 ### Changed

README.md

@@ -1,4 +1,5 @@
 # Microsoft Graph SDK for Java
+## Version 6.1.0 now Generally Available! 
 
 [![Download](https://img.shields.io/nexus/s/https/oss.sonatype.org/com.microsoft.graph/microsoft-graph-beta.svg)](https://oss.sonatype.org/content/repositories/snapshots/com/microsoft/graph/microsoft-graph-beta/)
 
@@ -15,16 +16,16 @@ Add the repository and a compile dependency for `microsoft-graph-beta` to your p
 
 ```Groovy
 repositories {
-  maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
+  mavenCentral()
 }
 
 dependencies {
     // Include the sdk as a dependency
-    implementation 'com.microsoft.graph:microsoft-graph-beta:0.78.0-SNAPSHOT'
+    implementation 'com.microsoft.graph:microsoft-graph-beta: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'
+    implementation 'com.azure:azure-identity:1.11.0'
 }
 ```
 
@@ -37,26 +38,16 @@ Add the dependency in `dependencies` in pom.xml
   <!-- Include the sdk as a dependency -->
   <groupId>com.microsoft.graph</groupId>
   <artifactId>microsoft-graph-beta</artifactId>
-  <version>0.78.0-SNAPSHOT</version>
+  <version>6.1.0</version>
 </dependency>
 <dependency>
   <!-- This dependency is only needed if you are using the TokenCrendentialAuthProvider -->
   <groupId>com.azure</groupId>
   <artifactId>azure-identity</artifactId>
-  <version>1.2.5</version>
+  <version>1.11.0</version>
 </dependency>
 ```
 
-Add the repository in `repositories` in pom.xml
-
-```xml
-<repository>
-  <id>sonatype-snapshot</id>
-  <name>Sonatype Snapshot</name>
-  <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-</repository>
-```
-
 >**Note:** if the `repositories` node doesn't exist, add it in `project`. For more information about the maven repositories configuration, [refer to this documentation](https://maven.apache.org/guides/mini/guide-multiple-repositories.html).
 
 ### 1.3 Enable ProGuard (Android)
@@ -71,7 +62,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).
 
@@ -80,43 +71,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
+### 3.1 Get the user info
 
-To retrieve the user's drive:
+To retrieve the user's information:
 
 ```java
-final Drive result = graphClient
-  .me()
-  .drive()
-  .buildRequest()
-  .get();
-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());
 ```
-
-Or with the asynchronous API.
-
-```java
-graphClient
-  .me()
-  .drive()
-  .buildRequest()
-  .futureGet()
-  .thenApply(result -> {
-    System.out.println("Found Drive " + result.id);
-  });
-```
-
 ## 4. Documentation
 
 For more detailed documentation, see:
@@ -147,6 +121,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,13 +2,12 @@ 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 "gradle.plugin.com.github.viswaramamoorthy:gradle-util-plugins:0.1.0-RELEASE"
         classpath "com.android.tools.build:gradle:8.2.2"
         classpath "com.github.ben-manes:gradle-versions-plugin:0.51.0"
     }
@@ -21,9 +20,10 @@ repositories {
 
 apply plugin: "com.android.library"
 apply plugin: "com.github.ben-manes.versions"
+apply plugin: "com.github.ManifestClasspath"
 
 android {
-    namespace "com.microsoft.graph"
+    namespace 'com.microsoft.graph'
 
     compileSdkVersion 34
 

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=-Xmx4g
+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
+mavenArtifactId      = microsoft-graph-beta
+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