Upgrade to the latest OkHttp, with changes through 2013-Feb-01.
This is OkHttp commit 2137b7a72518cfac088757ef6d0fb3d085bf6e3d
Most notable changes are improvements to ConnectionPool (fixing
infinite loops!) and upgrading to SPDY/3.
Change-Id: Icd9e5e3857a45f9b68a164b920d33f48cdddb780
diff --git a/pom.xml b/pom.xml
index b95912d..0afcaa6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
</parent>
<groupId>com.squareup</groupId>
<artifactId>okhttp</artifactId>
- <version>0.8-SNAPSHOT</version>
+ <version>0.9-SNAPSHOT</version>
<packaging>jar</packaging>
<name>okhttp</name>
@@ -38,11 +38,11 @@
<!-- Compilation -->
<java.version>1.6</java.version>
<npn.version>8.1.2.v20120308</npn.version>
- <mockwebserver.version>20120905</mockwebserver.version>
+ <mockwebserver.version>20130122</mockwebserver.version>
<bouncycastle.version>1.47</bouncycastle.version>
<!-- Test Dependencies -->
- <junit.version>3.8.2</junit.version>
+ <junit.version>4.10</junit.version>
</properties>
<scm>
@@ -68,6 +68,7 @@
<groupId>org.mortbay.jetty.npn</groupId>
<artifactId>npn-boot</artifactId>
<version>${npn.version}</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>com.google.mockwebserver</groupId>
@@ -101,70 +102,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>jarjar-maven-plugin</artifactId>
- <version>1.5</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>jarjar</goal>
- </goals>
- <configuration>
- <includes>
- <include>asm:asm</include>
- <include>org.sonatype.sisu.inject:cglib</include>
- </includes>
- <rules>
- <rule>
- <pattern>libcore.**</pattern>
- <result>com.squareup.okhttp.libcore.@1</result>
- </rule>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.9</version>
- <configuration>
- <argLine>-Xbootclasspath/p:${settings.localRepository}/org/mortbay/jetty/npn/npn-boot/${npn.version}/npn-boot-${npn.version}.jar</argLine>
- </configuration>
- </plugin>
- <plugin>
- <!--
- OkHttp requires with javac >= 1.7 for syncFlush on DeflaterOutputStream.
- Its language version must be <= 1.6 for dx.
-
- Running this code on Java 6 or earlier will fail at runtime due to the missing
- syncFlush API.
-
- Dalvik's core library includes syncFlush, but with an @hide tag so that it doesn't
- show up in the documentation or the android.jar stubs. This code works fine on
- Dalvik.
- -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <id>enforce-java</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireJavaVersion>
- <version>[1.7.0,)</version>
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.9.1</version>
@@ -183,6 +120,14 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <argLine>-Xbootclasspath/p:${settings.localRepository}/org/mortbay/jetty/npn/npn-boot/${npn.version}/npn-boot-${npn.version}.jar</argLine>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>