This is an automated email from the ASF dual-hosted git repository. mmerli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git
The following commit(s) were added to refs/heads/master by this push: new 350d297 add httpcore dep required by httpclient in hostname-verification (#1239) 350d297 is described below commit 350d2973703f99f3a36e6a56a4348a6b76415c3f Author: Rajan Dhabalia <rdhaba...@apache.org> AuthorDate: Wed Feb 14 16:29:37 2018 -0800 add httpcore dep required by httpclient in hostname-verification (#1239) --- all/src/assemble/LICENSE.bin.txt | 1 + pulsar-broker-shaded/pom.xml | 7 +++++++ pulsar-client-kafka-compat/pulsar-client-kafka/pom.xml | 9 +++++++++ pulsar-client-shaded/pom.xml | 7 +++++++ pulsar-client/pom.xml | 7 ++++++- 5 files changed, 30 insertions(+), 1 deletion(-) diff --git a/all/src/assemble/LICENSE.bin.txt b/all/src/assemble/LICENSE.bin.txt index a7e70de..944ba2d 100644 --- a/all/src/assemble/LICENSE.bin.txt +++ b/all/src/assemble/LICENSE.bin.txt @@ -333,6 +333,7 @@ The Apache Software License, Version 2.0 * SnakeYaml -- org.yaml-snakeyaml-*.jar * RocksDB - org.rocksdb.*.jar * HttpClient - org.apache.httpcomponents.httpclient.jar + * HttCore - org.apache.httpcomponents.httpcore.jar * CommonsLogging - commons-logging-*.jar BSD 3-clause "New" or "Revised" License diff --git a/pulsar-broker-shaded/pom.xml b/pulsar-broker-shaded/pom.xml index efcfa76..e8539e7 100644 --- a/pulsar-broker-shaded/pom.xml +++ b/pulsar-broker-shaded/pom.xml @@ -106,6 +106,7 @@ <include>com.wordnik:swagger-annotations</include> <include>org.apache.httpcomponents:httpclient</include> <include>commons-logging:commons-logging</include> + <include>org.apache.httpcomponents:httpcore</include> </includes> </artifactSet> <filters> @@ -121,6 +122,12 @@ <include>**</include> </includes> </filter> + <filter> + <artifact>commons-logging:commons-logging</artifact> + <includes> + <include>**</include> + </includes> + </filter> </filters> <relocations> <relocation> diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka/pom.xml b/pulsar-client-kafka-compat/pulsar-client-kafka/pom.xml index 9060003..1be1250 100644 --- a/pulsar-client-kafka-compat/pulsar-client-kafka/pom.xml +++ b/pulsar-client-kafka-compat/pulsar-client-kafka/pom.xml @@ -127,8 +127,17 @@ <include>com.yahoo.datasketches:sketches-core</include> <include>org.apache.httpcomponents:httpclient</include> <include>commons-logging:commons-logging</include> + <include>org.apache.httpcomponents:httpcore</include> </includes> </artifactSet> + <filters> + <filter> + <artifact>commons-logging:commons-logging</artifact> + <includes> + <include>**</include> + </includes> + </filter> + </filters> <relocations> <relocation> <pattern>org.apache.kafka.clients.producer.KafkaProducer</pattern> diff --git a/pulsar-client-shaded/pom.xml b/pulsar-client-shaded/pom.xml index cf1d7b5..58bba0e 100644 --- a/pulsar-client-shaded/pom.xml +++ b/pulsar-client-shaded/pom.xml @@ -83,6 +83,7 @@ <include>com.yahoo.datasketches:sketches-core</include> <include>org.apache.httpcomponents:httpclient</include> <include>commons-logging:commons-logging</include> + <include>org.apache.httpcomponents:httpcore</include> </includes> </artifactSet> <filters> @@ -98,6 +99,12 @@ <include>**</include> </includes> </filter> + <filter> + <artifact>commons-logging:commons-logging</artifact> + <includes> + <include>**</include> + </includes> + </filter> </filters> <relocations> <relocation> diff --git a/pulsar-client/pom.xml b/pulsar-client/pom.xml index 57c69c8..3ab403f 100644 --- a/pulsar-client/pom.xml +++ b/pulsar-client/pom.xml @@ -86,12 +86,17 @@ </exclusions> </dependency> - <!-- httpclient uses it for logging --> + <!-- httpclient-hostname-verification depends on below dependencies --> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>1.1.1</version> </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + <version>4.4.9</version> + </dependency> </dependencies> -- To stop receiving notification emails like this one, please contact mme...@apache.org.