Merge pull request #927 from microsoftgraph/dev

ramsessanchez · web-flow · commit 3dd51aed7658 · 2023-06-20T13:30:09.000-07:00
Release 2.0.19
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1 @@
-* @baywet @ddyett @MichaelMainer @zengin @ramsessanchez @andrueastman
+* @microsoftgraph/msgraph-devx-java-write
diff --git a/.github/policies/msgraph-sdk-java-core-branch-protection.yml b/.github/policies/msgraph-sdk-java-core-branch-protection.yml
@@ -0,0 +1,125 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# File initially created using https://github.com/MIchaelMainer/policyservicetoolkit/blob/main/branch_protection_export.ps1.
+
+name: msgraph-sdk-java-core-branch-protection
+description: Branch protection policy for the msgraph-sdk-java-core repository
+resource: repository
+configuration:
+  branchProtectionRules:
+
+  - branchNamePattern: dev
+    # This branch pattern applies to the following branches as of 06/12/2023 10:31:16:
+    # dev
+
+    # Specifies whether this branch can be deleted. boolean
+    allowsDeletions: false
+    # Specifies whether forced pushes are allowed on this branch. boolean
+    allowsForcePushes: false
+    # Specifies whether new commits pushed to the matching branches dismiss pull request review approvals. boolean
+    dismissStaleReviews: true
+    # Specifies whether admins can overwrite branch protection. boolean
+    isAdminEnforced: false
+    # Indicates whether "Require a pull request before merging" is enabled. boolean
+    requiresPullRequestBeforeMerging: true
+    # Specifies the number of pull request reviews before merging. int (0-6). Should be null/empty if PRs are not required
+    requiredApprovingReviewsCount: 1
+    # Require review from Code Owners. Requires requiredApprovingReviewsCount. boolean
+    requireCodeOwnersReview: false
+    # Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines.
+    requiresCommitSignatures: false
+    # Are conversations required to be resolved before merging? boolean
+    requiresConversationResolution: true
+    # Are merge commits prohibited from being pushed to this branch. boolean
+    requiresLinearHistory: false
+    # Required status checks to pass before merging. Values can be any string, but if the value does not correspond to any existing status check, the status check will be stuck on pending for status since nothing exists to push an actual status
+    requiredStatusChecks:
+    - license/cla
+    - Build
+    - lint-api-level
+    - Analyze
+    - build
+    # Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
+    requiresStrictStatusChecks: false
+    # Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
+    restrictsPushes: false
+    # Restrict who can dismiss pull request reviews. boolean
+    restrictsReviewDismissals: false
+
+  - branchNamePattern: master
+    # This branch pattern applies to the following branches as of 06/12/2023 10:31:16:
+    # master
+
+    # Specifies whether this branch can be deleted. boolean
+    allowsDeletions: false
+    # Specifies whether forced pushes are allowed on this branch. boolean
+    allowsForcePushes: false
+    # Specifies whether new commits pushed to the matching branches dismiss pull request review approvals. boolean
+    dismissStaleReviews: true
+    # Specifies whether admins can overwrite branch protection. boolean
+    isAdminEnforced: false
+    # Indicates whether "Require a pull request before merging" is enabled. boolean
+    requiresPullRequestBeforeMerging: true
+    # Specifies the number of pull request reviews before merging. int (0-6). Should be null/empty if PRs are not required
+    requiredApprovingReviewsCount: 1
+    # Require review from Code Owners. Requires requiredApprovingReviewsCount. boolean
+    requireCodeOwnersReview: false
+    # Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines.
+    requiresCommitSignatures: false
+    # Are conversations required to be resolved before merging? boolean
+    requiresConversationResolution: true
+    # Are merge commits prohibited from being pushed to this branch. boolean
+    requiresLinearHistory: false
+    # Required status checks to pass before merging. Values can be any string, but if the value does not correspond to any existing status check, the status check will be stuck on pending for status since nothing exists to push an actual status
+    requiredStatusChecks:
+    - license/cla
+    - Build
+    - lint-api-level
+    - Analyze
+    - build
+    # Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
+    requiresStrictStatusChecks: false
+    # Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
+    restrictsPushes: false
+    # Restrict who can dismiss pull request reviews. boolean
+    restrictsReviewDismissals: false
+
+  - branchNamePattern: v3/longTermBranch
+    # This branch pattern applies to the following branches as of 06/12/2023 10:31:16:
+    # v3/longTermBranch
+
+    # Specifies whether this branch can be deleted. boolean
+    allowsDeletions: false
+    # Specifies whether forced pushes are allowed on this branch. boolean
+    allowsForcePushes: false
+    # Specifies whether new commits pushed to the matching branches dismiss pull request review approvals. boolean
+    dismissStaleReviews: true
+    # Specifies whether admins can overwrite branch protection. boolean
+    isAdminEnforced: false
+    # Indicates whether "Require a pull request before merging" is enabled. boolean
+    requiresPullRequestBeforeMerging: true
+    # Specifies the number of pull request reviews before merging. int (0-6). Should be null/empty if PRs are not required
+    requiredApprovingReviewsCount: 1
+    # Require review from Code Owners. Requires requiredApprovingReviewsCount. boolean
+    requireCodeOwnersReview: true
+    # Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines.
+    requiresCommitSignatures: false
+    # Are conversations required to be resolved before merging? boolean
+    requiresConversationResolution: false
+    # Are merge commits prohibited from being pushed to this branch. boolean
+    requiresLinearHistory: false
+    # Required status checks to pass before merging. Values can be any string, but if the value does not correspond to any existing status check, the status check will be stuck on pending for status since nothing exists to push an actual status
+    requiredStatusChecks:
+    - Analyze
+    - Build
+    - build
+    - license/cla
+    - lint-api-level
+    # Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
+    requiresStrictStatusChecks: false
+    # Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
+    restrictsPushes: false
+    # Restrict who can dismiss pull request reviews. boolean
+    restrictsReviewDismissals: false
+
diff --git 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@v1.3.6
+        uses: dependabot/fetch-metadata@v1.5.1
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 
diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml
@@ -105,7 +105,7 @@ jobs:
         run: .\scripts\getLatestVersion.ps1
         shell: pwsh
       - name: Create tag
