New upstream version 3.12.1

benchmarks/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.squareup.okhttp3</groupId>
     <artifactId>parent</artifactId>
-    <version>3.12.0</version>
+    <version>3.12.1</version>
   </parent>
 
   <artifactId>benchmarks</artifactId>

bom/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.squareup.okhttp3</groupId>
     <artifactId>parent</artifactId>
-    <version>3.12.0</version>
+    <version>3.12.1</version>
   </parent>
 
   <artifactId>okhttp-bom</artifactId>

mockwebserver/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.squareup.okhttp3</groupId>
     <artifactId>parent</artifactId>
-    <version>3.12.0</version>
+    <version>3.12.1</version>
   </parent>
 
   <artifactId>mockwebserver</artifactId>

okcurl/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.squareup.okhttp3</groupId>
     <artifactId>parent</artifactId>
-    <version>3.12.0</version>
+    <version>3.12.1</version>
   </parent>
 
   <artifactId>okcurl</artifactId>

okhttp-android-support/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.squareup.okhttp3</groupId>
     <artifactId>parent</artifactId>
-    <version>3.12.0</version>
+    <version>3.12.1</version>
   </parent>
 
   <artifactId>okhttp-android-support</artifactId>

okhttp-apache/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.squareup.okhttp3</groupId>
     <artifactId>parent</artifactId>
-    <version>3.12.0</version>
+    <version>3.12.1</version>
   </parent>
 
   <artifactId>okhttp-apache</artifactId>

okhttp-dnsoverhttps/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.squareup.okhttp3</groupId>
     <artifactId>parent</artifactId>
-    <version>3.12.0</version>
+    <version>3.12.1</version>
   </parent>
 
   <artifactId>okhttp-dnsoverhttps</artifactId>

okhttp-logging-interceptor/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.squareup.okhttp3</groupId>
     <artifactId>parent</artifactId>
-    <version>3.12.0</version>
+    <version>3.12.1</version>
   </parent>
 
   <artifactId>logging-interceptor</artifactId>

okhttp-sse/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.squareup.okhttp3</groupId>
     <artifactId>parent</artifactId>
-    <version>3.12.0</version>
+    <version>3.12.1</version>
   </parent>
 
   <artifactId>okhttp-sse</artifactId>

okhttp-testing-support/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.squareup.okhttp3</groupId>
     <artifactId>parent</artifactId>
-    <version>3.12.0</version>
+    <version>3.12.1</version>
   </parent>
 
   <artifactId>okhttp-testing-support</artifactId>

okhttp-tests/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.squareup.okhttp3</groupId>
     <artifactId>parent</artifactId>
-    <version>3.12.0</version>
+    <version>3.12.1</version>
   </parent>
 
   <artifactId>okhttp-tests</artifactId>

okhttp-tls/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.squareup.okhttp3</groupId>
     <artifactId>parent</artifactId>
-    <version>3.12.0</version>
+    <version>3.12.1</version>
   </parent>
 
   <artifactId>okhttp-tls</artifactId>

okhttp-urlconnection/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.squareup.okhttp3</groupId>
     <artifactId>parent</artifactId>
-    <version>3.12.0</version>
+    <version>3.12.1</version>
   </parent>
 
   <artifactId>okhttp-urlconnection</artifactId>

okhttp-urlconnection/src/main/java/okhttp3/JavaNetAuthenticator.java

@@ -22,12 +22,14 @@ import java.net.InetSocketAddress;
 import java.net.PasswordAuthentication;
 import java.net.Proxy;
 import java.util.List;
+import okhttp3.internal.annotations.EverythingIsNonNull;
 
 /**
  * Adapts {@link java.net.Authenticator} to {@link Authenticator}. Configure OkHttp to use {@link
  * java.net.Authenticator} with {@link OkHttpClient.Builder#authenticator} or {@link
  * OkHttpClient.Builder#proxyAuthenticator(Authenticator)}.
  */
+@EverythingIsNonNull
 public final class JavaNetAuthenticator implements Authenticator {
   @Override public Request authenticate(Route route, Response response) throws IOException {
     List<Challenge> challenges = response.challenges();

okhttp-urlconnection/src/main/java/okhttp3/JavaNetCookieJar.java

@@ -22,6 +22,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import okhttp3.internal.annotations.EverythingIsNonNull;
 import okhttp3.internal.platform.Platform;
 
 import static okhttp3.internal.Util.delimiterOffset;
@@ -29,6 +30,7 @@ import static okhttp3.internal.Util.trimSubstring;
 import static okhttp3.internal.platform.Platform.WARN;
 
 /** A cookie jar that delegates to a {@link java.net.CookieHandler}. */
+@EverythingIsNonNull
 public final class JavaNetCookieJar implements CookieJar {
   private final CookieHandler cookieHandler;
 

okhttp-urlconnection/src/main/java/okhttp3/OkUrlFactory.java

@@ -22,6 +22,7 @@ import java.net.URLConnection;
 import java.net.URLStreamHandler;
 import java.net.URLStreamHandlerFactory;
 import okhttp3.internal.URLFilter;
+import okhttp3.internal.annotations.EverythingIsNonNull;
 import okhttp3.internal.huc.OkHttpURLConnection;
 import okhttp3.internal.huc.OkHttpsURLConnection;
 
@@ -30,6 +31,7 @@ import okhttp3.internal.huc.OkHttpsURLConnection;
  * upcoming release. Applications that need this should either downgrade to the system's built-in
  * {@link HttpURLConnection} or upgrade to OkHttp's Request/Response API.
  */
+@EverythingIsNonNull
 public final class OkUrlFactory implements URLStreamHandlerFactory, Cloneable {
   private OkHttpClient client;
   private URLFilter urlFilter;

okhttp-urlconnection/src/main/java/okhttp3/package-info.java

-/** Support for JDK provider APIs. */
-@okhttp3.internal.annotations.EverythingIsNonNull
-package okhttp3;

okhttp/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.squareup.okhttp3</groupId>
     <artifactId>parent</artifactId>
-    <version>3.12.0</version>
+    <version>3.12.1</version>
   </parent>
 
   <artifactId>okhttp</artifactId>

pom.xml

@@ -11,7 +11,7 @@
 
   <groupId>com.squareup.okhttp3</groupId>
   <artifactId>parent</artifactId>
-  <version>3.12.0</version>
+  <version>3.12.1</version>
   <packaging>pom</packaging>
 
   <name>OkHttp (Parent)</name>
@@ -70,7 +70,7 @@
     <url>https://github.com/square/okhttp/</url>
     <connection>scm:git:https://github.com/square/okhttp.git</connection>
     <developerConnection>scm:git:git@github.com:square/okhttp.git</developerConnection>
-    <tag>parent-3.12.0</tag>
+    <tag>parent-3.12.1</tag>
   </scm>
 
   <issueManagement>

samples/crawler/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.squareup.okhttp3.sample</groupId>
     <artifactId>sample-parent</artifactId>
-    <version>3.12.0</version>
+    <version>3.12.1</version>
   </parent>
 
   <artifactId>crawler</artifactId>