Merge branch 'kiota/beta/pipelinebuild/129533' into dependabot/github_actions/feature/6.0/actions/checkout-4

Author: ramsessanchez

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

@@ -16,12 +16,12 @@ jobs:
     runs-on: [self-hosted, 1ES.Pool=1es-ubuntu-msgraph-beta-sdk-java-mem-latest]
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
           java-version: 18
       - name: Setup Android SDK
-        uses: android-actions/setup-android@v2.0.10
+        uses: android-actions/setup-android@v3.2.0
       - name: Add execution right to the script
         run: chmod +x gradlew
         working-directory: ./android

.github/workflows/auto-merge-dependabot.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1.5.1
+        uses: dependabot/fetch-metadata@v1.6.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 

.github/workflows/codeql-analysis.yml

@@ -24,8 +24,8 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: [self-hosted, 1ES.Pool=1es-ubuntu-msgraph-beta-sdk-java-mem-latest]
-    #timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
+    runs-on: 'macos-latest'
+    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
     permissions:
       actions: read
       contents: read
@@ -45,45 +45,8 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 20
           distribution: 'temurin'
           cache: gradle
-
-      # Initializes the CodeQL tools for scanning.
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
-        with:
-          languages: ${{ matrix.language }}
-          threads: 4
-          #ram: 8384
-        
-          # 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.
-
-          # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-          # queries: security-extended,security-and-quality
-
-
-      # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
-      # If this step fails, then you should remove it and run the build manually (see below)
-      # - name: Autobuild
-      #   uses: github/codeql-action/autobuild@v2
-
-      # ℹ️ Command-line programs to run using the OS shell.
-      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
-
-      #   If the Autobuild fails above, remove it and uncomment the following three lines.
-      #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
-
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-      - name: Build with Gradle
-        run: ./gradlew build
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
-        with:
-          category: "/language:${{matrix.language}}"

.github/workflows/git-release.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Download Build Artifact
-        uses: dawidd6/action-download-artifact@v2.27.0
+        uses: dawidd6/action-download-artifact@v2.28.0
         with:
           workflow: preview-and-release.yml
           workflow_conclusion: success

.github/workflows/gradle-build.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 18
           distribution: 'adopt'
@@ -63,7 +63,7 @@ jobs:
     steps: 
       - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 18
           distribution: 'adopt'
@@ -74,7 +74,7 @@ jobs:
           name: kiota-drop
           path: artifacts/current-kiota/
       - name: Download Last Successful Build
-        uses: dawidd6/action-download-artifact@v2.27.0
+        uses: dawidd6/action-download-artifact@v2.28.0
         with: 
           workflow: preview-and-release.yml
           workflow_conclusion: success

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

@@ -25,7 +25,7 @@ jobs:
       - name: Easy detect-secrets
         uses: RobertFischer/detect-secrets-action@v2.0.0
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 18
           distribution: 'adopt'
@@ -74,11 +74,11 @@ jobs:
         run: .\Scripts\getLatestVersion.ps1
         shell: pwsh    
       - name: Create tag
-        uses: rickstaa/action-create-tag@v1.6.2
+        uses: rickstaa/action-create-tag@v1.7.1
         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 }}

.github/workflows/projectsbot.yml

@@ -11,7 +11,7 @@ jobs:
     steps:
       - name: Generate token
         id: generate_token
-        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
+        uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a
         with:
           app_id: ${{ secrets.GRAPHBOT_APP_ID }}
           private_key: ${{ secrets.GRAPHBOT_APP_PEM }}

README.md

@@ -1,4 +1,5 @@
 # Microsoft Graph SDK for Java
+## Version 6.0.0 now in Release Candidate stage!
 
 [![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/)
 
@@ -21,11 +22,11 @@ repositories {
 
 dependencies {
     // Include the sdk as a dependency
-    implementation 'com.microsoft.graph:microsoft-graph-beta:6.0.0-SNAPSHOT'
+    implementation 'com.microsoft.graph:microsoft-graph-beta:6.0.0-RC'
     // 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.4.0'
+    implementation 'com.azure:azure-identity:1.11.0'
 }
 ```
 
@@ -38,13 +39,13 @@ 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>6.0.0-SNAPSHOT</version>
+  <version>6.0.0-RC</version>
 </dependency>
 <dependency>
   <!-- This dependency is only needed if you are using the TokenCrendentialAuthProvider -->
   <groupId>com.azure</groupId>
   <artifactId>azure-identity</artifactId>
-  <version>1.4.0</version>
+  <version>1.11.0</version>
 </dependency>
 ```
 
@@ -98,12 +99,8 @@ After you have a GraphServiceClient that is authenticated, you can begin making
 To retrieve the user's information:
 
 ```java
-graphClient.me().get().thenAccept(me -> {
-    System.out.printf("Hello %s, your ID is %s%n", me.getDisplayName(), me.getId());
-}).exceptionally(err -> {
-    System.out.printf("Error, %s%n", err.getMessage());
-    return null;
-}).join();
+User me = graphClient.me().get();
+System.out.printf("Hello %s, your ID is %s%n", me.getDisplayName(), me.getId());
 ```
 ## 4. Documentation
 

android/build.gradle

@@ -6,10 +6,10 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.14.1"
+        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.15.1"
         classpath "gradle.plugin.com.github.viswaramamoorthy:gradle-util-plugins:0.1.0-RELEASE"
-        classpath "com.android.tools.build:gradle:8.1.1"
-        classpath "com.github.ben-manes:gradle-versions-plugin:0.47.0"
+        classpath "com.android.tools.build:gradle:8.1.4"
+        classpath "com.github.ben-manes:gradle-versions-plugin:0.50.0"
     }
 }