Skip to content

Commit 39261cd

Browse files
authored
Merge pull request #429 from microsoftgraph/rsh/http2
Rsh/http2
2 parents ad482bc + 68c8cce commit 39261cd

File tree

6 files changed

+32
-9
lines changed

6 files changed

+32
-9
lines changed

CHANGELOG.md

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

1212
### Changed
1313

14+
## [2.0.11] - 2022-02-04
15+
16+
### Added
17+
18+
- Removing lock on Http protocol 1.1 in preparation for Graph service support of Http2 #429
19+
20+
### Changed
21+
22+
- Bumps Azure Core to 1.24.1 #408, #409, #410
23+
- Bumps mockito-inline to 4.3.1 #422, #423, #424
24+
- Bumps okhttp to 4.9.3 #371, #372
25+
- Bumps junit to 4.13.2 #391, #394
26+
- Bumps junit-jupiter-api to 5.8.2 #379, #382
27+
- Bumps junit-jupiter-egine to 5.8.2 #380
28+
- Bumps junit-jupiter-params to 5.8.2 #381, #383
29+
- Bumps gradle wrappers to 7.3.3 #426
30+
- Bumps gradle-versions-plugin to 0.42.0 in /android #428
31+
- Bumps gradle from 7.1.0 in /android #425
32+
- Bumps gradle-enterprise-gradle-plugin 3.8.1 in /android #413
33+
- Bumps dawidd6/action-download-artifact to 2.17.0 #427
34+
- Bumps com.github.spotbugs to 5.0.5 #416
35+
- Bumps spotbugs-annotations to 4.5.3 #407
36+
- Bumps azure-identity to 1.4.3 #411, #412
37+
- Bumps anton-yurchenko/git-release to 4.2 #378
38+
- Bumps actions/cache from to 2.1.7 #375
39+
1440
## [2.0.10] - 2021-11-16
1541

1642
### 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 = 10
28+
mavenPatchVersion = 11
2929
mavenArtifactSuffix =
3030

3131
#These values are used to run functional tests

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<groupId>com.microsoft.graph</groupId>
1010
<artifactId>microsoft-graph-core</artifactId>
11-
<version>2.0.10</version>
11+
<version>2.0.11</version>
1212
<packaging>pom</packaging>
1313

1414
<properties>

readme.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ repositories {
2222
2323
dependencies {
2424
// Include the sdk as a dependency
25-
implementation 'com.microsoft.graph:microsoft-graph-core:2.0.10'
25+
implementation 'com.microsoft.graph:microsoft-graph-core:2.0.11'
2626
// This dependency is only needed if you are using the TokenCrendentialAuthProvider
2727
implementation 'com.azure:azure-identity:1.3.1'
2828
}
@@ -37,7 +37,7 @@ 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.10</version>
40+
<version>2.0.11</version>
4141
<!-- This dependency is only needed if you are using the TokenCrendentialAuthProvider -->
4242
<groupId>com.azure</groupId>
4343
<artifactId>azure-identity</artifactId>

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@
44
import okhttp3.Interceptor;
55
import okhttp3.OkHttpClient;
66
import okhttp3.OkHttpClient.Builder;
7-
import okhttp3.Protocol;
87

98
import javax.annotation.Nonnull;
109
import javax.annotation.Nullable;
11-
import java.util.Collections;
1210
import java.util.Objects;
1311

1412
/**
@@ -30,8 +28,7 @@ public static Builder custom() {
3028
return new OkHttpClient.Builder()
3129
.addInterceptor(new TelemetryHandler())
3230
.followRedirects(false)
33-
.followSslRedirects(false)
34-
.protocols(Collections.singletonList(Protocol.HTTP_1_1)); //https://stackoverflow.com/questions/62031298/sockettimeout-on-java-11-but-not-on-java-8
31+
.followSslRedirects(false);
3532
}
3633

3734
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class TelemetryHandler implements Interceptor{
2525
/**
2626
* Current SDK version
2727
*/
28-
public static final String VERSION = "v2.0.10";
28+
public static final String VERSION = "v2.0.11";
2929
/**
3030
* Verion prefix
3131
*/

0 commit comments

Comments
 (0)