-        uses: rickstaa/action-create-tag@v1.6.1
+        uses: rickstaa/action-create-tag@v1.6.2
         with:
           tag: ${{ steps.GetVersion.outputs.tag }}
       - name: Queue Git Release
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+## [2.0.19] - 2023-06-20
+
+### Changed
+
+- Remove explicit logging of GraphServiceException in the CoreHttpProvider class. [#885](https://github.com/microsoftgraph/msgraph-sdk-java-core/issues/885)
+- Thank you to @MaHa6543 for the contribution. 
+
 ## [2.0.18] - 2023-04-06
 
 ### Changed
diff --git a/android/build.gradle b/android/build.gradle
@@ -8,9 +8,9 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.13"
-        classpath "com.android.tools.build:gradle:8.0.0"
-        classpath "com.github.ben-manes:gradle-versions-plugin:0.46.0"
+        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.13.4"
+        classpath "com.android.tools.build:gradle:8.0.2"
+        classpath "com.github.ben-manes:gradle-versions-plugin:0.47.0"
     }
 }
 
@@ -25,13 +25,13 @@ apply plugin: "com.github.ben-manes.versions"
 android {
     namespace "com.microsoft.graph"
 
-    compileSdkVersion 33
+    compileSdkVersion 34
 
     defaultConfig {
         versionCode 1
         versionName "1.0"
         minSdkVersion 26
-        targetSdkVersion 33
+        targetSdkVersion 34
     }
 
     buildTypes {
diff --git a/android/gradle.properties b/android/gradle.properties
@@ -27,7 +27,7 @@ mavenGroupId         = com.microsoft.graph
 mavenArtifactId      = microsoft-graph-core
 mavenMajorVersion    = 2
 mavenMinorVersion    = 3
-mavenPatchVersion    = 1
+mavenPatchVersion    = 2
 mavenArtifactSuffix = 
 
 #These values are used to run functional tests
diff --git a/build.gradle b/build.gradle
@@ -15,7 +15,7 @@ plugins {
     id 'signing'
     id 'jacoco'
     id 'com.github.spotbugs' version '5.0.14'
-    id "org.sonarqube" version "4.0.0.2929"
+    id "org.sonarqube" version "4.2.1.3168"
 }
 
 java {
diff --git a/gradle.properties b/gradle.properties
@@ -25,7 +25,7 @@ mavenGroupId         = com.microsoft.graph
 mavenArtifactId      = microsoft-graph-core
 mavenMajorVersion    = 2
 mavenMinorVersion    = 0
-mavenPatchVersion    = 18
+mavenPatchVersion    = 19
 mavenArtifactSuffix = 
 
 #These values are used to run functional tests
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -1,16 +1,16 @@
 dependencies {
     // Use JUnit test framework
-    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.junit.jupiter:junit-jupiter-api:5.9.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.3'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.3'
     testImplementation 'org.mockito:mockito-inline:5.2.0'
     
-    api 'com.squareup.okhttp3:okhttp:4.10.0'
+    api 'com.squareup.okhttp3:okhttp:4.11.0'
 
-    implementation 'com.google.guava:guava:31.1-jre'
+    implementation 'com.google.guava:guava:32.0.1-jre'
 
     implementation 'com.google.code.gson:gson:2.10.1'
-    api 'com.azure:azure-core:1.38.0'
+    api 'com.azure:azure-core:1.40.0'
 
     api 'com.github.spotbugs:spotbugs-annotations:4.7.3'
 }
diff --git a/pom.xml b/pom.xml
@@ -25,28 +25,28 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>31.1-jre</version>
+            <version>32.0.1-jre</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.10.0</version>
+            <version>4.11.0</version>
         </dependency>
         <dependency>
             <groupId>com.azure</groupId>
             <artifactId>azure-core</artifactId>
-            <version>1.38.0</version>
+            <version>1.40.0</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.9.2</version>
+            <version>5.9.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-params</artifactId>
-            <version>5.9.2</version>
+            <version>5.9.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git 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:2.0.16'
+    implementation 'com.microsoft.graph:microsoft-graph-core:2.0.19'
     // This dependency is only needed if you are using the TokenCredentialAuthProvider
     implementation 'com.azure:azure-identity:1.7.2'
 }
diff --git a/samples/deviceCodeSample/build.gradle b/samples/deviceCodeSample/build.gradle
@@ -12,5 +12,5 @@ repositories {
 dependencies {
     testImplementation group: 'junit', name: 'junit', version: '4.13.2'
     implementation project(':coreLibrary')
-    implementation 'com.azure:azure-identity:1.8.2'
+    implementation 'com.azure:azure-identity:1.9.1'
 }
diff --git a/samples/interactiveBrowserSample/build.gradle b/samples/interactiveBrowserSample/build.gradle
@@ -12,5 +12,5 @@ repositories {
 dependencies {
     testImplementation group: 'junit', name: 'junit', version: '4.13.2'
     implementation project(':coreLibrary')
-    implementation 'com.azure:azure-identity:1.8.2'
+    implementation 'com.azure:azure-identity:1.9.1'
 }
diff --git a/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java b/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
@@ -488,12 +488,10 @@ private <Result, Body, DeserializeType> Result processResponse(final Response re
                 }
             }
         } catch (final GraphServiceException ex) {
-            logger.logError("Graph service exception", ex);
             throw ex;
         } catch (final Exception ex) {
             final ClientException clientException = new ClientException("Error during http request",
                     ex);
-            logger.logError("Error during http request", clientException);
             throw clientException;
         }
     }
diff --git a/src/main/java/com/microsoft/graph/httpcore/TelemetryHandler.java b/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.16";
+    public static final String VERSION = "v2.0.19";
     /**
      * Version prefix
      */

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-* @baywet @ddyett @MichaelMainer @zengin @ramsessanchez @andrueastman`
	`1`	`+* @microsoftgraph/msgraph-devx-java-write`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,9 @@ buildscript {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`dependencies {`
`11`		`- classpath "com.gradle:gradle-enterprise-gradle-plugin:3.13"`
`12`		`- classpath "com.android.tools.build:gradle:8.0.0"`
`13`		`- classpath "com.github.ben-manes:gradle-versions-plugin:0.46.0"`
	`11`	`+ classpath "com.gradle:gradle-enterprise-gradle-plugin:3.13.4"`
	`12`	`+ classpath "com.android.tools.build:gradle:8.0.2"`
	`13`	`+ classpath "com.github.ben-manes:gradle-versions-plugin:0.47.0"`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`
`@@ -25,13 +25,13 @@ apply plugin: "com.github.ben-manes.versions"`
`25`	`25`	`android {`
`26`	`26`	`namespace "com.microsoft.graph"`
`27`	`27`
`28`		`- compileSdkVersion 33`
	`28`	`+ compileSdkVersion 34`
`29`	`29`
`30`	`30`	`defaultConfig {`
`31`	`31`	`versionCode 1`
`32`	`32`	`versionName "1.0"`
`33`	`33`	`minSdkVersion 26`
`34`		`- targetSdkVersion 33`
	`34`	`+ targetSdkVersion 34`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`buildTypes {`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ plugins {`
`15`	`15`	`id 'signing'`
`16`	`16`	`id 'jacoco'`
`17`	`17`	`id 'com.github.spotbugs' version '5.0.14'`
`18`		`- id "org.sonarqube" version "4.0.0.2929"`
	`18`	`+ id "org.sonarqube" version "4.2.1.3168"`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`java {`