Pull latest code from upstream okhttp and okio
This change contains the OkHttp and Okio changes without
modification. The only additions are the
MODULE_LICENSE_APACHE2 files.
This corresponds closely to OkHttp 2.5.0 and
Okio 1.6.0. Behavior changes are documented in
CHANGELOG.md.
This change does not compile as is. The next
commit makes the Android modifications required.
okhttp: 4305dc3fabeab392eb56f2db51538e06c3a54e51
okio: 313436764bf35794e158c6171e319fee868298df
Change-Id: I97ce07ff0472cdbce09f588863a1e5ccdcea0c20
diff --git a/pom.xml b/pom.xml
index 3c1435a..7219018 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
<groupId>com.squareup.okhttp</groupId>
<artifactId>parent</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>OkHttp (Parent)</name>
@@ -42,7 +42,7 @@
<!-- Compilation -->
<java.version>1.7</java.version>
- <okio.version>1.4.0-SNAPSHOT</okio.version>
+ <okio.version>1.6.0</okio.version>
<!-- ALPN library targeted to Java 7 -->
<alpn.jdk7.version>7.1.2.v20141202</alpn.jdk7.version>
<!-- ALPN library targeted to Java 8 update 25. -->