Merge pull request #1602 from microsoftgraph/dev

Ndiritu · web-flow · commit e4d7342b47cc · 2024-05-09T10:25:39.000+03:00
Release 3.1.10
diff --git a/.github/workflows/auto-merge-dependabot.yml b/.github/workflows/auto-merge-dependabot.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v2.0.0
+        uses: dependabot/fetch-metadata@v2.1.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+## [3.1.10] - 2024-05-09
+
+### Changed
+
+- Downgraded `jakarta.annotation-api` dependency to `2.1.1` for java 8 compatibility
+
 ## [3.1.9] - 2024-04-23
 
 ### Changed
diff --git a/android/build.gradle b/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
 
     dependencies {
         classpath "com.gradle:gradle-enterprise-gradle-plugin:3.17.2"
-        classpath "com.android.tools.build:gradle:8.3.2"
+        classpath "com.android.tools.build:gradle:8.4.0"
         classpath "com.github.ben-manes:gradle-versions-plugin:0.51.0"
     }
 }
diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/android/gradlew.bat b/android/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ plugins {
     id 'maven-publish'
     id 'signing'
     id 'jacoco'
-    id 'com.github.spotbugs' version '6.0.12'
+    id 'com.github.spotbugs' version '6.0.14'
     id "org.sonarqube" version "5.0.0.4638"
 }
 
diff --git a/gradle.properties b/gradle.properties
@@ -25,7 +25,7 @@ mavenGroupId         = com.microsoft.graph
 mavenArtifactId      = microsoft-graph-core
 mavenMajorVersion    = 3
 mavenMinorVersion    = 1
-mavenPatchVersion    = 9
+mavenPatchVersion    = 10
 mavenArtifactSuffix =
 
 #These values are used to run functional tests
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -9,16 +9,16 @@ dependencies {
     testImplementation 'io.github.std-uritemplate:std-uritemplate:0.0.57'
     implementation 'com.google.code.gson:gson:2.10.1'
 
-    implementation 'jakarta.annotation:jakarta.annotation-api:3.0.0'
+    implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1'
 
     api 'com.squareup.okhttp3:okhttp:4.12.0'
-    api 'com.azure:azure-core:1.48.0'
+    api 'com.azure:azure-core:1.49.0'
 
-    api 'com.microsoft.kiota:microsoft-kiota-abstractions:1.1.7'
-    implementation 'com.microsoft.kiota:microsoft-kiota-authentication-azure:1.1.7'
-    implementation 'com.microsoft.kiota:microsoft-kiota-http-okHttp:1.1.7'
-    implementation 'com.microsoft.kiota:microsoft-kiota-serialization-json:1.1.7'
-    implementation 'com.microsoft.kiota:microsoft-kiota-serialization-text:1.1.7'
-    implementation 'com.microsoft.kiota:microsoft-kiota-serialization-form:1.1.7'
-    implementation 'com.microsoft.kiota:microsoft-kiota-serialization-multipart:1.1.7'
+    api 'com.microsoft.kiota:microsoft-kiota-abstractions:1.1.11'
+    implementation 'com.microsoft.kiota:microsoft-kiota-authentication-azure:1.1.11'
+    implementation 'com.microsoft.kiota:microsoft-kiota-http-okHttp:1.1.11'
+    implementation 'com.microsoft.kiota:microsoft-kiota-serialization-json:1.1.11'
+    implementation 'com.microsoft.kiota:microsoft-kiota-serialization-text:1.1.11'
+    implementation 'com.microsoft.kiota:microsoft-kiota-serialization-form:1.1.11'
+    implementation 'com.microsoft.kiota:microsoft-kiota-serialization-multipart:1.1.11'
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew.bat b/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
diff --git a/pom.xml b/pom.xml
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>com.azure</groupId>
             <artifactId>azure-core</artifactId>
-            <version>1.48.0</version>
+            <version>1.49.0</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -53,7 +53,7 @@
         <dependency>
             <groupId>com.github.spotbugs</groupId>
             <artifactId>spotbugs-annotations</artifactId>
-            <version>4.8.4</version>
+            <version>4.8.5</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/readme.md b/readme.md
@@ -22,7 +22,7 @@ repositories {
 
 dependencies {
     // Include the sdk as a dependency
-    implementation 'com.microsoft.graph:microsoft-graph-core:3.1.6'
+    implementation 'com.microsoft.graph:microsoft-graph-core:3.1.10'
     // This dependency is only needed if you are using the TokenCredentialAuthProvider
     implementation 'com.azure:azure-identity:1.11.0'
 }
@@ -37,7 +37,7 @@ Add the dependency in `dependencies` in pom.xml
     <!-- Include the sdk as a dependency -->
     <groupId>com.microsoft.graph</groupId>
     <artifactId>microsoft-graph-core</artifactId>
-    <version>3.1.6</version>
+    <version>3.1.10</version>
     <!-- This dependency is only needed if you are using the TokenCredentialAuthProvider -->
     <groupId>com.azure</groupId>
     <artifactId>azure-identity</artifactId>
@@ -85,9 +85,9 @@ client.newCall(request).enqueue(new Callback() {
 	@Override
 	public void onResponse(Call call, Response response) throws IOException {
 		String responseBody = response.body().string();
-		// Your processing with the response body 
+		// Your processing with the response body
 	}
-			
+
 	@Override
 	public void onFailure(Call call, IOException e) {
 		e.printStackTrace();
@@ -106,9 +106,9 @@ client.newCall(request).enqueue(new Callback() {
 	@Override
 	public void onResponse(Call call, Response response) throws IOException {
 		String responseBody = response.body().string();
-		// Your processing with the response body 
+		// Your processing with the response body
 	}
-			
+
 	@Override
 	public void onFailure(Call call, IOException e) {
 		e.printStackTrace();
diff --git a/src/main/java/com/microsoft/graph/core/CoreConstants.java b/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 = 9;
+        private static final int PATCH = 10;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ buildscript {`
`6`	`6`
`7`	`7`	`dependencies {`
`8`	`8`	`classpath "com.gradle:gradle-enterprise-gradle-plugin:3.17.2"`
`9`		`- classpath "com.android.tools.build:gradle:8.3.2"`
	`9`	`+ classpath "com.android.tools.build:gradle:8.4.0"`
`10`	`10`	`classpath "com.github.ben-manes:gradle-versions-plugin:0.51.0"`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ plugins {`
`5`	`5`	`id 'maven-publish'`
`6`	`6`	`id 'signing'`
`7`	`7`	`id 'jacoco'`
`8`		`- id 'com.github.spotbugs' version '6.0.12'`
	`8`	`+ id 'com.github.spotbugs' version '6.0.14'`
`9`	`9`	`id "org.sonarqube" version "5.0.0.4638"`
`10`	`10`	`}`
`11`	`11`