1
0
mirror of https://github.com/square/okhttp.git synced 2025-08-08 23:42:08 +03:00

Get the latest versions of things.

I used 'mvn versions:use-latest-versions' and also just a bunch of manual
fixing.
This commit is contained in:
Jesse Wilson
2018-12-28 15:53:46 -05:00
parent 427bfefd0e
commit bf8e653c3a
16 changed files with 43 additions and 43 deletions

View File

@@ -41,7 +41,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version> <version>3.0.1</version>
<configuration> <configuration>
<links> <links>
<link>http://square.github.io/okhttp/javadoc/</link> <link>http://square.github.io/okhttp/javadoc/</link>
@@ -52,7 +52,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>3.0.0</version> <version>3.1.0</version>
<configuration> <configuration>
<descriptorRefs> <descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef> <descriptorRef>jar-with-dependencies</descriptorRef>
@@ -70,7 +70,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version> <version>3.1.1</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>

View File

@@ -57,7 +57,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>3.0.0</version> <version>3.1.0</version>
<configuration> <configuration>
<descriptorRefs> <descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef> <descriptorRef>jar-with-dependencies</descriptorRef>
@@ -80,7 +80,7 @@
<plugin> <plugin>
<groupId>org.skife.maven</groupId> <groupId>org.skife.maven</groupId>
<artifactId>really-executable-jar-maven-plugin</artifactId> <artifactId>really-executable-jar-maven-plugin</artifactId>
<version>1.1.0</version> <version>1.5.0</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>
@@ -96,7 +96,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version> <version>3.1.1</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>

View File

@@ -57,7 +57,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version> <version>3.0.1</version>
<configuration> <configuration>
<excludePackageNames>okhttp3.internal.*</excludePackageNames> <excludePackageNames>okhttp3.internal.*</excludePackageNames>
<links> <links>
@@ -68,7 +68,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version> <version>3.1.1</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>

View File

@@ -48,7 +48,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version> <version>3.0.1</version>
<configuration> <configuration>
<links> <links>
<link>http://square.github.io/okhttp/javadoc/</link> <link>http://square.github.io/okhttp/javadoc/</link>
@@ -60,7 +60,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version> <version>3.1.1</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>

View File

@@ -53,7 +53,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version> <version>3.1.1</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>

View File

@@ -8,7 +8,7 @@
<parent> <parent>
<groupId>com.squareup.okhttp3</groupId> <groupId>com.squareup.okhttp3</groupId>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<version>3.5.0-SNAPSHOT</version> <version>3.13.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>okhttp-hpacktests</artifactId> <artifactId>okhttp-hpacktests</artifactId>

View File

@@ -54,7 +54,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version> <version>3.1.1</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>

View File

@@ -53,7 +53,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version> <version>3.0.1</version>
<configuration> <configuration>
<excludePackageNames>okhttp3.internal:okhttp3.internal.*</excludePackageNames> <excludePackageNames>okhttp3.internal:okhttp3.internal.*</excludePackageNames>
<links> <links>
@@ -64,7 +64,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version> <version>3.1.1</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>

View File

@@ -35,7 +35,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version> <version>3.1.1</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>

View File

@@ -97,7 +97,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId> <artifactId>maven-deploy-plugin</artifactId>
<version>2.7</version> <version>2.8.2</version>
<configuration> <configuration>
<skip>true</skip> <skip>true</skip>
</configuration> </configuration>

View File

@@ -46,7 +46,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version> <version>3.0.1</version>
<configuration> <configuration>
<excludePackageNames>okhttp3.tls.internal:okhttp3.tls.internal.*</excludePackageNames> <excludePackageNames>okhttp3.tls.internal:okhttp3.tls.internal.*</excludePackageNames>
<links> <links>
@@ -57,7 +57,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version> <version>3.1.1</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>

View File

@@ -60,7 +60,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version> <version>3.0.1</version>
<configuration> <configuration>
<excludePackageNames>okhttp3.internal:okhttp3.internal.*</excludePackageNames> <excludePackageNames>okhttp3.internal:okhttp3.internal.*</excludePackageNames>
<links> <links>
@@ -71,7 +71,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version> <version>3.1.1</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>

View File

