[FLINK-6514] [build] Merge bin and lib assembly

laubersder · May 15, 2017 · aa13591 · aa13591
1 parent 3c77812
commit aa13591
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 63 deletions.
diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
@@ -403,15 +403,6 @@ under the License.
  </configuration>
  </plugin>
 
- <!-- binary compatibility checks -->
- <plugin>
- <groupId>com.github.siom79.japicmp</groupId>
- <artifactId>japicmp-maven-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
-
  <!--Build uber jar-->
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
@@ -502,20 +493,6 @@ under the License.
  <appendAssemblyId>false</appendAssemblyId>
  </configuration>
  </execution>
- <execution>
- <id>lib</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assemblies/lib.xml</descriptor>
- </descriptors>
- <finalName>flink-${project.version}-bin</finalName>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- </execution>
  </executions>
  </plugin>
 

diff --git a/flink-dist/src/main/assemblies/bin.xml b/flink-dist/src/main/assemblies/bin.xml
@@ -47,13 +47,21 @@ under the License.
  </dependencySets>
 
  <files>
- <!-- copy fat jar -->
+ <!-- copy flink-dist fat jar -->
  <file>
  <source>target/flink-dist_${scala.binary.version}-${project.version}.jar</source>
  <outputDirectory>lib/</outputDirectory>
  <fileMode>0644</fileMode>
  </file>
 
+ <!-- copy the Hadoop fat jar -->
+ <file>
+ <source>../flink-shaded-hadoop/flink-shaded-hadoop2/target/flink-shaded-hadoop2-${project.version}.jar</source>
+ <outputDirectory>lib/</outputDirectory>
+ <destName>flink-shaded-hadoop2-${project.version}.jar</destName>
+ <fileMode>0644</fileMode>
+ </file>
+
  <!-- copy the config file -->
  <file>
  <source>src/main/resources/flink-conf.yaml</source>

diff --git a/flink-dist/src/main/assemblies/lib.xml b/flink-dist/src/main/assemblies/lib.xml