Repository: beam Updated Branches: refs/heads/master 4682238dc -> 3bb0f8e6a
Include LICENSE and NOTICE in python dist files Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/6d5e1ffb Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/6d5e1ffb Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/6d5e1ffb Branch: refs/heads/master Commit: 6d5e1ffb4f9f392924bf04daedbc715a260f94cc Parents: 4682238 Author: Ahmet Altay <al...@google.com> Authored: Tue Mar 14 13:43:06 2017 -0700 Committer: Davor Bonaci <da...@google.com> Committed: Tue May 2 16:56:35 2017 -0700 ---------------------------------------------------------------------- .gitignore | 2 ++ pom.xml | 29 +++++++++++++++++++++++++++++ sdks/python/MANIFEST.in | 2 ++ sdks/python/pom.xml | 2 +- 4 files changed, 34 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/6d5e1ffb/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 69946a9..9cfae09 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,8 @@ env/ sdks/python/**/*.c sdks/python/**/*.so sdks/python/**/*.egg +sdks/python/LICENSE +sdks/python/NOTICE # Ignore IntelliJ files. .idea/ http://git-wip-us.apache.org/repos/asf/beam/blob/6d5e1ffb/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 59f6963..127babd 100644 --- a/pom.xml +++ b/pom.xml @@ -1508,6 +1508,8 @@ <includes> <include>**/*.pyc</include> <include>**/*.egg-info/</include> + <include>**/sdks/python/LICENSE</include> + <include>**/sdks/python/NOTICE</include> </includes> <followSymlinks>false</followSymlinks> </fileset> @@ -1613,6 +1615,33 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>3.0.2</version> + <inherited>false</inherited> + <executions> + <execution> + <id>python-copy-resources</id> + <phase>prepare-package</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${basedir}/sdks/python</outputDirectory> + <resources> + <resource> + <directory>${basedir}</directory> + <includes> + <include>LICENSE</include> + <include>NOTICE</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/beam/blob/6d5e1ffb/sdks/python/MANIFEST.in ---------------------------------------------------------------------- diff --git a/sdks/python/MANIFEST.in b/sdks/python/MANIFEST.in index ff572ba..41d80ef 100644 --- a/sdks/python/MANIFEST.in +++ b/sdks/python/MANIFEST.in @@ -16,3 +16,5 @@ # include README.md +include NOTICE +include LICENSE http://git-wip-us.apache.org/repos/asf/beam/blob/6d5e1ffb/sdks/python/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/python/pom.xml b/sdks/python/pom.xml index aa19770..f9134a5 100644 --- a/sdks/python/pom.xml +++ b/sdks/python/pom.xml @@ -47,7 +47,7 @@ <artifactId>exec-maven-plugin</artifactId> <executions> <execution> - <!-- trick by @aaltay to skip inheritance --> + <!-- trick to skip inheritance --> <phase>none</phase> </execution> </executions>