QPID-5677: make 0.28 specific alterations to handle difference in dependencies from trunk

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.28@1586999 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 35 insertions, 53 deletions

diff --git a/qpid/java/broker/src/main/assembly/LICENSE b/qpid/java/broker/src/main/assembly/LICENSE
index 7f2955ee35..5156be8ce4 100644
--- a/qpid/java/broker/src/main/assembly/LICENSE
+++ b/qpid/java/broker/src/main/assembly/LICENSE
@@ -207,31 +207,6 @@
 # Third Party Dependency Licensing Information:
 ###############################################
 
-This bundles the crypto-js jar which is under the MIT licence:
-
-Copyright (c) 2009-2013 Jeff Mott
-
- Permission is hereby granted, free  of charge, to any person obtaining
- a  copy  of this  software  and  associated  documentation files  (the
- "Software"), to  deal in  the Software without  restriction, including
- without limitation  the rights to  use, copy, modify,  merge, publish,
- distribute,  sublicense, and/or sell  copies of  the Software,  and to
- permit persons to whom the Software  is furnished to do so, subject to
- the following conditions:
- 
- The  above  copyright  notice  and  this permission  notice  shall  be
- included in all copies or substantial portions of the Software.
- 
- 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    AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-###############################################
-
 This product bundles the slf4j-api and slf4j-log4j jars which are under
 the MIT licence:
 
diff --git a/qpid/java/broker/src/main/assembly/NOTICE b/qpid/java/broker/src/main/assembly/NOTICE
index 6950a91fb3..65e9ab6949 100644
--- a/qpid/java/broker/src/main/assembly/NOTICE
+++ b/qpid/java/broker/src/main/assembly/NOTICE
@@ -71,16 +71,41 @@ http://www.w3.org/Consortium/Legal/
 
 ###############################################
 
+Commons Logging
+Copyright 2001-2007 The Apache Software Foundation
+
+###############################################
+
 Apache Commons Codec
 Copyright 2002-2013 The Apache Software Foundation
 
 ###############################################
 
+Apache Commons BeanUtils
+Copyright 2000-2010 The Apache Software Foundation
+
+###############################################
+
 Apache Commons CLI
 Copyright 2001-2009 The Apache Software Foundation
 
 ###############################################
 
+Apache Commons Collections
+Copyright 2001-2008 The Apache Software Foundation
+
+###############################################
+
+Apache Commons Configuration
+Copyright 2001-2012 The Apache Software Foundation
+
+###############################################
+
+Apache Commons Digester
+Copyright 2001-2008 The Apache Software Foundation
+
+###############################################
+
 Apache Commons Lang
 Copyright 2001-2011 The Apache Software Foundation
 
@@ -90,4 +115,3 @@ Apache log4j
 Copyright 2007 The Apache Software Foundation
 
 ###############################################
-
diff --git a/qpid/java/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE b/qpid/java/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
index 866ff6c1ec..66f19a0527 100644
--- a/qpid/java/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
+++ b/qpid/java/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
@@ -28,8 +28,6 @@ From: 'an unknown organization'
     License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
   - bcel  org.apache.bcel:bcel:jar:5.2
 
-  - CryptoJS (http://webjars.org) org.webjars:cryptojs:jar:3.1.2
-    License: New BSD  (http://opensource.org/licenses/BSD-3-Clause)
 
 From: 'Apache Software Foundation' (http://db.apache.org/)
   - Apache Derby Database Engine and Embedded JDBC Driver (http://db.apache.org/derby/derby/) org.apache.derby:derby:jar:10.8.2.2
@@ -76,12 +74,22 @@ From: 'The Apache Software Foundation' (http://www.apache.org)
     License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
 
 From: 'The Apache Software Foundation' (http://www.apache.org/)
+  - Commons BeanUtils Core (http://commons.apache.org/beanutils/) commons-beanutils:commons-beanutils-core:jar:1.8.3
+    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
   - Commons CLI (http://commons.apache.org/cli/) commons-cli:commons-cli:jar:1.2
     License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
   - Apache Commons Codec (http://commons.apache.org/proper/commons-codec/) commons-codec:commons-codec:jar:1.9
     License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+  - Commons Collections (http://commons.apache.org/collections/) commons-collections:commons-collections:jar:3.2.1
+    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+  - Commons Configuration (http://commons.apache.org/configuration/) commons-configuration:commons-configuration:jar:1.8
+    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+  - Commons Digester (http://commons.apache.org/digester/) commons-digester:commons-digester:jar:1.8.1
+    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
   - Commons Lang (http://commons.apache.org/lang/) commons-lang:commons-lang:jar:2.6
     License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+  - Commons Logging (http://commons.apache.org/logging) commons-logging:commons-logging:jar:1.1.1
+    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
   - Qpid AMQP 1.0 Common (http://qpid.apache.org/qpid-java-build/qpid-amqp-1-0-common) org.apache.qpid:qpid-amqp-1-0-common:jar
     License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
   - Qpid BDB Message Store (http://qpid.apache.org/qpid-java-build/qpid-bdbstore) org.apache.qpid:qpid-bdbstore:jar
diff --git a/qpid/java/resources/java-binary-release/LICENSE b/qpid/java/resources/java-binary-release/LICENSE
index 8b3b0925f3..a81daaa5ab 100644
--- a/qpid/java/resources/java-binary-release/LICENSE
+++ b/qpid/java/resources/java-binary-release/LICENSE
@@ -207,31 +207,6 @@
 # Third Party Dependency Licensing Information:
 ###############################################
 
-This bundles the crypto-js jar which is under the MIT licence:
-
-Copyright (c) 2009-2013 Jeff Mott
-
- Permission is hereby granted, free  of charge, to any person obtaining
- a  copy  of this  software  and  associated  documentation files  (the
- "Software"), to  deal in  the Software without  restriction, including
- without limitation  the rights to  use, copy, modify,  merge, publish,
- distribute,  sublicense, and/or sell  copies of  the Software,  and to
- permit persons to whom the Software  is furnished to do so, subject to
- the following conditions:
- 
- The  above  copyright  notice  and  this permission  notice  shall  be
- included in all copies or substantial portions of the Software.
- 
- 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    AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-###############################################
-
 This product bundles the slf4j-api and slf4j-log4j jars which are under
 the MIT licence: