From abefa1dff9ab62cd8cc7a6f169b4f929cf537448 Mon Sep 17 00:00:00 2001 From: Ahmet Altay Date: Tue, 14 Mar 2017 13:43:06 -0700 Subject: [PATCH 1/2] Include LICENSE and NOTICE in python dist files --- sdks/python/MANIFEST.in | 2 ++ sdks/python/pom.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sdks/python/MANIFEST.in b/sdks/python/MANIFEST.in index ff572bac8f27..41d80ef1b7ec 100644 --- a/sdks/python/MANIFEST.in +++ b/sdks/python/MANIFEST.in @@ -16,3 +16,5 @@ # include README.md +include NOTICE +include LICENSE diff --git a/sdks/python/pom.xml b/sdks/python/pom.xml index aa1977065677..f9134a507428 100644 --- a/sdks/python/pom.xml +++ b/sdks/python/pom.xml @@ -47,7 +47,7 @@ exec-maven-plugin - + none From 0b16ceb5779b6abc0eff0b6e5f415e506085f971 Mon Sep 17 00:00:00 2001 From: Ahmet Altay Date: Thu, 20 Apr 2017 13:46:46 -0700 Subject: [PATCH 2/2] Copy python specific resources from a plugin defined in the root pom.xml file. Add copied files to clean-up list and gitignore; as these are just copies of the originals in the root. --- .gitignore | 2 ++ pom.xml | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/.gitignore b/.gitignore index 69946a922418..9cfae09cb4a1 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/ diff --git a/pom.xml b/pom.xml index 638c97f59b95..17ded0f0cd1d 100644 --- a/pom.xml +++ b/pom.xml @@ -1476,6 +1476,8 @@ **/*.pyc **/*.egg-info/ + **/sdks/python/LICENSE + **/sdks/python/NOTICE false @@ -1581,6 +1583,33 @@ org.apache.maven.plugins maven-shade-plugin + + org.apache.maven.plugins + maven-resources-plugin + 3.0.2 + false + + + python-copy-resources + prepare-package + + copy-resources + + + ${basedir}/sdks/python + + + ${basedir} + + LICENSE + NOTICE + + + + + + +