Repository: flink Updated Branches: refs/heads/master 6fdec897d -> ae423e1d1
[FLINK-6514] [build] Merge bin and lib assembly Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/aa135914 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/aa135914 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/aa135914 Branch: refs/heads/master Commit: aa135914b0d2a110522bc5e1279a610717bc88a7 Parents: 3c77812 Author: Stephan Ewen <se...@apache.org> Authored: Thu May 11 13:52:25 2017 +0200 Committer: Robert Metzger <rmetz...@apache.org> Committed: Mon May 15 11:29:12 2017 +0200 ---------------------------------------------------------------------- flink-dist/pom.xml | 23 ----------------- flink-dist/src/main/assemblies/bin.xml | 10 +++++++- flink-dist/src/main/assemblies/lib.xml | 39 ----------------------------- 3 files changed, 9 insertions(+), 63 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/aa135914/flink-dist/pom.xml ---------------------------------------------------------------------- diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml index 66d2a25..b037e55 100644 --- 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> http://git-wip-us.apache.org/repos/asf/flink/blob/aa135914/flink-dist/src/main/assemblies/bin.xml ---------------------------------------------------------------------- diff --git a/flink-dist/src/main/assemblies/bin.xml b/flink-dist/src/main/assemblies/bin.xml index 909beb4..cefb477 100644 --- 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> http://git-wip-us.apache.org/repos/asf/flink/blob/aa135914/flink-dist/src/main/assemblies/lib.xml ---------------------------------------------------------------------- diff --git a/flink-dist/src/main/assemblies/lib.xml b/flink-dist/src/main/assemblies/lib.xml deleted file mode 100644 index a183910..0000000 --- a/flink-dist/src/main/assemblies/lib.xml +++ /dev/null @@ -1,39 +0,0 @@ -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. The ASF licenses this file - ~ to you under the Apache License, Version 2.0 (the - ~ "License"); you may not use this file except in compliance - ~ with the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> - -<assembly - xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd";> - <id>lib</id> - <formats> - <format>dir</format> - </formats> - - <includeBaseDirectory>true</includeBaseDirectory> - <baseDirectory>flink-${project.version}</baseDirectory> - - <files> - <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> - </files> -</assembly>
