summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2014-08-27 10:11:31 +0000
committerRobert Gemmell <robbie@apache.org>2014-08-27 10:11:31 +0000
commitdbdb3105a77ede3254b9f1abd64c9c8bf99d77fa (patch)
treef8e01ca5252f2d94e4f0749f8d3714ea5251a87d /qpid/java
parentb777958d9a37a1b1b3fbae77a4272a4738849dcf (diff)
downloadqpid-python-dbdb3105a77ede3254b9f1abd64c9c8bf99d77fa.tar.gz
QPID-5813: fix up LICENSE + NOTICE etc files
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1620850 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/LICENSE2
-rw-r--r--qpid/java/NOTICE2
-rw-r--r--qpid/java/broker/src/main/assembly/LICENSE2
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