Repository: marmotta Updated Branches: refs/heads/develop f3cf9aaf7 -> 73503886c
MARMOTTA-510: Bubbling up NOTICE entries from httpcomponents-core; affects marmotta-webapp, marmotta-installer and ldpath-ldquery-cli binary packages since they ship the dependencies. Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/486afb7b Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/486afb7b Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/486afb7b Branch: refs/heads/develop Commit: 486afb7b18630595c3802f4d4d270f18d586af16 Parents: 9c4587b Author: Jakob Frank <[email protected]> Authored: Tue Dec 2 13:02:02 2014 +0100 Committer: Jakob Frank <[email protected]> Committed: Tue Dec 2 13:13:36 2014 +0100 ---------------------------------------------------------------------- .../marmotta-installer/src/main/resources/installer/NOTICE.txt | 3 +++ launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE | 3 +++ libraries/ldpath/ldpath-ldquery-cli/src/main/doc/NOTICE.txt | 3 +++ 3 files changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/486afb7b/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt ---------------------------------------------------------------------- diff --git a/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt b/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt index 700abfd..644d2c0 100644 --- a/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt +++ b/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt @@ -43,3 +43,6 @@ This product also includes some third-party binary components: * Joda-Time, which includes software developed by Joda.org (http://www.joda.org/). The original source code is available from https://github.com/JodaOrg/joda-time + + * Apache HttpComponents, which contains annotations derived from JCIP-ANNOTATIONS + Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net http://git-wip-us.apache.org/repos/asf/marmotta/blob/486afb7b/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE b/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE index 14f4c00..2c6b204 100644 --- a/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE +++ b/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE @@ -43,3 +43,6 @@ This product also includes some third-party binary components: * Joda-Time, which includes software developed by Joda.org (http://www.joda.org/). The original source code is available from https://github.com/JodaOrg/joda-time + + * Apache HttpComponents, which contains annotations derived from JCIP-ANNOTATIONS + Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net http://git-wip-us.apache.org/repos/asf/marmotta/blob/486afb7b/libraries/ldpath/ldpath-ldquery-cli/src/main/doc/NOTICE.txt ---------------------------------------------------------------------- diff --git a/libraries/ldpath/ldpath-ldquery-cli/src/main/doc/NOTICE.txt b/libraries/ldpath/ldpath-ldquery-cli/src/main/doc/NOTICE.txt index 9d70078..c496c5c 100644 --- a/libraries/ldpath/ldpath-ldquery-cli/src/main/doc/NOTICE.txt +++ b/libraries/ldpath/ldpath-ldquery-cli/src/main/doc/NOTICE.txt @@ -19,3 +19,6 @@ This product also includes some third-party source components: * Joda-Time, which includes software developed by Joda.org (http://www.joda.org/). The original source code is available from https://github.com/JodaOrg/joda-time + + * Apache HttpComponents, which contains annotations derived from JCIP-ANNOTATIONS + Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
