Merge branch 'java11-compatibility' into 4.5.x

.travis.yml

@@ -18,6 +18,8 @@ sudo: false
 
 jdk:
   - openjdk7
+  - oraclejdk8
+  - openjdk11
 
 after_success:
   - mvn clean cobertura:cobertura coveralls:report

httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java

@@ -203,8 +203,10 @@ public class TestSSLSocketFactory {
         final SSLSocket sslSocket = (SSLSocket) socketFactory.connectSocket(0, socket, target, remoteAddress, null,
                 context);
         try {
-            final SSLSession sslsession = sslSocket.getSession();
+            final InputStream inputStream = sslSocket.getInputStream();
+            Assert.assertEquals(-1, inputStream.read());
 
+            final SSLSession sslsession = sslSocket.getSession();
             Assert.assertNotNull(sslsession);
             Assert.assertTrue(hostVerifier.isFired());
         } finally {

pom.xml

@@ -407,4 +407,42 @@
     </plugins>
   </reporting>
 
+  <!-- remove once 'ignore' configuration can be configured through HC Parent -->
+  <profiles>
+    <profile>
+      <id>animal-sniffer</id>
+      <activation>
+        <file>
+          <missing>src/site/resources/profile.noanimal</missing>
+        </file>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>animal-sniffer-maven-plugin</artifactId>
+            <version>${hc.animal-sniffer.version}</version>
+            <executions>
+              <execution>
+                <id>checkAPIcompatibility</id>
+                <goals>
+                  <goal>check</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <signature>
+                <groupId>org.codehaus.mojo.signature</groupId>
+                <artifactId>java16</artifactId>
+                <version>1.1</version>
+              </signature>
+              <ignores>java.util.concurrent.ConcurrentHashMap*</ignores>
+            </configuration>
+          </plugin>
+
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>