pirk-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eawilli...@apache.org
Subject [03/15] incubator-pirk git commit: further license and notice info updates
Date Tue, 30 Aug 2016 15:43:02 GMT
further license and notice info updates


Project: http://git-wip-us.apache.org/repos/asf/incubator-pirk/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-pirk/commit/38b4cc10
Tree: http://git-wip-us.apache.org/repos/asf/incubator-pirk/tree/38b4cc10
Diff: http://git-wip-us.apache.org/repos/asf/incubator-pirk/diff/38b4cc10

Branch: refs/heads/gh-pages
Commit: 38b4cc10c6ea72c4a4ead3a23a08b75a893ef16b
Parents: 148a211
Author: eawilliams <eawilliams@apache.org>
Authored: Mon Aug 22 13:21:54 2016 -0400
Committer: eawilliams <eawilliams@apache.org>
Committed: Mon Aug 22 13:21:54 2016 -0400

----------------------------------------------------------------------
 how_to_contribute.md |  5 +++++
 releasing.md         | 17 +++++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/38b4cc10/how_to_contribute.md
----------------------------------------------------------------------
diff --git a/how_to_contribute.md b/how_to_contribute.md
index ccbb213..fc81f84 100644
--- a/how_to_contribute.md
+++ b/how_to_contribute.md
@@ -29,6 +29,11 @@ The general process for code contribution is as follows:
 3. Modify the source code to add your awesome features; you will most likely be modifying
the apache/incubator-pirk master branch (unless you are [modifying the Pirk website]({{ site.baseurl
}}/website_updates))
 4. Ensure that all unit and functional tests pass
 5. Ensure that your code follows the [Pirk code standards]({{ site.baseurl }}/for_developers#coding-standards)
+5. Ensure that any new third-party dependencies introduced in your code are accounted for
in the appropriate license and notice files
+* Binary license and notice files for Pirk are contained in the `src/main/resources/META-INF/bin-license-notice`
directory. Please update the `LICENSE-bin` and `NOTICE-bin` files as well as the `licenses`
directory with any licenses and notices corresponding to all new third-party dependencies
introduced in your code.
+* [LICENSE requirements for distribution artifacts with multiple licenses](http://www.apache.org/dev/release.html#distributing-code-under-several-licenses)
+* [NOTICE file requirements](http://www.apache.org/dev/release.html#notice-content)
+* [Acceptable](http://www.apache.org/legal/resolved.html#category-a) and [Unacceptable](http://www.apache.org/legal/resolved.html#category-x)
Dependency Licenses
 6. Commit the changes to your local repository
 7. Push the code back up to your GitHub fork of apache/incubator-pirk
 8. [Create a Pull Request](#github-pull-requests) to the to [apache/incubator-pirk](https://github.com/apache/incubator-pirk)
repository on GitHub. Please include the corresponding JIRA issue number and description in
the title of the pull request: PIRK-XXXX: < JIRA-Issue-Description >

http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/38b4cc10/releasing.md
----------------------------------------------------------------------
diff --git a/releasing.md b/releasing.md
index e1cfe02..bb92b28 100755
--- a/releasing.md
+++ b/releasing.md
@@ -113,12 +113,17 @@ As per the Apache documentation, verify that the release candidate artifacts
sat
 * Checksums and PGP signatures are valid
 * Build is successful including automated tests
 * DISCLAIMER is correct, filenames include "incubating"
-* Top-level LICENSE and NOTICE are correct and dependency licenses are acceptable. See:
-	* [LICENSE file requirements](http://www.apache.org/dev/release.html#license)
-	* [LICENSE requirements for distribution artifacts with multiple licenses](http://www.apache.org/dev/release.html#distributing-code-under-several-licenses)
-	* [NOTICE file requirements](http://www.apache.org/dev/release.html#notice-content)
-	* [Apache Legal](http://apache.org/legal/)
-	* [Acceptable](http://www.apache.org/legal/resolved.html#category-a) and [Unacceptable](http://www.apache.org/legal/resolved.html#category-x)
Dependency Licenses
+* LICENSE and NOTICE files are correct and dependency licenses are acceptable
+	* LICENSE and NOTICE files at the root of the artifact directory must only reflect the contents
of the artifact in which they are contained.  
+	* NOTE: 
+		* The LICENSE and NOTICE files contained at the root of the Apache Pirk code repository
correspond to the source code only. 
+		* License and notice files corresponding to the binary distribution/artifacts of Apache
Pirk are found in the `src/main/resources/META-INF/bin-license-notice` directory under `LICENSE-bin`
and `NOTICE-bin`. The full licenses of third-party dependencies contained in Pirk's binary
artifacts are located in the  `licenses` directory.
+	* See:
+		* [LICENSE file requirements](http://www.apache.org/dev/release.html#license)
+		* [LICENSE requirements for distribution artifacts with multiple licenses](http://www.apache.org/dev/release.html#distributing-code-under-several-licenses)
+		* [NOTICE file requirements](http://www.apache.org/dev/release.html#notice-content)
+		* [Apache Legal](http://apache.org/legal/)
+		* [Acceptable](http://www.apache.org/legal/resolved.html#category-a) and [Unacceptable](http://www.apache.org/legal/resolved.html#category-x)
Dependency Licenses
 * All source files have license headers where appropriate, RAT checks pass
 * The provenance of all source files is clear (ASF or software grants)
 


Mime
View raw message