Skip to content

Commit c202339

Browse files
kullfarkullfar
committed
upgrade okhttp to 4.0.1 and security fix for jackson-databind 2.9.9.1
1 parent 5d99390 commit c202339

7 files changed

Lines changed: 15 additions & 14 deletions

File tree

‎changelog‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[SNAPSHOT]
22
* Add OAuth2 support for Meetup.com (thanks to https://github.com/stevedes77)
3+
* upgrade okhttp to 4.0.1 and security fix for jackson-databind 2.9.9.1
34

45
[6.6.3]
56
* fix NPE for OpenId providers

‎pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<dependency>
5757
<groupId>com.fasterxml.jackson.core</groupId>
5858
<artifactId>jackson-databind</artifactId>
59-
<version>2.9.9</version>
59+
<version>2.9.9.1</version>
6060
</dependency>
6161
<dependency>
6262
<groupId>junit</groupId>
@@ -67,7 +67,7 @@
6767
<dependency>
6868
<groupId>com.squareup.okhttp3</groupId>
6969
<artifactId>mockwebserver</artifactId>
70-
<version>3.14.2</version>
70+
<version>4.0.1</version>
7171
<scope>test</scope>
7272
</dependency>
7373
</dependencies>
@@ -106,7 +106,7 @@
106106
<dependency>
107107
<groupId>com.puppycrawl.tools</groupId>
108108
<artifactId>checkstyle</artifactId>
109-
<version>8.21</version>
109+
<version>8.22</version>
110110
</dependency>
111111
</dependencies>
112112
</plugin>
@@ -187,7 +187,7 @@
187187
<plugin>
188188
<groupId>org.apache.maven.plugins</groupId>
189189
<artifactId>maven-javadoc-plugin</artifactId>
190-
<version>3.1.0</version>
190+
<version>3.1.1</version>
191191
<configuration>
192192
<javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
193193
<encoding>UTF-8</encoding>
@@ -273,7 +273,7 @@
273273

274274
<properties>
275275
<java.release>7</java.release>
276-
<pmdVersion>6.15.0</pmdVersion>
276+
<pmdVersion>6.16.0</pmdVersion>
277277
</properties>
278278

279279
<profiles>

‎scribejava-httpclient-ahc/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<dependency>
2424
<groupId>org.asynchttpclient</groupId>
2525
<artifactId>async-http-client</artifactId>
26-
<version>2.10.0</version>
26+
<version>2.10.1</version>
2727
</dependency>
2828
<dependency>
2929
<groupId>com.github.scribejava</groupId>

‎scribejava-httpclient-apache/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<dependency>
2424
<groupId>org.apache.httpcomponents</groupId>
2525
<artifactId>httpclient</artifactId>
26-
<version>4.5.8</version>
26+
<version>4.5.9</version>
2727
</dependency>
2828
<dependency>
2929
<groupId>org.apache.httpcomponents</groupId>

‎scribejava-httpclient-okhttp/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<dependency>
2424
<groupId>com.squareup.okhttp3</groupId>
2525
<artifactId>okhttp</artifactId>
26-
<version>3.14.2</version>
26+
<version>4.0.1</version>
2727
</dependency>
2828
<dependency>
2929
<groupId>com.github.scribejava</groupId>

‎scribejava-httpclient-okhttp/src/main/java/com/github/scribejava/httpclient/okhttp/OkHttpHttpClient.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,19 +165,19 @@ private enum BodyType {
165165
BYTE_ARRAY {
166166
@Override
167167
RequestBody createBody(MediaType mediaType, Object bodyContents) {
168-
return RequestBody.create(mediaType, (byte[]) bodyContents);
168+
return RequestBody.create((byte[]) bodyContents, mediaType);
169169
}
170170
},
171171
STRING {
172172
@Override
173173
RequestBody createBody(MediaType mediaType, Object bodyContents) {
174-
return RequestBody.create(mediaType, (String) bodyContents);
174+
return RequestBody.create((String) bodyContents, mediaType);
175175
}
176176
},
177177
FILE {
178178
@Override
179179
RequestBody createBody(MediaType mediaType, Object bodyContents) {
180-
return RequestBody.create(mediaType, (File) bodyContents);
180+
return RequestBody.create((File) bodyContents, mediaType);
181181
}
182182
};
183183

‎scribejava-httpclient-okhttp/src/test/java/com/github/scribejava/httpclient/okhttp/OAuthAsyncCompletionHandlerTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public void shouldReleaseLatchOnSuccess() throws Exception {
7878
.protocol(Protocol.HTTP_1_1)
7979
.code(200)
8080
.message("ok")
81-
.body(ResponseBody.create(MediaType.get("text/plain"), new byte[0]))
81+
.body(ResponseBody.create(new byte[0], MediaType.get("text/plain")))
8282
.build();
8383
handler.onResponse(call, response);
8484
assertNotNull(callback.getResponse());
@@ -98,7 +98,7 @@ public void shouldReleaseLatchOnIOException() throws Exception {
9898
.protocol(Protocol.HTTP_1_1)
9999
.code(200)
100100
.message("ok")
101-
.body(ResponseBody.create(MediaType.get("text/plain"), new byte[0]))
101+
.body(ResponseBody.create(new byte[0], MediaType.get("text/plain")))
102102
.build();
103103
handler.onResponse(call, response);
104104
assertNull(callback.getResponse());
@@ -124,7 +124,7 @@ public void shouldReportOAuthException() throws Exception {
124124
.protocol(Protocol.HTTP_1_1)
125125
.code(200)
126126
.message("ok")
127-
.body(ResponseBody.create(MediaType.get("text/plain"), new byte[0]))
127+
.body(ResponseBody.create(new byte[0], MediaType.get("text/plain")))
128128
.build();
129129
handler.onResponse(call, response);
130130
assertNull(callback.getResponse());

0 commit comments

Comments
 (0)