Skip to content

Commit 6110658

Browse files
committed
Bump okio to 3.16.3, fix build with okhttp 4.12.0
1 parent b77ca51 commit 6110658

File tree

3 files changed

+26
-3
lines changed

3 files changed

+26
-3
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
### Version 2.7.5-SNAPSHOT
2+
- Bump up snakeyaml to 2.5
3+
- Bump up okhttp to 4.12.0
4+
- Bump up okio to 3.16.3
5+
- Bump up actions/setup-java to 5
6+
- Bump up actions/checkout to 5
7+
- Bump up build-helper-maven-plugin to 3.6.1
18
### Version 2.7.4
29
- Bump up gson to 2.13.1 to match jenkins
310
- Bump up maven-jar-plugin to 3.4.2

drivers/okhttp/pom.xml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<description>OkHttp Driver</description>
3232

3333
<properties>
34-
<okio.version>3.16.0</okio.version>
34+
<okio.version>3.16.3</okio.version>
3535
</properties>
3636

3737
<dependencies>
@@ -51,6 +51,22 @@
5151
<groupId>com.squareup.okhttp3</groupId>
5252
<artifactId>okhttp</artifactId>
5353
<version>${okhttp.version}</version>
54+
<exclusions>
55+
<!-- prefer newer kotlin-stdlib from okio -->
56+
<exclusion>
57+
<groupId>org.jetbrains.kotlin</groupId>
58+
<artifactId>kotlin-stdlib</artifactId>
59+
</exclusion>
60+
<!-- Remove old kotlin-stdlib-jdk7 and -jdk8 -->
61+
<exclusion>
62+
<groupId>org.jetbrains.kotlin</groupId>
63+
<artifactId>kotlin-stdlib-jdk7</artifactId>
64+
</exclusion>
65+
<exclusion>
66+
<groupId>org.jetbrains.kotlin</groupId>
67+
<artifactId>kotlin-stdlib-jdk8</artifactId>
68+
</exclusion>
69+
</exclusions>
5470
</dependency>
5571
<dependency>
5672
<groupId>com.squareup.okio</groupId>

drivers/okhttp/src/test/java/org/jclouds/http/okhttp/OkHttpCommandExecutorServiceTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public void testZeroLengthPatch() throws Exception {
168168
}
169169
}
170170

171-
@Test(expectedExceptions = HttpResponseException.class, expectedExceptionsMessageRegExp = "Unable to find acceptable protocols.*")
171+
@Test(expectedExceptions = IllegalStateException.class, expectedExceptionsMessageRegExp = "CLEARTEXT-only client.*")
172172
public void testSSLConnectionFailsIfOnlyHttpConfigured() throws Exception {
173173
MockWebServer server = mockWebServer(new MockResponse());
174174
server.useHttps(sslSocketFactory(), false);
@@ -234,7 +234,7 @@ public void testRestrictedSSLProtocols() throws Exception {
234234

235235
protected static MockWebServer mockWebServer(MockResponse... responses) throws IOException {
236236
MockWebServer server = new MockWebServer();
237-
server.start(null, 0);
237+
server.start(0);
238238
for (MockResponse response : responses) {
239239
server.enqueue(response);
240240
}

0 commit comments

Comments
 (0)