From 1a3e08ceff9c6bbb66455a45a5cfe4b607f24397 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Fri, 30 Apr 2021 08:45:41 -0400 Subject: [PATCH 1/5] - fixes #194 and replaces the azure identity dependency by azure core --- gradle/dependencies.gradle | 2 +- readme.md | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 6f0989f69..623020b5c 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -9,5 +9,5 @@ dependencies { implementation 'com.google.guava:guava:30.1.1-jre' implementation 'com.google.code.gson:gson:2.8.6' - api 'com.azure:azure-identity:1.2.5' + api 'com.azure:azure-core:1.15.0' } \ No newline at end of file diff --git a/readme.md b/readme.md index fba8575a9..dbd5d59a2 100644 --- a/readme.md +++ b/readme.md @@ -21,6 +21,8 @@ repositories { dependencies { // Include the sdk as a dependency implementation 'com.microsoft.graph:microsoft-graph-core:2.0.1' + // This depdency is only needed if you are using the TokenCrendentialAuthProvider + implementation 'com.azure:azure-identity:1.2.5' } ``` @@ -30,9 +32,14 @@ Add the dependency in `dependencies` in pom.xml ```xml - com.microsoft.graph - microsoft-graph-core - 2.0.1 + + com.microsoft.graph + microsoft-graph-core + 2.0.1 + + com.azure + azure-identity + 1.2.5 ``` From 8eb2d066c3fee939bfcb96da1b04289493fd13fd Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Fri, 30 Apr 2021 08:47:41 -0400 Subject: [PATCH 2/5] - updates pom.xml to match updated depdencies --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 390f42d75..866d37de1 100644 --- a/pom.xml +++ b/pom.xml @@ -34,8 +34,8 @@ com.azure - azure-identity - 1.2.5 + azure-core + 1.15.0 org.junit.jupiter From 31ea40af248cc50166b427f1a24fb9798abf99e4 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Fri, 30 Apr 2021 08:48:25 -0400 Subject: [PATCH 3/5] - bumps patch version --- gradle.properties | 2 +- pom.xml | 2 +- readme.md | 4 ++-- .../java/com/microsoft/graph/httpcore/TelemetryHandler.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 59b53e444..93527857c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,7 +25,7 @@ mavenGroupId = com.microsoft.graph mavenArtifactId = microsoft-graph-core mavenMajorVersion = 2 mavenMinorVersion = 0 -mavenPatchVersion = 1 +mavenPatchVersion = 2 mavenArtifactSuffix = #These values are used to run functional tests diff --git a/pom.xml b/pom.xml index 866d37de1..0dccab066 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ com.microsoft.graph microsoft-graph-core - 2.0.1 + 2.0.2 pom diff --git a/readme.md b/readme.md index dbd5d59a2..5822b2fd4 100644 --- a/readme.md +++ b/readme.md @@ -20,7 +20,7 @@ repositories { dependencies { // Include the sdk as a dependency - implementation 'com.microsoft.graph:microsoft-graph-core:2.0.1' + implementation 'com.microsoft.graph:microsoft-graph-core:2.0.2' // This depdency is only needed if you are using the TokenCrendentialAuthProvider implementation 'com.azure:azure-identity:1.2.5' } @@ -35,7 +35,7 @@ Add the dependency in `dependencies` in pom.xml com.microsoft.graph microsoft-graph-core - 2.0.1 + 2.0.2 com.azure azure-identity diff --git a/src/main/java/com/microsoft/graph/httpcore/TelemetryHandler.java b/src/main/java/com/microsoft/graph/httpcore/TelemetryHandler.java index bb3f6d4aa..0d8f04962 100644 --- a/src/main/java/com/microsoft/graph/httpcore/TelemetryHandler.java +++ b/src/main/java/com/microsoft/graph/httpcore/TelemetryHandler.java @@ -25,7 +25,7 @@ public class TelemetryHandler implements Interceptor{ /** * Current SDK version */ - public static final String VERSION = "v2.0.1"; + public static final String VERSION = "v2.0.2"; /** * Verion prefix */ From 2b5ce3fe7dd53957f1a3e3ed04c1a809e979555e Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Fri, 30 Apr 2021 08:50:52 -0400 Subject: [PATCH 4/5] - typo fix --- readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/readme.md b/readme.md index 5822b2fd4..f5f4fdbf4 100644 --- a/readme.md +++ b/readme.md @@ -21,7 +21,7 @@ repositories { dependencies { // Include the sdk as a dependency implementation 'com.microsoft.graph:microsoft-graph-core:2.0.2' - // This depdency is only needed if you are using the TokenCrendentialAuthProvider + // This dependency is only needed if you are using the TokenCrendentialAuthProvider implementation 'com.azure:azure-identity:1.2.5' } ``` @@ -36,7 +36,7 @@ Add the dependency in `dependencies` in pom.xml com.microsoft.graph microsoft-graph-core 2.0.2 - + com.azure azure-identity 1.2.5 From c6a1be1bb3050e51f4989c551484a4b0eb7450b9 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Fri, 30 Apr 2021 08:51:46 -0400 Subject: [PATCH 5/5] - switches code sample to groovy --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index f5f4fdbf4..41f48045e 100644 --- a/readme.md +++ b/readme.md @@ -13,7 +13,7 @@ Get started with the Microsoft Graph Core SDK for Java by integrating the [Micro Add the repository and a compile dependency for `microsoft-graph-core` to your project's `build.gradle`: -```gradle +```groovy repositories { mavenCentral() }