Update org.apache.http dependencies (openhab#5887)

Signed-off-by: Christoph Weitkamp <[email protected]>
Dennis650 · Oct 13, 2019 · 00fa8ae · 00fa8ae
1 parent 9a2f50e
commit 00fa8ae
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 14 deletions.
diff --git a/bundles/io/org.openhab.io.caldav/.classpath b/bundles/io/org.openhab.io.caldav/.classpath
@@ -2,11 +2,11 @@
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+	<classpathentry exported="true" kind="lib" path="lib/httpclient-4.4.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/httpcore-4.4.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/ical4j-2.2.5.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/sardine-5.6.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-lang3-3.3.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/httpclient-4.3.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/httpcore-4.3.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/threetenbp-1.3.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/cache-api-1.1.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-collections4-4.1.jar"/>

diff --git a/bundles/io/org.openhab.io.caldav/META-INF/MANIFEST.MF b/bundles/io/org.openhab.io.caldav/META-INF/MANIFEST.MF
@@ -44,13 +44,13 @@ Bundle-DocURL: http://www.openhab.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Service-Component: OSGI-INF/caldavloader.xml
 Bundle-ClassPath: .,
+ lib/cache-api-1.1.1.jar,
+ lib/commons-collections4-4.1.jar,
  lib/commons-lang3-3.3.2.jar,
- lib/httpclient-4.3.5.jar,
- lib/httpcore-4.3.2.jar,
+ lib/httpclient-4.4.1.jar,
+ lib/httpcore-4.4.1.jar,
  lib/ical4j-2.2.5.jar,
  lib/sardine-5.6.jar,
- lib/threetenbp-1.3.3.jar,
- lib/cache-api-1.1.1.jar,
- lib/commons-collections4-4.1.jar
+ lib/threetenbp-1.3.3.jar
 Export-Package: org.openhab.io.caldav
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/io/org.openhab.io.caldav/build.properties b/bundles/io/org.openhab.io.caldav/build.properties
@@ -3,14 +3,13 @@ bin.includes = META-INF/,\
                .,\
                OSGI-INF/,\
                NOTICE,\
-               lib/,\
                lib/commons-lang3-3.3.2.jar,\
-               lib/httpclient-4.3.5.jar,\
-               lib/httpcore-4.3.2.jar,\
                lib/sardine-5.6.jar,\
                lib/ical4j-2.2.5.jar,\
                lib/threetenbp-1.3.3.jar,\
                lib/cache-api-1.1.1.jar,\
-               lib/commons-collections4-4.1.jar
+               lib/commons-collections4-4.1.jar,\
+               lib/httpclient-4.4.1.jar,\
+               lib/httpcore-4.4.1.jar
 source.. = src/main/java/,\
            src/main/resources/
diff --git a/bundles/io/org.openhab.io.caldav/lib/httpclient-4.3.5.jar b/bundles/io/org.openhab.io.caldav/lib/httpclient-4.3.5.jar
diff --git a/bundles/io/org.openhab.io.caldav/lib/httpclient-4.4.1.jar b/bundles/io/org.openhab.io.caldav/lib/httpclient-4.4.1.jar
diff --git a/bundles/io/org.openhab.io.caldav/lib/httpcore-4.3.2.jar b/bundles/io/org.openhab.io.caldav/lib/httpcore-4.3.2.jar
diff --git a/bundles/io/org.openhab.io.caldav/lib/httpcore-4.4.1.jar b/bundles/io/org.openhab.io.caldav/lib/httpcore-4.4.1.jar
diff --git a/bundles/io/org.openhab.io.caldav/src/main/java/org/openhab/io/caldav/internal/Util.java b/bundles/io/org.openhab.io.caldav/src/main/java/org/openhab/io/caldav/internal/Util.java
@@ -23,10 +23,10 @@
 
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.http.conn.ssl.AllowAllHostnameVerifier;
-import org.apache.http.conn.ssl.SSLContextBuilder;
+import org.apache.http.conn.ssl.NoopHostnameVerifier;
 import org.apache.http.conn.ssl.TrustStrategy;
 import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.ssl.SSLContextBuilder;
 import org.joda.time.DateTimeZone;
 import org.openhab.io.caldav.CalDavEvent;
 import org.slf4j.Logger;
@@ -129,7 +129,7 @@ public static Sardine getConnection(CalDavConfig config) {
             log.trace("connecting to caldav '{}' with disabled certificate verification (url={}, username={})", key,
                     url, userName);
             HttpClientBuilder httpClientBuilder = HttpClientBuilder.create()
-                    .setHostnameVerifier(new AllowAllHostnameVerifier());
+                    .setSSLHostnameVerifier(new NoopHostnameVerifier());
             try {
                 httpClientBuilder.setSslcontext(new SSLContextBuilder().loadTrustMaterial(null, new TrustStrategy() {
                     @Override