Skip to content

Commit b8c6e44

Browse files
bitwisemanbitwiseman
committed
Update okhttp3 (with Java 8)
This version of okhttp3 is the last to suppurt UrlFactory, but we've replaced it anyway in preparation for future updates.
1 parent 9a91cc4 commit b8c6e44

6 files changed

Lines changed: 1617 additions & 12 deletions

File tree

‎pom.xml‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
<spotbugs.version>3.1.12</spotbugs.version>
3434
<spotbugs-maven-plugin.failOnError>true</spotbugs-maven-plugin.failOnError>
3535
<hamcrest.version>2.1</hamcrest.version>
36+
<okhttp3.version>3.12.3</okhttp3.version>
37+
<okio.version>2.2.2</okio.version>
3638
</properties>
3739

3840
<build>
@@ -41,8 +43,8 @@
4143
<artifactId>maven-compiler-plugin</artifactId>
4244
<version>3.8.1</version>
4345
<configuration>
44-
<source>7</source>
45-
<target>7</target>
46+
<source>1.8</source>
47+
<target>1.8</target>
4648
</configuration>
4749
</plugin>
4850

@@ -57,13 +59,13 @@
5759
<configuration>
5860
<signature>
5961
<groupId>org.codehaus.mojo.signature</groupId>
60-
<artifactId>java17</artifactId>
62+
<artifactId>java18</artifactId>
6163
<version>1.0</version>
6264
</signature>
6365
</configuration>
6466
<executions>
6567
<execution>
66-
<id>ensure-java-1.5-class-library</id>
68+
<id>ensure-java-1.8-class-library</id>
6769
<phase>test</phase>
6870
<goals>
6971
<goal>check</goal>
@@ -188,15 +190,27 @@
188190
<scope>test</scope>
189191
</dependency>
190192
<dependency>
191-
<groupId>com.squareup.okhttp</groupId>
192-
<artifactId>okhttp-urlconnection</artifactId>
193-
<version>2.7.5</version>
193+
<groupId>com.squareup.okio</groupId>
194+
<artifactId>okio</artifactId>
195+
<version>${okio.version}</version>
196+
<optional>true</optional>
197+
</dependency>
198+
<dependency>
199+
<groupId>com.squareup.okhttp3</groupId>
200+
<artifactId>okhttp</artifactId>
201+
<version>${okhttp3.version}</version>
194202
<optional>true</optional>
195203
</dependency>
196204
<dependency>
197205
<groupId>com.squareup.okhttp3</groupId>
198206
<artifactId>okhttp-urlconnection</artifactId>
199-
<version>3.9.0</version>
207+
<version>${okhttp3.version}</version>
208+
<optional>true</optional>
209+
</dependency>
210+
<dependency>
211+
<groupId>com.squareup.okhttp</groupId>
212+
<artifactId>okhttp-urlconnection</artifactId>
213+
<version>2.7.5</version>
200214
<optional>true</optional>
201215
</dependency>
202216
<dependency>

‎src/main/java/org/kohsuke/github/extras/OkHttp3Connector.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,18 @@
1616
* response does not count against the rate limit.
1717
* See http://developer.github.com/v3/#conditional-requests
1818
*
19+
* @see org.kohsuke.github.extras.okhttp3.OkHttpConnector
1920
* @author Roberto Tyley
2021
* @author Kohsuke Kawaguchi
2122
*/
23+
@Deprecated
2224
public class OkHttp3Connector implements HttpConnector {
2325
private final OkUrlFactory urlFactory;
2426

27+
/*
28+
* @see org.kohsuke.github.extras.okhttp3.OkHttpConnector
29+
*/
30+
@Deprecated
2531
public OkHttp3Connector(OkUrlFactory urlFactory) {
2632
this.urlFactory = urlFactory;
2733
}

0 commit comments

Comments
 (0)