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 9732327a5a NO-JIRA: Fixed license issues
9732327a5a is described below
commit 9732327a5ac74af8000a96f693789909247a58e5
Author: Tomas Vavricka <[email protected]>
AuthorDate: Fri Aug 11 14:38:16 2023 +0200
NO-JIRA: Fixed license issues
---
apache-qpid-broker-j/src/main/assembly/LICENSE | 23 +++++++++++++++++++++++
apache-qpid-broker-j/src/main/assembly/NOTICE | 10 ++++++++++
pom.xml | 2 +-
3 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/apache-qpid-broker-j/src/main/assembly/LICENSE
b/apache-qpid-broker-j/src/main/assembly/LICENSE
index 77f9b06487..8b60789871 100644
--- a/apache-qpid-broker-j/src/main/assembly/LICENSE
+++ b/apache-qpid-broker-j/src/main/assembly/LICENSE
@@ -575,3 +575,26 @@ 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.
+
+###############################################
+
+This product bundles the bcpkix-jdk18on, bcprov-jdk18on and bcutil-jdk18on jars
+which are under the MIT License:
+
+Copyright (c) 2000-2023 The Legion of the Bouncy Castle Inc.
(https://www.bouncycastle.org)
+
+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.
diff --git a/apache-qpid-broker-j/src/main/assembly/NOTICE
b/apache-qpid-broker-j/src/main/assembly/NOTICE
index 044c9aaff4..c6d9b06497 100644
--- a/apache-qpid-broker-j/src/main/assembly/NOTICE
+++ b/apache-qpid-broker-j/src/main/assembly/NOTICE
@@ -114,3 +114,13 @@ Copyright (c) 1999-2017, QOS.ch
Oracle Berkeley DB Java Edition
Copyright (C) 2002-2017, Oracle and/or its affiliates.
+
+###############################################
+
+Bouncy Castle
+Copyright (c) 2000 - 2023 The Legion of the Bouncy Castle Inc.
(https://www.bouncycastle.org)
+
+###############################################
+
+Prometheus
+Copyright 2012-2015 The Prometheus Authors
diff --git a/pom.xml b/pom.xml
index f540e486c1..247ee30fc1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1694,7 +1694,7 @@
<licenseMerge>Eclipse Public License - Version 1.0|Eclipse
Public License - v 1.0|Eclipse Public License, Version 1.0|Eclipse Public
License 1.0|MPL 2.0 or EPL 1.0</licenseMerge>
<licenseMerge>Eclipse Public License - Version 2.0|Eclipse
Public License - v 2.0|Eclipse Public License, Version 2.0|Eclipse Public
License 2.0|Eclipse Public License v2.0|MPL 2.0 or EPL 2.0|EPL
2.0</licenseMerge>
<licenseMerge>Academic Free License v2.1|AFL-2.1</licenseMerge>
- <licenseMerge>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE
(CDDL) Version 1.0|CDDL + GPLv2 with classpath exception|GPL2 w/
CPE</licenseMerge>
+ <licenseMerge>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE
(CDDL) Version 1.0|CDDL + GPLv2 with classpath exception</licenseMerge>
</licenseMerges>
</configuration>
<executions>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
