diff options
Diffstat (limited to 'qpid/cpp')
| -rw-r--r-- | qpid/cpp/LICENSE | 31 | ||||
| -rw-r--r-- | qpid/cpp/NOTICE | 24 |
2 files changed, 4 insertions, 51 deletions
diff --git a/qpid/cpp/LICENSE b/qpid/cpp/LICENSE index cff2a5e25d..6b0b1270ff 100644 --- a/qpid/cpp/LICENSE +++ b/qpid/cpp/LICENSE @@ -1,6 +1,3 @@ -========================================================================= -== Apache License == -========================================================================= Apache License Version 2.0, January 2004 @@ -204,31 +201,3 @@ See the License for the specific language governing permissions and limitations under the License. -========================================================================= -== Boost License == -========================================================================= - -Boost Software License - Version 1.0 - August 17th, 2003 - -Permission is hereby granted, free of charge, to any person or organization -obtaining a copy of the software and accompanying documentation covered by -this license (the "Software") to use, reproduce, display, distribute, -execute, and transmit the Software, and to prepare derivative works of the -Software, and to permit third-parties to whom the Software is furnished to -do so, all subject to the following: - -The copyright notices in the Software and this entire statement, including -the above license grant, this restriction and the following disclaimer, -must be included in all copies of the Software, in whole or in part, and -all derivative works of the Software, unless such copies or derivative -works are solely in the form of machine-executable object code generated by -a source language processor. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. - diff --git a/qpid/cpp/NOTICE b/qpid/cpp/NOTICE index 5de355a56c..306b5f0801 100644 --- a/qpid/cpp/NOTICE +++ b/qpid/cpp/NOTICE @@ -1,21 +1,5 @@ -========================================================================= -== NOTICE file corresponding to the section 4 d of == -== the Apache License, Version 2.0, == -== in this case for the Apache Qpid distribution. == -========================================================================= - -This product includes software developed by the Apache Software Foundation -(http://www.apache.org/). - -Please read the LICENSE file present in the root directory of this -distribution. - -Aside from contributions to the Apache Qpid project, this software also -includes (binary only): - - None at this time - -Project requires, not packaged: - * boost version 1.33.1 or later under the Boost Software License, and - can be downloaded from http://www.boost.org - - Included in most OS platforms by default. +Apache Qpid CPP +Copyright 2006-2014 The Apache Software Foundation +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). |