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 2019/07/09 12:00:55 UTC
[qpid-broker-j] branch 7.1.x updated: NO-JIRA: Update license merge
settings
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/7.1.x by this push:
new 96c28ea NO-JIRA: Update license merge settings
96c28ea is described below
commit 96c28eaff15c9802ce92a2e3c020ebd0de73d927
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Tue Jul 9 12:52:02 2019 +0100
NO-JIRA: Update license merge settings
(cherry picked from commit c17a63cb9c6902131f6cb12ad807cdc04681b701)
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7529330..88a5748 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1423,8 +1423,8 @@
<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|Apache 2.0|Apache Public License 2.0</licenseMerge>
<licenseMerge>The MIT License|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|Eclipse Public License, Version 1.0</licenseMerge>
+ <licenseMerge>BSD License|New BSD|New BSD License|BSD 3-Clause|BSD Licence 3</licenseMerge>
+ <licenseMerge>Eclipse Public License - Version 1.0|Eclipse Public License - v 1.0|Eclipse Public License, Version 1.0|Eclipse Public License 1.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</licenseMerge>
</licenseMerges>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org