You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by va...@apache.org on 2022/11/11 12:54:48 UTC

[qpid-broker-j] branch main updated: QPID-8580: [Broker-J] Removed logback tests jar and added ASM license (#163)

This is an automated email from the ASF dual-hosted git repository.

vavrtom pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git


The following commit(s) were added to refs/heads/main by this push:
     new 0feef63043 QPID-8580: [Broker-J] Removed logback tests jar and added ASM license (#163)
0feef63043 is described below

commit 0feef630437417a0e909f99b387ed3b93bffae75
Author: vavrtom <va...@gmail.com>
AuthorDate: Fri Nov 11 13:54:43 2022 +0100

    QPID-8580: [Broker-J] Removed logback tests jar and added ASM license (#163)
---
 apache-qpid-broker-j/src/main/assembly/LICENSE | 35 ++++++++++++++++++++++++--
 pom.xml                                        | 12 +++++++++
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/apache-qpid-broker-j/src/main/assembly/LICENSE b/apache-qpid-broker-j/src/main/assembly/LICENSE
index c2216246a2..77f9b06487 100644
--- a/apache-qpid-broker-j/src/main/assembly/LICENSE
+++ b/apache-qpid-broker-j/src/main/assembly/LICENSE
@@ -300,8 +300,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ###############################################
 
-This product bundles the logback-core and logback-classic jars which are under
-the "Eclipse Public License - v 1.0":
+This product bundles the logback-core, logback-core-db, logback-classic and
+logback-classic-db jars which are under the "Eclipse Public License - v 1.0":
 
 Logback: the reliable, generic, fast and flexible logging framework.
 Copyright (C) 1999-2012, QOS.ch. All rights reserved.
@@ -544,3 +544,34 @@ the intellectual property laws of the United States of America. No
 party to this Agreement will bring a legal action under this Agreement
 more than one year after the cause of action arose. Each party waives
 its rights to a jury trial in any resulting litigation.
+
+###############################################
+
+This product bundles the asm and asm-tree jars which are under
+the "3-Clause BSD License":
+
+ASM: a very small and fast Java bytecode manipulation framework
+Copyright (c) 2000-2011 INRIA, France Telecom
+All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. Neither the name of the copyright holders nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/pom.xml b/pom.xml
index a9664506d2..fecd47e6e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -549,11 +549,23 @@
         <groupId>ch.qos.logback.db</groupId>
         <artifactId>logback-core-db</artifactId>
         <version>${logback-db-version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>ch.qos.logback.db</groupId>
         <artifactId>logback-classic-db</artifactId>
         <version>${logback-db-version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>com.google.guava</groupId>


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