[FLINK-4173][metrics] Replace assembly-plugin usage

mbalassi · Nov 27, 2018 · 8ebbfb0 · 8ebbfb0
1 parent 0a416b6
commit 8ebbfb0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 40 deletions.
diff --git 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
@@ -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
@@ -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>