Merge pull request #741 from microsoftgraph/dev

2.0.16 release

Author: baywet

.github/workflows/projectsbot.yml

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

CHANGELOG.md

@@ -11,6 +11,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+## [2.0.16] - 2023-01-30
+
+### Changed
+
+- Removed unnecessary `net.jcip:jcip-annotations` dependency causing conflicts with Azure Identity.
+
+## [2.0.15] - 2023-01-19
+
+### Changed
+
+- Switched required dependencies from implementation to api to avoid missing dependencies in some scenarios.
+
 ## [2.0.14] - 2022-10-06
 
 ### Added

android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.12.2"
+        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.12.3"
         classpath "com.android.tools.build:gradle:7.4.0"
         classpath "com.github.ben-manes:gradle-versions-plugin:0.44.0"
     }

gradle.properties

@@ -25,7 +25,7 @@ mavenGroupId         = com.microsoft.graph
 mavenArtifactId      = microsoft-graph-core
 mavenMajorVersion    = 2
 mavenMinorVersion    = 0
-mavenPatchVersion    = 15
+mavenPatchVersion    = 16
 mavenArtifactSuffix = 
 
 #These values are used to run functional tests

gradle/dependencies.gradle

@@ -3,7 +3,7 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.2'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
-    testImplementation 'org.mockito:mockito-inline:5.0.0'
+    testImplementation 'org.mockito:mockito-inline:5.1.1'
 
     api 'com.squareup.okhttp3:okhttp:4.10.0'
 
@@ -12,6 +12,5 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.10.1'
     api 'com.azure:azure-core:1.35.0'
 
-    api 'net.jcip:jcip-annotations:1.0'
     api 'com.github.spotbugs:spotbugs-annotations:4.7.3'
 }

pom.xml

@@ -52,7 +52,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-inline</artifactId>
-            <version>5.0.0</version>
+            <version>5.1.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>

readme.md

@@ -22,9 +22,9 @@ repositories {
 
 dependencies {
     // Include the sdk as a dependency
-    implementation 'com.microsoft.graph:microsoft-graph-core:2.0.12'
-    // This dependency is only needed if you are using the TokenCrendentialAuthProvider
-    implementation 'com.azure:azure-identity:1.3.1'
+    implementation 'com.microsoft.graph:microsoft-graph-core:2.0.16'
+    // This dependency is only needed if you are using the TokenCredentialAuthProvider
+    implementation 'com.azure:azure-identity:1.7.2'
 }
 ```
 
@@ -37,11 +37,11 @@ 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>2.0.12</version>
-    <!-- This dependency is only needed if you are using the TokenCrendentialAuthProvider -->
+    <version>2.0.16</version>
+    <!-- This dependency is only needed if you are using the TokenCredentialAuthProvider -->
     <groupId>com.azure</groupId>
     <artifactId>azure-identity</artifactId>
-    <version>1.3.1</version>
+    <version>1.7.2</version>
 </dependency>
 ```
 

src/main/java/com/microsoft/graph/httpcore/TelemetryHandler.java

@@ -24,7 +24,7 @@ public class TelemetryHandler implements Interceptor{
     /**
      * Current SDK version
      */
-    public static final String VERSION = "v2.0.15";
+    public static final String VERSION = "v2.0.16";
     /**
      * Version prefix
      */