Merge pull request #1557 from microsoftgraph/dev

release 3.1.7

Author: baywet

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

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

.github/workflows/git-release.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Download Build Artifact
-        uses: dawidd6/[email protected].2
+        uses: dawidd6/[email protected].4
         with:
           workflow: build-and-publish.yml
           workflow_conclusion: success

CHANGELOG.md

@@ -11,6 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+## [3.1.7] - 2024-03-28
+
+### Changed
+
+- Updates kiota dependencies to solve for misalignments.
+
 ## [3.1.6] - 2024-02-29
 
 ### Changed

android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
 
     dependencies {
         classpath "com.gradle:gradle-enterprise-gradle-plugin:3.16.2"
-        classpath "com.android.tools.build:gradle:8.3.0"
+        classpath "com.android.tools.build:gradle:8.3.1"
         classpath "com.github.ben-manes:gradle-versions-plugin:0.51.0"
     }
 }

build.gradle

@@ -5,8 +5,8 @@ plugins {
     id 'maven-publish'
     id 'signing'
     id 'jacoco'
-    id 'com.github.spotbugs' version '6.0.7'
-    id "org.sonarqube" version "4.4.1.3373"
+    id 'com.github.spotbugs' version '6.0.9'
+    id "org.sonarqube" version "5.0.0.4638"
 }
 
 java {

gradle.properties

@@ -25,7 +25,7 @@ mavenGroupId         = com.microsoft.graph
 mavenArtifactId      = microsoft-graph-core
 mavenMajorVersion    = 3
 mavenMinorVersion    = 1
-mavenPatchVersion    = 6
+mavenPatchVersion    = 7
 mavenArtifactSuffix =
 
 #These values are used to run functional tests

gradle/dependencies.gradle

@@ -4,23 +4,22 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.2'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
     testImplementation 'org.mockito:mockito-inline:5.2.0'
-    testImplementation 'io.opentelemetry:opentelemetry-api:1.35.0'
-    testImplementation 'io.opentelemetry:opentelemetry-context:1.35.0'
-    testImplementation 'io.opentelemetry.semconv:opentelemetry-semconv:1.23.1-alpha'
-    testImplementation 'io.github.std-uritemplate:std-uritemplate:0.0.54'
+    testImplementation 'io.opentelemetry:opentelemetry-api:1.36.0'
+    testImplementation 'io.opentelemetry:opentelemetry-context:1.36.0'
+    testImplementation 'io.github.std-uritemplate:std-uritemplate:0.0.55'
 
     implementation 'com.google.code.gson:gson:2.10.1'
 
     implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1'
 
     api 'com.squareup.okhttp3:okhttp:4.12.0'
-    api 'com.azure:azure-core:1.46.0'
+    api 'com.azure:azure-core:1.47.0'
 
-    api 'com.microsoft.kiota:microsoft-kiota-abstractions:1.0.5'
-    implementation 'com.microsoft.kiota:microsoft-kiota-authentication-azure:1.0.5'
-    implementation 'com.microsoft.kiota:microsoft-kiota-http-okHttp:1.0.5'
-    implementation 'com.microsoft.kiota:microsoft-kiota-serialization-json:1.0.5'
-    implementation 'com.microsoft.kiota:microsoft-kiota-serialization-text:1.0.5'
-    implementation 'com.microsoft.kiota:microsoft-kiota-serialization-form:1.0.5'
-    implementation 'com.microsoft.kiota:microsoft-kiota-serialization-multipart:1.0.5'
+    api 'com.microsoft.kiota:microsoft-kiota-abstractions:1.1.2'
+    implementation 'com.microsoft.kiota:microsoft-kiota-authentication-azure:1.1.2'
+    implementation 'com.microsoft.kiota:microsoft-kiota-http-okHttp:1.1.2'
+    implementation 'com.microsoft.kiota:microsoft-kiota-serialization-json:1.1.2'
+    implementation 'com.microsoft.kiota:microsoft-kiota-serialization-text:1.1.2'
+    implementation 'com.microsoft.kiota:microsoft-kiota-serialization-form:1.1.2'
+    implementation 'com.microsoft.kiota:microsoft-kiota-serialization-multipart:1.1.2'
 }

pom.xml

@@ -22,11 +22,6 @@
             <artifactId>gson</artifactId>
             <version>2.10.1</version>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>33.0.0-jre</version>
-        </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
@@ -35,7 +30,7 @@
         <dependency>
             <groupId>com.azure</groupId>
             <artifactId>azure-core</artifactId>
-            <version>1.46.0</version>
+            <version>1.47.0</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>

src/main/java/com/microsoft/graph/core/CoreConstants.java

@@ -14,7 +14,7 @@ private CoreConstants() {}
     private static class VersionValues {
         private static final int MAJOR = 3;
         private static final int MINOR = 1;
-        private static final int PATCH = 6;
+        private static final int PATCH = 7;
     }
 
     /**