You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2017/11/08 15:59:11 UTC

[2/4] qpid-broker-j git commit: QPID-8024: [Broker-J] Update NOTICE files

QPID-8024: [Broker-J] Update NOTICE files

(cherry picked from commit 8e070efb00e6c2131f95ad77d2b5767d666a02b9)


Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/ecb83b04
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/ecb83b04
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/ecb83b04

Branch: refs/heads/7.0.x
Commit: ecb83b04cf4a537dcdb28b885f17ea5fb4369d7d
Parents: 588c1b2
Author: Alex Rudyy <or...@apache.org>
Authored: Wed Nov 8 15:36:56 2017 +0000
Committer: Alex Rudyy <or...@apache.org>
Committed: Wed Nov 8 15:49:14 2017 +0000

----------------------------------------------------------------------
 apache-qpid-broker-j/src/main/assembly/NOTICE | 47 +++++++++++-----------
 perftests/src/main/assembly/NOTICE            | 27 ++++++++-----
 2 files changed, 40 insertions(+), 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ecb83b04/apache-qpid-broker-j/src/main/assembly/NOTICE
----------------------------------------------------------------------
diff --git a/apache-qpid-broker-j/src/main/assembly/NOTICE b/apache-qpid-broker-j/src/main/assembly/NOTICE
index 8dc6aa4..845b8dd 100644
--- a/apache-qpid-broker-j/src/main/assembly/NOTICE
+++ b/apache-qpid-broker-j/src/main/assembly/NOTICE
@@ -7,7 +7,7 @@ The Apache Software Foundation (http://www.apache.org/).
 ###############################################
 
 Apache Derby
-Copyright 2004-2014 The Apache Software Foundation
+Copyright 2004-2016 The Apache Software Foundation
 
 Portions of Derby were originally developed by
 International Business Machines Corporation and are
@@ -26,7 +26,7 @@ and are placed here unaltered.
 
 ==============================================================
  Jetty Web Container
- Copyright 1995-2014 Mort Bay Consulting Pty Ltd.
+ Copyright 1995-2017 Mort Bay Consulting Pty Ltd.
 ==============================================================
 
 The Jetty Web Container is Copyright Mort Bay Consulting Pty Ltd
@@ -57,22 +57,8 @@ granted provided that the copyright notice appears in all copies.
 
 ###############################################
 
-Geronimo Servlet Spec 3.0
-Copyright (c) 2003-2010 The Apache Software Foundation
-
-This product includes software developed by
-The W3C Consortium (http://www.w3.org/).
-
-Copyright (C) 1994-2002 World Wide Web Consortium,
-(Massachusetts Institute of Technology, Institut National
-de Recherche en Informatique et en Automatique, Keio
-University). All Rights Reserved.
-http://www.w3.org/Consortium/Legal/
-
-###############################################
-
-Apache Commons Codec
-Copyright (c) 2002-2013 The Apache Software Foundation
+GlassFish Java Servlet API 3.1.0
+Copyright (C) 2002-2017, Oracle  and/or its affiliates.
 
 ###############################################
 
@@ -87,12 +73,12 @@ Copyright (c) 2004-2015 The Apache Software Foundation
 ###############################################
 
 Jackson JSON processor
-Copyright (c) 2009-2011 FasterXML, LLC. All rights reserved
+Copyright (c) 2009-2016 FasterXML, LLC. All rights reserved
 
 ###############################################
 
 Google Core Libraries for Java
-Copyright (c) 2008-2014 The Guava Authors
+Copyright (c) 2008-2017 The Guava Authors
 
 ###############################################
 
@@ -102,14 +88,29 @@ Copyright (c) 2009-2011 Wallace Wadge
 ###############################################
 
 Dojo Toolkit
-Copyright (c) 2005-2015, The Dojo Foundation
+Copyright (c) 2005-2017, The Dojo Foundation
+
+###############################################
+
+dgrid
+Copyright (c) 2010-2016, The Dojo Foundation
+
+###############################################
+
+dstore
+Copyright (c) 2010-2016, The Dojo Foundationt)
 
 ###############################################
 
 slf4j-api
-Copyright (c) 2004-2014 QOS.ch
+Copyright (c) 2004-2017 QOS.ch
 
 ###############################################
 
 Logback
-Copyright (c) 1999-2012, QOS.ch
+Copyright (c) 1999-2017, QOS.ch
+
+###############################################
+
+Oracle Berkeley DB Java Edition
+Copyright (C) 2002-2017, Oracle  and/or its affiliates.

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ecb83b04/perftests/src/main/assembly/NOTICE
----------------------------------------------------------------------
diff --git a/perftests/src/main/assembly/NOTICE b/perftests/src/main/assembly/NOTICE
index 460de51..6c17220 100644
--- a/perftests/src/main/assembly/NOTICE
+++ b/perftests/src/main/assembly/NOTICE
@@ -1,5 +1,5 @@
 Apache Qpid Performance Tests
-Copyright 2006-2017 The Apache Software Foundation
+Copyright (c) 2006-2017 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
@@ -7,7 +7,7 @@ The Apache Software Foundation (http://www.apache.org/).
 ###############################################
 
 Apache Derby
-Copyright 2004-2014 The Apache Software Foundation
+Copyright (c) 2004-2016 The Apache Software Foundation
 
 Portions of Derby were originally developed by
 International Business Machines Corporation and are
@@ -24,25 +24,30 @@ and are placed here unaltered.
 
 ###############################################
 
-Apache Geronimo JMS 1.1 Spec
-Copyright 2003-2008 The Apache Software Foundation
-
-###############################################
-
 Jackson JSON processor
-Copyright (c) 2009-2011 FasterXML, LLC. All rights reserved
+Copyright (c) 2009-2016 FasterXML, LLC. All rights reserved
 
 ###############################################
 
 Google Core Libraries for Java
-Copyright (c) 2008-2014 The Guava Authors
+Copyright (c) 2008-2017 The Guava Authors
 
 ###############################################
 
 slf4j-api
-Copyright (c) 2004-2014 QOS.ch
+Copyright (c) 2004-2017 QOS.ch
 
 ###############################################
 
 Logback
-Copyright (c) 1999-2012, QOS.ch
+Copyright (c) 1999-2017, QOS.ch
+
+###############################################
+
+Apache HttpCore
+Copyright (c) 2005-2017 The Apache Software Foundation
+
+###############################################
+
+Apache HttpClient
+Copyright (c) 1999-2017 The Apache Software Foundation
\ No newline at end of file


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org