Repository: incubator-systemml Updated Branches: refs/heads/master 0ed123d10 -> 4ac77744f
[SYSTEMML-1613] Remove incubator disclaimer from project Closes #508. Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/4ac77744 Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/4ac77744 Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/4ac77744 Branch: refs/heads/master Commit: 4ac77744f84dfe0525625e3941c9b92e71b385cc Parents: 0ed123d Author: Deron Eriksson <[email protected]> Authored: Mon May 22 15:09:31 2017 -0700 Committer: Deron Eriksson <[email protected]> Committed: Mon May 22 15:09:31 2017 -0700 ---------------------------------------------------------------------- DISCLAIMER | 10 ---------- docs/release-process.md | 4 +--- pom.xml | 2 -- src/assembly/bin.xml | 8 -------- src/assembly/distrib.xml | 8 -------- src/assembly/inmemory.xml | 8 -------- src/assembly/jar.xml | 8 -------- src/assembly/standalone-jar.xml | 8 -------- src/main/python/DISCLAIMER | 10 ---------- src/main/python/MANIFEST.in | 1 - src/main/python/setup.py | 1 - 11 files changed, 1 insertion(+), 67 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/4ac77744/DISCLAIMER ---------------------------------------------------------------------- diff --git a/DISCLAIMER b/DISCLAIMER deleted file mode 100644 index 9c5f527..0000000 --- a/DISCLAIMER +++ /dev/null @@ -1,10 +0,0 @@ -Apache SystemML is an effort undergoing incubation at the Apache Software -Foundation (ASF), sponsored by the Apache Incubator PMC. - -Incubation is required of all newly accepted projects until a further review -indicates that the infrastructure, communications, and decision making process -have stabilized in a manner consistent with other successful ASF projects. - -While incubation status is not necessarily a reflection of the completeness -or stability of the code, it does indicate that the project has yet to be -fully endorsed by the ASF. http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/4ac77744/docs/release-process.md ---------------------------------------------------------------------- diff --git a/docs/release-process.md b/docs/release-process.md index d64d417..9cf9821 100644 --- a/docs/release-process.md +++ b/docs/release-process.md @@ -174,11 +174,9 @@ contents of the artifacts. If the project dependencies (ie, libraries) have chan since the last release, the LICENSE and NOTICE files must be updated to reflect these changes. -Each artifact *should* contain a DISCLAIMER file. - For more information, see: -1. <http://incubator.apache.org/guides/releasemanagement.html> +1. <http://www.apache.org/dev/#releases> 2. <http://www.apache.org/dev/licensing-howto.html> http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/4ac77744/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b91d765..3cfb4cf 100644 --- a/pom.xml +++ b/pom.xml @@ -998,8 +998,6 @@ <resourceBundles> <!-- Will generate META-INF/DEPENDENCIES META-INF/LICENSE META-INF/NOTICE --> <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle> - <!-- Will generate META-INF/DISCLAIMER --> - <resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle> </resourceBundles> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/4ac77744/src/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/src/assembly/bin.xml b/src/assembly/bin.xml index f7a3927..0396bf9 100644 --- a/src/assembly/bin.xml +++ b/src/assembly/bin.xml @@ -90,14 +90,6 @@ </includes> <outputDirectory>.</outputDirectory> </fileSet> - - <fileSet> - <directory>${basedir}</directory> - <includes> - <include>DISCLAIMER</include> - </includes> - <outputDirectory>.</outputDirectory> - </fileSet> </fileSets> <!-- Include all the libraries needed to run in standalone mode. --> http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/4ac77744/src/assembly/distrib.xml ---------------------------------------------------------------------- diff --git a/src/assembly/distrib.xml b/src/assembly/distrib.xml index 35df092..7188c99 100644 --- a/src/assembly/distrib.xml +++ b/src/assembly/distrib.xml @@ -62,14 +62,6 @@ </includes> <outputDirectory>.</outputDirectory> </fileSet> - - <fileSet> - <directory>${basedir}</directory> - <includes> - <include>DISCLAIMER</include> - </includes> - <outputDirectory>.</outputDirectory> - </fileSet> </fileSets> <files> http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/4ac77744/src/assembly/inmemory.xml ---------------------------------------------------------------------- diff --git a/src/assembly/inmemory.xml b/src/assembly/inmemory.xml index d9a415b..f186b47 100644 --- a/src/assembly/inmemory.xml +++ b/src/assembly/inmemory.xml @@ -31,14 +31,6 @@ <fileSets> <fileSet> - <directory>${basedir}</directory> - <includes> - <include>DISCLAIMER</include> - </includes> - <outputDirectory>META-INF</outputDirectory> - </fileSet> - - <fileSet> <directory>${basedir}/src/assembly/inmemory</directory> <includes> <include>LICENSE</include> http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/4ac77744/src/assembly/jar.xml ---------------------------------------------------------------------- diff --git a/src/assembly/jar.xml b/src/assembly/jar.xml index 634e66a..5eb7c9b 100644 --- a/src/assembly/jar.xml +++ b/src/assembly/jar.xml @@ -41,14 +41,6 @@ </includes> <outputDirectory>./META-INF</outputDirectory> </fileSet> - - <fileSet> - <directory>${basedir}</directory> - <includes> - <include>DISCLAIMER</include> - </includes> - <outputDirectory>./META-INF</outputDirectory> - </fileSet> </fileSets> <dependencySets> http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/4ac77744/src/assembly/standalone-jar.xml ---------------------------------------------------------------------- diff --git a/src/assembly/standalone-jar.xml b/src/assembly/standalone-jar.xml index 4c20871..746907d 100644 --- a/src/assembly/standalone-jar.xml +++ b/src/assembly/standalone-jar.xml @@ -31,14 +31,6 @@ <fileSets> <fileSet> - <directory>${basedir}</directory> - <includes> - <include>DISCLAIMER</include> - </includes> - <outputDirectory>META-INF</outputDirectory> - </fileSet> - - <fileSet> <directory>${basedir}/src/assembly/standalone-jar</directory> <includes> <include>LICENSE</include> http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/4ac77744/src/main/python/DISCLAIMER ---------------------------------------------------------------------- diff --git a/src/main/python/DISCLAIMER b/src/main/python/DISCLAIMER deleted file mode 100644 index 9c5f527..0000000 --- a/src/main/python/DISCLAIMER +++ /dev/null @@ -1,10 +0,0 @@ -Apache SystemML is an effort undergoing incubation at the Apache Software -Foundation (ASF), sponsored by the Apache Incubator PMC. - -Incubation is required of all newly accepted projects until a further review -indicates that the infrastructure, communications, and decision making process -have stabilized in a manner consistent with other successful ASF projects. - -While incubation status is not necessarily a reflection of the completeness -or stability of the code, it does indicate that the project has yet to be -fully endorsed by the ASF. http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/4ac77744/src/main/python/MANIFEST.in ---------------------------------------------------------------------- diff --git a/src/main/python/MANIFEST.in b/src/main/python/MANIFEST.in index c4f6436..4284c98 100644 --- a/src/main/python/MANIFEST.in +++ b/src/main/python/MANIFEST.in @@ -20,5 +20,4 @@ #------------------------------------------------------------- include LICENSE include NOTICE -include DISCLAIMER recursive-include systemml/systemml-java * http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/4ac77744/src/main/python/setup.py ---------------------------------------------------------------------- diff --git a/src/main/python/setup.py b/src/main/python/setup.py index fcda255..3ba9ac6 100644 --- a/src/main/python/setup.py +++ b/src/main/python/setup.py @@ -55,7 +55,6 @@ for path, subdirs, files in os.walk(java_dir_full_path): for name in files: PACKAGE_DATA = PACKAGE_DATA + [ os.path.join(path, name).replace('./', '') ] PACKAGE_DATA = PACKAGE_DATA + [os.path.join(python_dir, 'LICENSE'), - os.path.join(python_dir, 'DISCLAIMER'), os.path.join(python_dir, 'NOTICE')] setup(
