SLIDER-766 binary releases don't include license/3rd party metadata: work on core
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/af780363 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/af780363 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/af780363 Branch: refs/heads/branches/branch-0.6 Commit: af780363ccb8e8548ca2fa50cce4da8d71386a38 Parents: 0381932 Author: Steve Loughran <[email protected]> Authored: Mon Jan 26 15:38:44 2015 +0000 Committer: Steve Loughran <[email protected]> Committed: Mon Jan 26 17:05:46 2015 +0000 ---------------------------------------------------------------------- .../accumulo/src/license/THIRD-PARTY.properties | 35 ++++++ .../src/packages/tarball/all.xml | 19 +++ .../slider-pkg/src/assembly/command-logger.xml | 17 +++ pom.xml | 33 ++++++ slider-agent/DEPENDENCIES | 116 +++++++++++++++++++ slider-agent/pom.xml | 1 + slider-agent/src/packages/tarball/all.xml | 22 ++++ slider-assembly/pom.xml | 4 +- slider-assembly/src/assembly/slider-bin.xml | 28 +++-- slider-core/pom.xml | 1 + slider-core/src/license/THIRD-PARTY.properties | 33 ++++++ slider-funtest/pom.xml | 1 + .../src/license/THIRD-PARTY.properties | 29 +++++ 13 files changed, 327 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/af780363/app-packages/accumulo/src/license/THIRD-PARTY.properties ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/src/license/THIRD-PARTY.properties b/app-packages/accumulo/src/license/THIRD-PARTY.properties new file mode 100644 index 0000000..9322b8f --- /dev/null +++ b/app-packages/accumulo/src/license/THIRD-PARTY.properties @@ -0,0 +1,35 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache License +# - Apache License 2.0 +# - Apache License Version 2 +# - Apache License, Version 2.0 +# - Apache Software License - Version 2.0 +# - BSD +# - CDDL + GPLv2 with classpath exception +# - CDDL 1.1 +# - CDDL License +# - Common Public License Version 1.0 +# - Eclipse Public License - Version 1.0 +# - GNU Lesser General Public License (LGPL), Version 2.1 +# - GPL2 w/ CPE +# - MIT License +# - New BSD License +# - New BSD license +# - Public Domain +# - Revised BSD +# - The Apache Software License, Version 2.0 +# - The BSD 3-Clause License +# - The BSD License +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Mon Jan 26 16:00:07 GMT 2015 +asm--asm--3.1=The BSD 3-Clause License +commons-beanutils--commons-beanutils--1.7.0=The Apache Software License, Version 2.0 +javax.servlet--servlet-api--2.5=CDDL License +javax.servlet.jsp--jsp-api--2.1=CDDL License +org.apache.zookeeper--zookeeper--3.4.6=The Apache Software License, Version 2.0 +org.codehaus.jettison--jettison--1.1=The Apache Software License, Version 2.0 http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/af780363/app-packages/command-logger/application-pkg/src/packages/tarball/all.xml ---------------------------------------------------------------------- diff --git a/app-packages/command-logger/application-pkg/src/packages/tarball/all.xml b/app-packages/command-logger/application-pkg/src/packages/tarball/all.xml index 5c6080b..4538d57 100644 --- a/app-packages/command-logger/application-pkg/src/packages/tarball/all.xml +++ b/app-packages/command-logger/application-pkg/src/packages/tarball/all.xml @@ -32,4 +32,23 @@ <outputDirectory>command-logger-app</outputDirectory> </fileSet> </fileSets> + + <files> + <file> + <source>${project.build.directory}/maven-shared-archive-resources/META-INF/DEPENDENCIES</source> + <outputDirectory>/</outputDirectory> + </file> + <file> + <source>${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE</source> + <outputDirectory>/</outputDirectory> + </file> + <file> + <source>${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE</source> + <outputDirectory>/</outputDirectory> + </file> + <file> + <source>${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE</source> + <outputDirectory>/</outputDirectory> + </file> + </files> </assembly> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/af780363/app-packages/command-logger/slider-pkg/src/assembly/command-logger.xml ---------------------------------------------------------------------- diff --git a/app-packages/command-logger/slider-pkg/src/assembly/command-logger.xml b/app-packages/command-logger/slider-pkg/src/assembly/command-logger.xml index cad468a..e283404 100644 --- a/app-packages/command-logger/slider-pkg/src/assembly/command-logger.xml +++ b/app-packages/command-logger/slider-pkg/src/assembly/command-logger.xml @@ -46,6 +46,21 @@ <filtered>true</filtered> <fileMode>0755</fileMode> </file> + + <file> + <source>../../../LICENSE</source> + <outputDirectory>/</outputDirectory> + </file> + + <file> + <source>../../../NOTICE</source> + <outputDirectory>/</outputDirectory> + </file> + + <file> + <source>${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE</source> + <outputDirectory>/</outputDirectory> + </file> </files> <fileSets> @@ -75,4 +90,6 @@ </fileSet> </fileSets> + + </assembly> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/af780363/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b6e1e19..1ed9f4c 100644 --- a/pom.xml +++ b/pom.xml @@ -211,6 +211,7 @@ <maven-groovydoc-plugin.version>1.3</maven-groovydoc-plugin.version> <maven-jar-plugin.version>2.5</maven-jar-plugin.version> <maven.javadoc.version>2.10.1</maven.javadoc.version> + <maven.license.version>1.8</maven.license.version> <maven.project.version>2.4</maven.project.version> <maven.properties.version>1.0-alpha-2</maven.properties.version> <maven-project-info-reports-plugin.version>2.7</maven-project-info-reports-plugin.version> @@ -380,6 +381,37 @@ </executions> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>license-maven-plugin</artifactId> + <version>${maven.license.version}</version> + <executions> +<!-- + <execution> + <id>download-licenses</id> + <goals> + <goal>download-licenses</goal> + </goals> + </execution> +--> + <execution> + <id>default-cli</id> + <configuration> + <licenseMerges> + <licenseMerge>The Apache Software License, Version 2.0|Apache License, Version 2.0</licenseMerge> + <licenseMerge>The Apache Software License, Version 2.0|Apache License 2.0</licenseMerge> + <licenseMerge>The Apache Software License, Version 2.0|Apache Public License 2.0</licenseMerge> + <licenseMerge>The Apache Software License, Version 2.0|Apache 2</licenseMerge> + <licenseMerge>The Apache Software License, Version 2.0|ASF 2.0</licenseMerge> + <licenseMerge>The Apache Software License, Version 2.0|Apache License Version 2</licenseMerge> + <licenseMerge>The Apache Software License, Version 2.0|Apache Software License - Version 2.0</licenseMerge> + <licenseMerge>New BSD License|New BSD license</licenseMerge> + <licenseMerge>GNU Lesser General Public License (LGPL), Version 2.1|LGPL 2.1</licenseMerge> + </licenseMerges> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> @@ -1347,6 +1379,7 @@ <excludes> <exclude>**/*.json</exclude> <exclude>**/*.tar</exclude> + <exclude>**/THIRD-PARTY.properties</exclude> <exclude>**/build.properties</exclude> <exclude>**/regionservers</exclude> <exclude>**/slaves</exclude> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/af780363/slider-agent/DEPENDENCIES ---------------------------------------------------------------------- diff --git a/slider-agent/DEPENDENCIES b/slider-agent/DEPENDENCIES new file mode 100644 index 0000000..c4e65da --- /dev/null +++ b/slider-agent/DEPENDENCIES @@ -0,0 +1,116 @@ +// ------------------------------------------------------------------ +// Transitive dependencies of this project determined from the +// maven pom organized by organization. +// ------------------------------------------------------------------ + +Slider Agent + +APACHE SLIDER SUBCOMPONENTS: + +The Apache Slider project contains subcomponents with separate copyright +notices and license terms. Your use of the source code for the these +subcomponents is subject to the terms and conditions of the following +licenses. + +For Python Mock unit test framework, + at slider-agent/src/test/python/mock, the BSD license: + + Copyright (c) 2003-2012, Michael Foord + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +For Kokki, resource management library, + which slider-agent/src/main/python/resource_management is derived from, + the BSD license: + +Copyright (c) 2009 Samuel Stauffer <[email protected]> +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + 3. Neither the name of Samuel Stauffer nor the names of its contributors may be used + to endorse or promote products derived from this software without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +For jinja2, used by resource management library as a templating engine, + at slider-agent/src/main/python/jinja2, the BSD license: + +Copyright (c) 2009 by the Jinja Team, see AUTHORS for more details. + +Some rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + * The names of the contributors may not be used to endorse or + promote products derived from this software without specific + prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + + + + http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/af780363/slider-agent/pom.xml ---------------------------------------------------------------------- diff --git a/slider-agent/pom.xml b/slider-agent/pom.xml index 04993bc..4256b1b 100644 --- a/slider-agent/pom.xml +++ b/slider-agent/pom.xml @@ -134,6 +134,7 @@ </executions> <configuration> <excludes> + <exclude>DEPENDENCIES</exclude> <exclude>src/test/python/agent/dummy_output_error.txt</exclude> <exclude>src/test/python/agent/dummy_output_good.txt</exclude> <!-- jinja2 files (BSD license) --> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/af780363/slider-agent/src/packages/tarball/all.xml ---------------------------------------------------------------------- diff --git a/slider-agent/src/packages/tarball/all.xml b/slider-agent/src/packages/tarball/all.xml index 72afb75..91bd0a8 100644 --- a/slider-agent/src/packages/tarball/all.xml +++ b/slider-agent/src/packages/tarball/all.xml @@ -37,4 +37,26 @@ </excludes> </fileSet> </fileSets> + + <files> + <file> + <source>../README.md</source> + <outputDirectory>/</outputDirectory> + </file> + <file> + <source>../LICENSE</source> + <outputDirectory>/</outputDirectory> + </file> + + <file> + <source>DEPENDENCIES</source> + <outputDirectory>/</outputDirectory> + </file> + + <file> + <source>${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE</source> + <outputDirectory>/</outputDirectory> + </file> + + </files> </assembly> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/af780363/slider-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/slider-assembly/pom.xml b/slider-assembly/pom.xml index 654bb86..01a8209 100644 --- a/slider-assembly/pom.xml +++ b/slider-assembly/pom.xml @@ -17,9 +17,9 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <artifactId>slider-assembly</artifactId> - <name>Slider Assembly</name> + <name>Apache Slider Binary Distributione</name> <packaging>pom</packaging> - <description>Apache Slider is a tool for dynamically deploying distributed applications to an Apache YARN cluster</description> + <description>Apache Slider is a tool for dynamically deploying distributed applications to an Apache YARN cluster. This module provides the binary redistributable.</description> <parent> <groupId>org.apache.slider</groupId> <artifactId>slider</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/af780363/slider-assembly/src/assembly/slider-bin.xml ---------------------------------------------------------------------- diff --git a/slider-assembly/src/assembly/slider-bin.xml b/slider-assembly/src/assembly/slider-bin.xml index f13f5df..832b58e 100644 --- a/slider-assembly/src/assembly/slider-bin.xml +++ b/slider-assembly/src/assembly/slider-bin.xml @@ -56,16 +56,6 @@ </fileSet> <fileSet> - <directory>..</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>README*</include> - <include>LICENSE*</include> - </includes> - </fileSet> - - - <fileSet> <directory>../target/staging</directory> <outputDirectory>/doc</outputDirectory> </fileSet> @@ -73,6 +63,14 @@ </fileSets> <files> + <file> + <source>../README.md</source> + <outputDirectory>/</outputDirectory> + </file> + <file> + <source>../LICENSE</source> + <outputDirectory>/</outputDirectory> + </file> <file> <source>${project.build.directory}/agent/slider-agent.tar.gz</source> @@ -84,7 +82,17 @@ <outputDirectory>agent</outputDirectory> </file> + <file> + <source>${project.build.directory}/maven-shared-archive-resources/META-INF/DEPENDENCIES</source> + <outputDirectory>/</outputDirectory> + </file> + <file> + <source>${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE</source> + <outputDirectory>/</outputDirectory> + </file> + </files> + <dependencySets> <dependencySet> <scope>runtime</scope> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/af780363/slider-core/pom.xml ---------------------------------------------------------------------- diff --git a/slider-core/pom.xml b/slider-core/pom.xml index 370539a..65daf39 100644 --- a/slider-core/pom.xml +++ b/slider-core/pom.xml @@ -547,6 +547,7 @@ <exclude>**/*.json</exclude> <exclude>src/test/python/agent.ini</exclude> <exclude>src/test/python/version</exclude> + <exclude>**/THIRD-PARTY.properties</exclude> <exclude>src/main/resources/webapps/slideram/.keep</exclude> <exclude>src/main/resources/webapps/slideragent/.keep</exclude> <exclude>src/main/resources/webapps/static/yarn.dt.plugins.js</exclude> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/af780363/slider-core/src/license/THIRD-PARTY.properties ---------------------------------------------------------------------- diff --git a/slider-core/src/license/THIRD-PARTY.properties b/slider-core/src/license/THIRD-PARTY.properties new file mode 100644 index 0000000..662fde5 --- /dev/null +++ b/slider-core/src/license/THIRD-PARTY.properties @@ -0,0 +1,33 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache License +# - BSD +# - CDDL + GPLv2 with classpath exception +# - CDDL 1.1 +# - CDDL License +# - CDDL+GPL +# - Common Public License Version 1.0 +# - Eclipse Public License - Version 1.0 +# - GNU Lesser General Public License (LGPL), Version 2.1 +# - GPL2 w/ CPE +# - MIT License +# - MPL 1.1 +# - New BSD License +# - Public Domain +# - Revised BSD +# - The Apache Software License, Version 2.0 +# - The BSD 3-Clause License +# - The BSD License +# - The MIT License +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Mon Jan 26 15:27:00 GMT 2015 +asm--asm--3.1=The BSD 3-Clause License +commons-beanutils--commons-beanutils--1.7.0=The Apache Software License, Version 2.0 +javax.servlet--servlet-api--2.5=CDDL License +javax.servlet.jsp--jsp-api--2.1=CDDL License +org.apache.zookeeper--zookeeper--3.4.6=The Apache Software License, Version 2.0 +org.codehaus.jettison--jettison--1.1=The Apache Software License, Version 2.0 http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/af780363/slider-funtest/pom.xml ---------------------------------------------------------------------- diff --git a/slider-funtest/pom.xml b/slider-funtest/pom.xml index af08d1c..708317c 100644 --- a/slider-funtest/pom.xml +++ b/slider-funtest/pom.xml @@ -313,6 +313,7 @@ <exclude>**/*.json</exclude> <exclude>**/httpfs-signature.secret</exclude> <exclude>**/regionservers</exclude> + <exclude>**/THIRD-PARTY.properties</exclude> </excludes> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/af780363/slider-funtest/src/license/THIRD-PARTY.properties ---------------------------------------------------------------------- diff --git a/slider-funtest/src/license/THIRD-PARTY.properties b/slider-funtest/src/license/THIRD-PARTY.properties new file mode 100644 index 0000000..2279ca6 --- /dev/null +++ b/slider-funtest/src/license/THIRD-PARTY.properties @@ -0,0 +1,29 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache License +# - BSD +# - CDDL 1.1 +# - CDDL License +# - Common Public License Version 1.0 +# - Eclipse Public License - Version 1.0 +# - GNU Lesser General Public License (LGPL), Version 2.1 +# - GPL2 w/ CPE +# - MIT License +# - New BSD License +# - Public Domain +# - Revised BSD +# - The Apache Software License, Version 2.0 +# - The BSD 3-Clause License +# - The BSD License +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Mon Jan 26 15:56:57 GMT 2015 +asm--asm--3.1=The BSD 3-Clause License +commons-beanutils--commons-beanutils--1.7.0=The Apache Software License, Version 2.0 +javax.servlet--servlet-api--2.5=CDDL License +javax.servlet.jsp--jsp-api--2.1=CDDL License +org.apache.zookeeper--zookeeper--3.4.6=The Apache Software License, Version 2.0 +org.codehaus.jettison--jettison--1.1=The Apache Software License, Version 2.0
