From 67fb2f3ab1eafddc1bf67e4046225cf018ed5369 Mon Sep 17 00:00:00 2001
From: zentol <chesnay@apache.org>
Date: Thu, 13 Jul 2017 22:06:56 +0200
Subject: [PATCH] [FLINK-7178] [metrics] Do not create separate shaded jars

This closes #4326.
---
 flink-dist/src/main/assemblies/opt.xml         | 4 ++--
 flink-metrics/flink-metrics-datadog/pom.xml    | 1 -
 flink-metrics/flink-metrics-prometheus/pom.xml | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/flink-dist/src/main/assemblies/opt.xml b/flink-dist/src/main/assemblies/opt.xml
index 0afa1d3c4fc64..ba32086abdcf9 100644
--- a/flink-dist/src/main/assemblies/opt.xml
+++ b/flink-dist/src/main/assemblies/opt.xml
@@ -98,7 +98,7 @@
 		</file>
 
 		<file>
-			<source>../flink-metrics/flink-metrics-prometheus/target/flink-metrics-prometheus-${project.version}-shaded.jar</source>
+			<source>../flink-metrics/flink-metrics-prometheus/target/flink-metrics-prometheus-${project.version}.jar</source>
 			<outputDirectory>opt/</outputDirectory>
 			<destName>flink-metrics-prometheus-${project.version}.jar</destName>
 			<fileMode>0644</fileMode>
@@ -112,7 +112,7 @@
 		</file>
 
 		<file>
-			<source>../flink-metrics/flink-metrics-datadog/target/flink-metrics-datadog-${project.version}-shaded.jar</source>
+			<source>../flink-metrics/flink-metrics-datadog/target/flink-metrics-datadog-${project.version}.jar</source>
 			<outputDirectory>opt/</outputDirectory>
 			<destName>flink-metrics-datadog-${project.version}.jar</destName>
 			<fileMode>0644</fileMode>
diff --git a/flink-metrics/flink-metrics-datadog/pom.xml b/flink-metrics/flink-metrics-datadog/pom.xml
index 656f308a923f0..ac3c31706753f 100644
--- a/flink-metrics/flink-metrics-datadog/pom.xml
+++ b/flink-metrics/flink-metrics-datadog/pom.xml
@@ -88,7 +88,6 @@ under the License.
 							<goal>shade</goal>
 						</goals>
 						<configuration>
-							<shadedArtifactAttached>true</shadedArtifactAttached>
 							<relocations combine.children="append">
 								<relocation>
 									<pattern>okhttp3</pattern>
diff --git a/flink-metrics/flink-metrics-prometheus/pom.xml b/flink-metrics/flink-metrics-prometheus/pom.xml
index 4884433c03297..f8f2eea5a0f9f 100644
--- a/flink-metrics/flink-metrics-prometheus/pom.xml
+++ b/flink-metrics/flink-metrics-prometheus/pom.xml
@@ -109,7 +109,6 @@ under the License.
 							<goal>shade</goal>
 						</goals>
 						<configuration>
-							<shadedArtifactAttached>true</shadedArtifactAttached>
 							<relocations combine.children="append">
 								<relocation>
 									<pattern>io.prometheus.client</pattern>