Skip to content

Commit ec35545

Browse files
authored
Merge pull request #736 from microsoftgraph/bugfix/deps-az-id
- removes unnecessary dependency to fix conflict with azure identity
2 parents 5302002 + 35496d0 commit ec35545

File tree

5 files changed

+20
-9
lines changed

5 files changed

+20
-9
lines changed

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111

1212
### Changed
1313

14+
## [2.0.16] - 2023-01-30
15+
16+
### Changed
17+
18+
- Removed unnecessary `net.jcip:jcip-annotations` dependency causing conflicts with Azure Identity.
19+
20+
## [2.0.15] - 2023-01-19
21+
22+
### Changed
23+
24+
- Switched required dependencies from implementation to api to avoid missing dependencies in some scenarios.
25+
1426
## [2.0.14] - 2022-10-06
1527

1628
### Added

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ mavenGroupId = com.microsoft.graph
2525
mavenArtifactId = microsoft-graph-core
2626
mavenMajorVersion = 2
2727
mavenMinorVersion = 0
28-
mavenPatchVersion = 15
28+
mavenPatchVersion = 16
2929
mavenArtifactSuffix =
3030

3131
#These values are used to run functional tests

gradle/dependencies.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,5 @@ dependencies {
1212
implementation 'com.google.code.gson:gson:2.10.1'
1313
api 'com.azure:azure-core:1.35.0'
1414

15-
api 'net.jcip:jcip-annotations:1.0'
1615
api 'com.github.spotbugs:spotbugs-annotations:4.7.3'
1716
}

readme.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ repositories {
2222
2323
dependencies {
2424
// Include the sdk as a dependency
25-
implementation 'com.microsoft.graph:microsoft-graph-core:2.0.12'
26-
// This dependency is only needed if you are using the TokenCrendentialAuthProvider
27-
implementation 'com.azure:azure-identity:1.3.1'
25+
implementation 'com.microsoft.graph:microsoft-graph-core:2.0.16'
26+
// This dependency is only needed if you are using the TokenCredentialAuthProvider
27+
implementation 'com.azure:azure-identity:1.7.2'
2828
}
2929
```
3030

@@ -37,11 +37,11 @@ Add the dependency in `dependencies` in pom.xml
3737
<!-- Include the sdk as a dependency -->
3838
<groupId>com.microsoft.graph</groupId>
3939
<artifactId>microsoft-graph-core</artifactId>
40-
<version>2.0.12</version>
41-
<!-- This dependency is only needed if you are using the TokenCrendentialAuthProvider -->
40+
<version>2.0.16</version>
41+
<!-- This dependency is only needed if you are using the TokenCredentialAuthProvider -->
4242
<groupId>com.azure</groupId>
4343
<artifactId>azure-identity</artifactId>
44-
<version>1.3.1</version>
44+
<version>1.7.2</version>
4545
</dependency>
4646
```
4747

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public class TelemetryHandler implements Interceptor{
2424
/**
2525
* Current SDK version
2626
*/
27-
public static final String VERSION = "v2.0.15";
27+
public static final String VERSION = "v2.0.16";
2828
/**
2929
* Version prefix
3030
*/

0 commit comments

Comments
 (0)