This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new 8ebbfb0 [FLINK-4173][metrics] Replace assembly-plugin usage
8ebbfb0 is described below
commit 8ebbfb017b00a2b59985c1b5a9850063c0b46468
Author: zentol <[email protected]>
AuthorDate: Sun Nov 25 21:21:38 2018 +0100
[FLINK-4173][metrics] Replace assembly-plugin usage
---
flink-dist/src/main/assemblies/opt.xml | 9 +--------
flink-metrics/flink-metrics-dropwizard/pom.xml | 23 -----------------------
flink-metrics/flink-metrics-graphite/pom.xml | 22 +++++++++++++---------
3 files changed, 14 insertions(+), 40 deletions(-)
diff --git a/flink-dist/src/main/assemblies/opt.xml
b/flink-dist/src/main/assemblies/opt.xml
index ba459b1..0d9acf3 100644
--- a/flink-dist/src/main/assemblies/opt.xml
+++ b/flink-dist/src/main/assemblies/opt.xml
@@ -85,14 +85,7 @@
<!-- Metrics -->
<file>
-
<source>../flink-metrics/flink-metrics-dropwizard/target/flink-metrics-dropwizard-${project.version}-jar-with-dependencies.jar</source>
- <outputDirectory>opt/</outputDirectory>
-
<destName>flink-metrics-dropwizard-${project.version}.jar</destName>
- <fileMode>0644</fileMode>
- </file>
-
- <file>
-
<source>../flink-metrics/flink-metrics-graphite/target/flink-metrics-graphite-${project.version}-jar-with-dependencies.jar</source>
+
<source>../flink-metrics/flink-metrics-graphite/target/flink-metrics-graphite-${project.version}.jar</source>
<outputDirectory>opt/</outputDirectory>
<destName>flink-metrics-graphite-${project.version}.jar</destName>
<fileMode>0644</fileMode>
diff --git a/flink-metrics/flink-metrics-dropwizard/pom.xml
b/flink-metrics/flink-metrics-dropwizard/pom.xml
index 19da847..bdbb95d 100644
--- a/flink-metrics/flink-metrics-dropwizard/pom.xml
+++ b/flink-metrics/flink-metrics-dropwizard/pom.xml
@@ -86,27 +86,4 @@ under the License.
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <descriptorRefs>
-
<descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/flink-metrics/flink-metrics-graphite/pom.xml
b/flink-metrics/flink-metrics-graphite/pom.xml
index 03ba536..c8d1f8c 100644
--- a/flink-metrics/flink-metrics-graphite/pom.xml
+++ b/flink-metrics/flink-metrics-graphite/pom.xml
@@ -69,20 +69,24 @@ under the License.
<build>
<plugins>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <descriptorRefs>
-
<descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
- <id>make-assembly</id>
+ <id>shade-flink</id>
<phase>package</phase>
<goals>
- <goal>single</goal>
+ <goal>shade</goal>
</goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+
<include>org.apache.flink:flink-metrics-dropwizard</include>
+
<include>io.dropwizard.metrics:metrics-core</include>
+
<include>io.dropwizard.metrics:metrics-graphite</include>
+ </includes>
+ </artifactSet>
+ </configuration>
</execution>
</executions>
</plugin>
