Skip to content

Commit 5ca3597

Browse files
committed
update io.wcm.caravan.commons.httpclient/io.wcm.caravan.commons.httpasyncclient dependency to get rid of transient dependency to commons-beanutils
1 parent 457c118 commit 5ca3597

File tree

2 files changed

+22
-43
lines changed

2 files changed

+22
-43
lines changed

consumer-httpclient/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<dependency>
6262
<groupId>io.wcm.caravan</groupId>
6363
<artifactId>io.wcm.caravan.commons.httpclient</artifactId>
64-
<version>1.2.0</version>
64+
<version>1.4.2</version>
6565
<scope>compile</scope>
6666
</dependency>
6767

consumer-httpclient/src/test/java/io/wcm/caravan/jaxws/consumer/httpclient/impl/JaxWsClientInitializerHttpClientConfigImplTest.java

Lines changed: 21 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,6 @@
1919
*/
2020
package io.wcm.caravan.jaxws.consumer.httpclient.impl;
2121

22-
import static io.wcm.caravan.commons.httpclient.impl.HttpClientConfigImpl.CONNECT_TIMEOUT_PROPERTY;
23-
import static io.wcm.caravan.commons.httpclient.impl.HttpClientConfigImpl.HOST_PATTERNS_PROPERTY;
24-
import static io.wcm.caravan.commons.httpclient.impl.HttpClientConfigImpl.HTTP_PASSWORD_PROPERTY;
25-
import static io.wcm.caravan.commons.httpclient.impl.HttpClientConfigImpl.HTTP_USER_PROPERTY;
26-
import static io.wcm.caravan.commons.httpclient.impl.HttpClientConfigImpl.KEYMANAGER_TYPE_PROPERTY;
27-
import static io.wcm.caravan.commons.httpclient.impl.HttpClientConfigImpl.KEYSTORE_PASSWORD_PROPERTY;
28-
import static io.wcm.caravan.commons.httpclient.impl.HttpClientConfigImpl.KEYSTORE_PATH_PROPERTY;
29-
import static io.wcm.caravan.commons.httpclient.impl.HttpClientConfigImpl.KEYSTORE_PROVIDER_PROPERTY;
30-
import static io.wcm.caravan.commons.httpclient.impl.HttpClientConfigImpl.KEYSTORE_TYPE_PROPERTY;
31-
import static io.wcm.caravan.commons.httpclient.impl.HttpClientConfigImpl.PATH_PATTERNS_PROPERTY;
32-
import static io.wcm.caravan.commons.httpclient.impl.HttpClientConfigImpl.PROXY_HOST_PROPERTY;
33-
import static io.wcm.caravan.commons.httpclient.impl.HttpClientConfigImpl.PROXY_PASSWORD_PROPERTY;
34-
import static io.wcm.caravan.commons.httpclient.impl.HttpClientConfigImpl.PROXY_PORT_PROPERTY;
35-
import static io.wcm.caravan.commons.httpclient.impl.HttpClientConfigImpl.PROXY_USER_PROPERTY;
36-
import static io.wcm.caravan.commons.httpclient.impl.HttpClientConfigImpl.SOCKET_TIMEOUT_PROPERTY;
37-
import static io.wcm.caravan.commons.httpclient.impl.HttpClientConfigImpl.SSL_CONTEXT_TYPE_PROPERTY;
38-
import static io.wcm.caravan.commons.httpclient.impl.HttpClientConfigImpl.TRUSTMANAGER_TYPE_PROPERTY;
39-
import static io.wcm.caravan.commons.httpclient.impl.HttpClientConfigImpl.TRUSTSTORE_PASSWORD_PROPERTY;
40-
import static io.wcm.caravan.commons.httpclient.impl.HttpClientConfigImpl.TRUSTSTORE_PATH_PROPERTY;
41-
import static io.wcm.caravan.commons.httpclient.impl.HttpClientConfigImpl.TRUSTSTORE_PROVIDER_PROPERTY;
42-
import static io.wcm.caravan.commons.httpclient.impl.HttpClientConfigImpl.TRUSTSTORE_TYPE_PROPERTY;
4322
import static org.junit.Assert.assertEquals;
4423
import static org.junit.Assert.assertNotNull;
4524
import static org.junit.Assert.assertNull;
@@ -78,27 +57,27 @@ public void testNoConfigs() {
7857
@Test
7958
public void testWithConfig() {
8059
context.registerInjectActivateService(new HttpClientConfigImpl(),
81-
HOST_PATTERNS_PROPERTY, "^server.*$",
82-
PATH_PATTERNS_PROPERTY, ".*path.*",
83-
CONNECT_TIMEOUT_PROPERTY, 123,
84-
SOCKET_TIMEOUT_PROPERTY, 456,
85-
HTTP_USER_PROPERTY, "user1",
86-
HTTP_PASSWORD_PROPERTY, "pwd1",
87-
PROXY_HOST_PROPERTY, "host1",
88-
PROXY_PORT_PROPERTY, 789,
89-
PROXY_USER_PROPERTY, "proxyUser1",
90-
PROXY_PASSWORD_PROPERTY, "proxyPwd1",
91-
SSL_CONTEXT_TYPE_PROPERTY, "sslType1",
92-
KEYMANAGER_TYPE_PROPERTY, "keyManager1",
93-
KEYSTORE_TYPE_PROPERTY, "keyStore1",
94-
KEYSTORE_PROVIDER_PROPERTY, "keyStoreProvider1",
95-
KEYSTORE_PATH_PROPERTY, "keyPath1",
96-
KEYSTORE_PASSWORD_PROPERTY, "keyPwd1",
97-
TRUSTMANAGER_TYPE_PROPERTY, "trustManager1",
98-
TRUSTSTORE_TYPE_PROPERTY, "trustStore1",
99-
TRUSTSTORE_PROVIDER_PROPERTY, "trustStoreProvider1",
100-
TRUSTSTORE_PATH_PROPERTY, "trustPath1",
101-
TRUSTSTORE_PASSWORD_PROPERTY, "trustPwd1");
60+
"hostPatterns", "^server.*$",
61+
"pathPatterns", ".*path.*",
62+
"connectTimeout", 123,
63+
"socketTimeout", 456,
64+
"httpUser", "user1",
65+
"httpPassword", "pwd1",
66+
"proxyHost", "host1",
67+
"proxyPort", 789,
68+
"proxyUser", "proxyUser1",
69+
"proxyPassword", "proxyPwd1",
70+
"sslContextType", "sslType1",
71+
"keyManagerType", "keyManager1",
72+
"keyStoreType", "keyStore1",
73+
"keyStoreProvider", "keyStoreProvider1",
74+
"keyStorePath", "keyPath1",
75+
"keyStorePassword", "keyPwd1",
76+
"trustManagerType", "trustManager1",
77+
"trustStoreType", "trustStore1",
78+
"trustStoreProvider", "trustStoreProvider1",
79+
"trustStorePath", "trustPath1",
80+
"trustStorePassword", "trustPwd1");
10281

10382
JaxWsClientInitializer jaxws = underTest.get(TEST_URI);
10483
assertNotNull(jaxws);

0 commit comments

Comments
 (0)