You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tz...@apache.org on 2018/01/12 13:30:58 UTC

[06/19] flink git commit: [FLINK-6951] [kinesis] Shade httpcomponents dependency for Kinesis connector

[FLINK-6951] [kinesis] Shade httpcomponents dependency for Kinesis connector

This closes #4150.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/77e63e6a
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/77e63e6a
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/77e63e6a

Branch: refs/heads/master
Commit: 77e63e6a76937c81c2641a5c46a9a53c0b57b309
Parents: d53a722
Author: Bowen Li <bo...@gmail.com>
Authored: Wed Jun 21 15:55:19 2017 -0700
Committer: Tzu-Li (Gordon) Tai <tz...@apache.org>
Committed: Fri Jan 12 19:43:28 2018 +0800

----------------------------------------------------------------------
 flink-connectors/flink-connector-kinesis/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/77e63e6a/flink-connectors/flink-connector-kinesis/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-kinesis/pom.xml b/flink-connectors/flink-connector-kinesis/pom.xml
index f91228b..99629bf 100644
--- a/flink-connectors/flink-connector-kinesis/pom.xml
+++ b/flink-connectors/flink-connector-kinesis/pom.xml
@@ -154,6 +154,7 @@ under the License.
 								<includes>
 									<include>com.amazonaws:*</include>
 									<include>com.google.protobuf:*</include>
+									<include>org.apache.httpcomponents:*</include>
 								</includes>
 							</artifactSet>
 							<relocations combine.children="override">
@@ -166,6 +167,10 @@ under the License.
 									<pattern>com.amazonaws</pattern>
 									<shadedPattern>org.apache.flink.kinesis.shaded.com.amazonaws</shadedPattern>
 								</relocation>
+								<relocation>
+									<pattern>org.apache.http</pattern>
+									<shadedPattern>org.apache.flink.kinesis.shaded.org.apache.http</shadedPattern>
+								</relocation>
 							</relocations>
 						</configuration>
 					</execution>