diff --git a/.github/workflows/auto-merge-dependabot.yml b/.github/workflows/auto-merge-dependabot.yml
index 7954170c7..11e6587c5 100644
--- 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
index 408d0a92a..3fc1d5cc2 100644
--- 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
index 28963e60a..30694c1ef 100644
--- 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
index d64cd4917..e6441136f 100644
Binary files a/android/gradle/wrapper/gradle-wrapper.jar and b/android/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 1af9e0930..b82aa23a4 100644
--- 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
index 93e3f59f1..25da30dbd 100644
--- 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
index d0ed470cf..4df6e46a4 100644
--- 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
index 7d0e4dc98..51ef5bc6e 100644
--- 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
index 189a32be4..fcb4bce5b 100644
--- 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
index d64cd4917..e6441136f 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1af9e0930..b82aa23a4 100644
--- 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
index 93e3f59f1..25da30dbd 100644
--- 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
index d82395394..0d59eec9a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
com.azure
azure-core
- 1.48.0
+ 1.49.0
org.junit.jupiter
@@ -53,7 +53,7 @@
com.github.spotbugs
spotbugs-annotations
- 4.8.4
+ 4.8.5
diff --git a/readme.md b/readme.md
index e2ebbd0f6..a4d0b5175 100644
--- 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
com.microsoft.graph
microsoft-graph-core
- 3.1.6
+ 3.1.10
com.azure
azure-identity
@@ -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
index e32e3b7c2..fd600127f 100644
--- 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;
}
/**