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 2020/05/28 12:14:48 UTC
[qpid-jms-amqp-0-x] branch master updated: NO-JIRA: Fix dependecy
checks
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-jms-amqp-0-x.git
The following commit(s) were added to refs/heads/master by this push:
new 9597bed NO-JIRA: Fix dependecy checks
9597bed is described below
commit 9597bed2a340666143d6b97bc8896d949289fd70
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Thu May 28 13:13:56 2020 +0100
NO-JIRA: Fix dependecy checks
---
.../main/assembly/dependency-verification/DEPENDENCIES_REFERENCE | 2 +-
pom.xml | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/apache-qpid-jms-amqp-0-x/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE b/apache-qpid-jms-amqp-0-x/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
index d7051de..112ed68 100644
--- a/apache-qpid-jms-amqp-0-x/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
+++ b/apache-qpid-jms-amqp-0-x/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
@@ -25,7 +25,7 @@ Apache Qpid JMS AMQP 0-x Bundles
From: 'QOS.ch' (http://www.qos.ch)
- - SLF4J API Module (http://www.slf4j.org) org.slf4j:slf4j-api:jar:1.7.25
+ - SLF4J API Module (http://www.slf4j.org) org.slf4j:slf4j-api:jar:1.7.30
License: MIT License (http://www.opensource.org/licenses/mit-license.php)
From: 'The Apache Software Foundation' (https://www.apache.org/)
diff --git a/pom.xml b/pom.xml
index c0c9060..5e5a3ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -531,12 +531,14 @@
<includedLicense>Eclipse Public License - Version 1.0</includedLicense>
<includedLicense>Common Public License Version 1.0</includedLicense>
<includedLicense>Academic Free License v2.1</includedLicense>
+ <includedLicense>Public Domain</includedLicense>
</includedLicenses>
<licenseMerges>
- <licenseMerge>Apache Software License, Version 2.0|The Apache Software License, Version 2.0|Apache Software License - Version 2.0|Apache v2|Apache 2|Apache License, Version 2.0</licenseMerge>
+ <licenseMerge>Apache Software License, Version 2.0|The Apache Software License, Version 2.0|Apache Software License - Version 2.0|Apache v2|Apache 2|Apache License, Version 2.0|Apache Public License 2.0</licenseMerge>
<licenseMerge>The MIT License|MIT License</licenseMerge>
- <licenseMerge>BSD License|New BSD|New BSD License|BSD-3-Clause</licenseMerge>
- <licenseMerge>Eclipse Public License - Version 1.0|Eclipse Public License - v 1.0</licenseMerge>
+ <licenseMerge>BSD License|New BSD|New BSD License|BSD-3-Clause|BSD License 3</licenseMerge>
+ <licenseMerge>Eclipse Public License - Version 1.0|Eclipse Public License - v 1.0|Eclipse Public License 1.0|Eclipse Public License, Version 1.0</licenseMerge>
+ <licenseMerge>Common Public License Version 1.0|COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</licenseMerge>
<licenseMerge>Academic Free License v2.1|AFL-2.1</licenseMerge>
</licenseMerges>
</configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org