navodzoysa
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert 52b2cccf9f

Browse Source 
revert Upgrade apache http client version
fix-compile-failure
Lasantha Dharmakeerthi 1 year ago
parent d4f9472e48
commit 717667126c
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File

4
components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/pom.xml
Unescape View File

@ -189,8 +189,8 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.httpcomponents.client5</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient5</artifactId> <artifactId>httpclient</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.entgra.device.mgt.core</groupId> <groupId>io.entgra.device.mgt.core</groupId>

7
components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/pom.xml
Unescape View File

@ -151,10 +151,13 @@
<groupId>commons-logging</groupId> <groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId> <artifactId>commons-logging</artifactId>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
<dependency> <dependency>
<groupId>org.apache.httpcomponents.client5</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient5</artifactId> <artifactId>httpclient</artifactId>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/com.googlecode.json-simple/json-simple -->
<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore -->
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId> <artifactId>httpcore</artifactId>

3
components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/util/HandlerUtil.java
Unescape View File

@ -42,7 +42,6 @@ import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost; import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.methods.HttpRequestBase; import org.apache.http.client.methods.HttpRequestBase;
import org.apache.http.conn.ssl.NoopHostnameVerifier; import org.apache.http.conn.ssl.NoopHostnameVerifier;
import org.apache.http.conn.ssl.X509HostnameVerifier;
import org.apache.http.cookie.SM; import org.apache.http.cookie.SM;
import org.apache.http.entity.BufferedHttpEntity; import org.apache.http.entity.BufferedHttpEntity;
import org.apache.http.entity.ContentType; import org.apache.http.entity.ContentType;
@ -367,7 +366,7 @@ public class HandlerUtil {
boolean isIgnoreHostnameVerification = Boolean.parseBoolean(System. boolean isIgnoreHostnameVerification = Boolean.parseBoolean(System.
getProperty("org.wso2.ignoreHostnameVerification")); getProperty("org.wso2.ignoreHostnameVerification"));
if (isIgnoreHostnameVerification) { if (isIgnoreHostnameVerification) {
return HttpClients.custom().setHostnameVerifier((X509HostnameVerifier) NoopHostnameVerifier.INSTANCE).build(); return HttpClients.custom().setSSLHostnameVerifier(NoopHostnameVerifier.INSTANCE).build();
} else { } else {
return HttpClients.createDefault(); return HttpClients.createDefault();
} }

6
pom.xml
Unescape View File

@ -1309,8 +1309,8 @@
<version>${github.openfeign.version}</version> <version>${github.openfeign.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.httpcomponents.client5</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient5</artifactId> <artifactId>httpclient</artifactId>
<version>${apache.http.client.version}</version> <version>${apache.http.client.version}</version>
</dependency> </dependency>
<!-- Removing neethi configs from webapp--> <!-- Removing neethi configs from webapp-->
@ -2054,7 +2054,7 @@
<github.openfeign.version>11.0</github.openfeign.version> <github.openfeign.version>11.0</github.openfeign.version>
<jsr311.version>1.1.1</jsr311.version> <jsr311.version>1.1.1</jsr311.version>
<commons.logging.version>1.2</commons.logging.version> <commons.logging.version>1.2</commons.logging.version>
<apache.http.client.version>5.2.1</apache.http.client.version> <apache.http.client.version>4.5.6</apache.http.client.version>
<!-- apache http components core --> <!-- apache http components core -->
<apache.http.core.version>4.4.13</apache.http.core.version> <apache.http.core.version>4.4.13</apache.http.core.version>
<apache.http.mime.version>4.5.10</apache.http.mime.version> <apache.http.mime.version>4.5.10</apache.http.mime.version>

Write Preview
Loading…
Cancel
Save