@@ -45,7 +45,7 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>templating-maven-plugin</artifactId> <artifactId>templating-maven-plugin</artifactId>
<version>1.0-alpha-3</version> <version>1.0.0</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>
@@ -57,7 +57,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version> <version>3.0.1</version>
<configuration> <configuration>
<excludePackageNames>okhttp3.internal:okhttp3.internal.*</excludePackageNames> <excludePackageNames>okhttp3.internal:okhttp3.internal.*</excludePackageNames>
<links> <links>
@@ -68,7 +68,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version> <version>3.1.1</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>

34
pom.xml
View File

@@ -44,19 +44,19 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- Compilation --> <!-- Compilation -->
<airlift.version>0.7</airlift.version> <airlift.version>0.8</airlift.version>
<!-- ALPN library targeted to Java 7 --> <!-- ALPN library targeted to Java 7 -->
<alpn.jdk7.version>7.1.2.v20141202</alpn.jdk7.version> <alpn.jdk7.version>7.1.2.v20141202</alpn.jdk7.version>
<android.version>4.1.1.4</android.version> <android.version>4.1.1.4</android.version>
<animal.sniffer.version>1.15</animal.sniffer.version> <animal.sniffer.version>1.17</animal.sniffer.version>
<apache.http.version>4.2.6</apache.http.version> <apache.http.version>4.5.6</apache.http.version>
<bouncycastle.version>1.60</bouncycastle.version> <bouncycastle.version>1.60</bouncycastle.version>
<guava.version>16.0</guava.version> <guava.version>27.0.1-jre</guava.version>
<java.version>1.7</java.version> <java.version>1.7</java.version>
<moshi.version>1.1.0</moshi.version> <moshi.version>1.8.0</moshi.version>
<jnr-unixsocket.version>0.19</jnr-unixsocket.version> <jnr-unixsocket.version>0.21</jnr-unixsocket.version>
<okio.version>1.16.0</okio.version> <okio.version>1.16.0</okio.version>
<conscrypt.version>1.4.0</conscrypt.version> <conscrypt.version>1.4.2</conscrypt.version>
<!-- Test Dependencies --> <!-- Test Dependencies -->
<junit.version>4.12</junit.version> <junit.version>4.12</junit.version>
@@ -151,7 +151,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version> <version>3.8.0</version>
<configuration> <configuration>
<compilerId>javac-with-errorprone</compilerId> <compilerId>javac-with-errorprone</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse> <forceJavacCompilerUse>true</forceJavacCompilerUse>
@@ -162,12 +162,12 @@
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-compiler-javac-errorprone</artifactId> <artifactId>plexus-compiler-javac-errorprone</artifactId>
<version>2.8.4</version> <version>2.8.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.errorprone</groupId> <groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId> <artifactId>error_prone_core</artifactId>
<version>2.3.1</version> <version>2.3.2</version>
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>
@@ -175,7 +175,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.21.0</version> <version>2.22.1</version>
<configuration> <configuration>
<systemPropertyVariables> <systemPropertyVariables>
<okhttp.platform>${okhttp.platform}</okhttp.platform> <okhttp.platform>${okhttp.platform}</okhttp.platform>
@@ -197,7 +197,7 @@
<dependency> <dependency>
<groupId>org.apache.maven.surefire</groupId> <groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit47</artifactId> <artifactId>surefire-junit47</artifactId>
<version>2.21.0</version> <version>2.22.1</version>
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>
@@ -205,7 +205,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version> <version>3.0.1</version>
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
@@ -214,12 +214,12 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId> <artifactId>maven-release-plugin</artifactId>
<version>2.4.2</version> <version>2.5.3</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.maven.scm</groupId> <groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-gitexe</artifactId> <artifactId>maven-scm-provider-gitexe</artifactId>
<version>1.9</version> <version>1.11.1</version>
</dependency> </dependency>
</dependencies> </dependencies>
<configuration> <configuration>
@@ -230,12 +230,12 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId> <artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version> <version>3.0.0</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.puppycrawl.tools</groupId> <groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId> <artifactId>checkstyle</artifactId>
<version>7.7</version> <version>8.15</version>
</dependency> </dependency>
</dependencies> </dependencies>
<configuration> <configuration>

View File

@@ -21,7 +21,7 @@
<dependency> <dependency>
<groupId>org.jsoup</groupId> <groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId> <artifactId>jsoup</artifactId>
<version>1.7.3</version> <version>1.11.3</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

View File

@@ -26,7 +26,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>2.1</version> <version>3.2.1</version>
<configuration> <configuration>
<shadedArtifactAttached>true</shadedArtifactAttached> <shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>shaded</shadedClassifierName> <shadedClassifierName>shaded</shadedClassifierName>