diff options
| author | Robert Gemmell <robbie@apache.org> | 2014-08-27 10:15:41 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2014-08-27 10:15:41 +0000 |
| commit | 6b522a6b05a7fed3c521ef5b3f59415ca35e3fad (patch) | |
| tree | 3cb1fd52f283c50cf49fa5ca7901f9390922f2c4 /qpid/java | |
| parent | 013cb8f73f5161503278fdbfd99b9ebfebdb9390 (diff) | |
| download | qpid-python-6b522a6b05a7fed3c521ef5b3f59415ca35e3fad.tar.gz | |
QPID-5813: fix up LICENSE + NOTICE etc files
merge from trunk r1620850
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1620853 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
| -rw-r--r-- | qpid/java/LICENSE | 2 | ||||
| -rw-r--r-- | qpid/java/NOTICE | 2 | ||||
| -rw-r--r-- | qpid/java/broker/src/main/assembly/LICENSE | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/qpid/java/LICENSE b/qpid/java/LICENSE index 251cf46c23..75d12f0421 100644 --- a/qpid/java/LICENSE +++ b/qpid/java/LICENSE @@ -208,7 +208,7 @@ broker-plugins/management-http/src/main/java/resources/js/crypto-js/ -This bundles portions of crypto-js jar which is under the MIT licence: +This bundles portions of crypto-js which is under the MIT licence: Copyright (c) 2009-2013 Jeff Mott diff --git a/qpid/java/NOTICE b/qpid/java/NOTICE index 589b78325f..cc2a3c3497 100644 --- a/qpid/java/NOTICE +++ b/qpid/java/NOTICE @@ -1,4 +1,4 @@ -Apache Qpid +Apache Qpid Java Copyright 2006-2014 The Apache Software Foundation This product includes software developed at diff --git a/qpid/java/broker/src/main/assembly/LICENSE b/qpid/java/broker/src/main/assembly/LICENSE index 587680c5e0..bb9e55be67 100644 --- a/qpid/java/broker/src/main/assembly/LICENSE +++ b/qpid/java/broker/src/main/assembly/LICENSE @@ -207,7 +207,7 @@ # Third Party Dependency Licensing Information: ############################################### -This bundles portions of crypto-js jar which is under the MIT licence: +This bundles portions of crypto-js which is under the MIT licence: Copyright (c) 2009-2013 Jeff Mott |