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 11:55:54 UTC
[qpid-broker-j] branch master updated (9e7a78e -> dbcfb29)
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git.
from 9e7a78e QPID-8340: [Broker-J] Upgrade mockito to version 2.28.2
new c17a63c NO-JIRA: Update license merge settings
new dbcfb29 QPID-8335: [Broker-J] Update dependency reference for BCEL
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE | 2 +-
pom.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-broker-j] 02/02: QPID-8335: [Broker-J] Update dependency
reference for BCEL
Posted by or...@apache.org.
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-broker-j.git
commit dbcfb29c19d1321bf29533583d0210a32762176c
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Tue Jul 9 12:53:52 2019 +0100
QPID-8335: [Broker-J] Update dependency reference for BCEL
---
.../src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE b/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
index c1f1f2f..db8aafd 100644
--- a/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
+++ b/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
@@ -65,7 +65,7 @@ From: 'QOS.ch' (http://www.qos.ch)
License: MIT License (http://www.opensource.org/licenses/mit-license.php)
From: 'The Apache Software Foundation' (http://www.apache.org/)
- - Apache Commons BCEL (http://commons.apache.org/proper/commons-bcel) org.apache.bcel:bcel:jar:6.2
+ - Apache Commons BCEL (http://commons.apache.org/proper/commons-bcel) org.apache.bcel:bcel:jar:6.3.1
License: Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
From: 'The Apache Software Foundation' (https://www.apache.org/)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-broker-j] 01/02: NO-JIRA: Update license merge settings
Posted by or...@apache.org.
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-broker-j.git
commit c17a63cb9c6902131f6cb12ad807cdc04681b701
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Tue Jul 9 12:52:02 2019 +0100
NO-JIRA: Update license merge settings
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9220aaf..0cd07df 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