From c0a6291d139a18af581d5a8081f017bccbe3cd80 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Tue, 27 Apr 2021 10:14:27 -0400 Subject: [PATCH 01/13] - updates reference file for dependency tree --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index cd380e434..390f42d75 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ com.google.guava guava - 30.1-jre + 30.1.1-jre com.squareup.okhttp3 @@ -35,18 +35,18 @@ com.azure azure-identity - 1.2.0 + 1.2.5 org.junit.jupiter junit-jupiter-api - 5.5.2 + 5.7.1 test org.mockito - mockito-core - 3.8.0 + mockito-inline + 3.9.0 test From 3c3639f30041039ad24b9e1322bc1a3a63d287a2 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Tue, 27 Apr 2021 10:16:37 -0400 Subject: [PATCH 02/13] - adds maven to dependabot to keep dependencies tree in sync with gradle --- .github/dependabot.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 75c8395a5..865793c50 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,6 +5,11 @@ updates: schedule: interval: daily open-pull-requests-limit: 10 +- package-ecosystem: maven + directory: "/" + schedule: + interval: daily + open-pull-requests-limit: 10 - package-ecosystem: github-actions directory: "/" schedule: From 1d5c5a5fce58071c157a1589dbd2adf95e762936 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Tue, 27 Apr 2021 10:16:59 -0400 Subject: [PATCH 03/13] - adds devx api yaml header file --- devx.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 devx.yml diff --git a/devx.yml b/devx.yml new file mode 100644 index 000000000..f52c6708d --- /dev/null +++ b/devx.yml @@ -0,0 +1,6 @@ +languages: +- java +extensions: + services: + - Microsoft Graph +dependencyFile: /gradle/dependencies.gradle From 1e60057ec7cdf535e4fd11933f1d761bfeb9589f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Apr 2021 05:43:55 +0000 Subject: [PATCH 04/13] Bump com.github.spotbugs from 4.7.0 to 4.7.1 Bumps com.github.spotbugs from 4.7.0 to 4.7.1. Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ac238a4c5..9afd2532b 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ plugins { id 'maven-publish' id 'signing' id 'jacoco' - id 'com.github.spotbugs' version '4.7.0' + id 'com.github.spotbugs' version '4.7.1' } java { From 1a3e08ceff9c6bbb66455a45a5cfe4b607f24397 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Fri, 30 Apr 2021 08:45:41 -0400 Subject: [PATCH 05/13] - 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 06/13] - 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 07/13] - 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 08/13] - 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 09/13] - 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() } From 29377df5560978365d0d97d35eedf6b2323c021a Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Mon, 10 May 2021 10:37:09 +0200 Subject: [PATCH 10/13] - updates jacoco version to remove snapshot reference since it was released --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9afd2532b..7d4be0145 100644 --- a/build.gradle +++ b/build.gradle @@ -30,7 +30,7 @@ jacocoTestReport { } jacoco { - toolVersion = "0.8.7-SNAPSHOT" //https://github.com/gradle/gradle/issues/15038 + toolVersion = "0.8.7" } spotbugsMain { From 063d2ef8e91ae9c255ba10bdb14ead5a4bab00d4 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Mon, 10 May 2021 11:29:15 +0200 Subject: [PATCH 11/13] - fixes #196 a bug where delta tokens would not be extracted properly --- .../microsoft/graph/http/BaseDeltaCollectionRequest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/microsoft/graph/http/BaseDeltaCollectionRequest.java b/src/main/java/com/microsoft/graph/http/BaseDeltaCollectionRequest.java index 96f6e964d..40afa6faf 100644 --- a/src/main/java/com/microsoft/graph/http/BaseDeltaCollectionRequest.java +++ b/src/main/java/com/microsoft/graph/http/BaseDeltaCollectionRequest.java @@ -81,7 +81,7 @@ protected void addDeltaTokenOption(@Nonnull final String value, @Nonnull final S * ?token=thetoken (onedrive) * delta(token='thetoken') (formal OData function usage) */ - private static Pattern pattern = Pattern.compile("(?i)(?>\\$?delta)?token=['\"]?([\\w-\\.]+)"); + private static Pattern pattern = Pattern.compile("(?>[$]?delta)?token=['\"]?([\\w\\-\\.]+)", Pattern.CASE_INSENSITIVE); /** * Gets the delta token from the delta link provided by the previous response * @param deltaLink the delta link provided by the previous request @@ -91,9 +91,9 @@ protected void addDeltaTokenOption(@Nonnull final String value, @Nonnull final S protected String getDeltaTokenFromLink(@Nonnull final String deltaLink) { Objects.requireNonNull(deltaLink, "parameter deltaLink cannot be null"); final Matcher matcher = pattern.matcher(deltaLink); - if(matcher.matches()) { + if(matcher.find()) { return matcher.group(1); } - return ""; + return ""; } } From e33ec2d049b82b37a25f7b1baed203e14ffacf29 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 May 2021 05:09:49 +0000 Subject: [PATCH 12/13] Bump azure-core from 1.15.0 to 1.16.0 Bumps [azure-core](https://github.com/Azure/azure-sdk-for-java) from 1.15.0 to 1.16.0. - [Release notes](https://github.com/Azure/azure-sdk-for-java/releases) - [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-core_1.15.0...azure-core_1.16.0) Signed-off-by: dependabot[bot] --- gradle/dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 623020b5c..23858b144 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-core:1.15.0' + api 'com.azure:azure-core:1.16.0' } \ No newline at end of file From 8cd455b6e3c6197dd62b185a43895cd7da4327d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 May 2021 06:20:25 +0000 Subject: [PATCH 13/13] Bump azure-core from 1.15.0 to 1.16.0 Bumps [azure-core](https://github.com/Azure/azure-sdk-for-java) from 1.15.0 to 1.16.0. - [Release notes](https://github.com/Azure/azure-sdk-for-java/releases) - [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-core_1.15.0...azure-core_1.16.0) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0dccab066..d0659c0cc 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ com.azure azure-core - 1.15.0 + 1.16.0 org.junit.jupiter