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 2017/09/26 08:24:55 UTC
qpid-broker-j git commit: QPID-7917: [Java Broker][WMC] Update
dependency references and license merges
Repository: qpid-broker-j
Updated Branches:
refs/heads/master 82fef6cdc -> 3f5138a34
QPID-7917: [Java Broker][WMC] Update dependency references and license merges
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/3f5138a3
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/3f5138a3
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/3f5138a3
Branch: refs/heads/master
Commit: 3f5138a34cc17de102a75ba70ac2021eb3375358
Parents: 82fef6c
Author: Alex Rudyy <or...@apache.org>
Authored: Tue Sep 26 09:24:47 2017 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Tue Sep 26 09:24:47 2017 +0100
----------------------------------------------------------------------
.../assembly/dependency-verification/DEPENDENCIES_REFERENCE | 8 ++++----
pom.xml | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/3f5138a3/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
----------------------------------------------------------------------
diff --git a/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE b/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
index e2ce915..b943597 100644
--- a/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
+++ b/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
@@ -31,10 +31,10 @@ From: 'an unknown organization'
License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- bcel org.apache.bcel:bcel:jar:5.2
- - dgrid (http://webjars.org) org.webjars.bower:dgrid:jar:1.0.0
- License: BSD-3-Clause (https://spdx.org/licenses/BSD-3-Clause#licenseText)
- - dstore (http://webjars.org) org.webjars.bower:dstore:jar:1.1.1
- License: AFL-2.1 (https://spdx.org/licenses/AFL-2.1#licenseText) License: BSD-3-Clause (https://spdx.org/licenses/BSD-3-Clause#licenseText)
+ - dgrid (http://webjars.org) org.webjars.bower:dgrid:jar:1.2.1
+ License: BSD 3-Clause (https://spdx.org/licenses/BSD 3-Clause#licenseText)
+ - dstore (http://webjars.org) org.webjars.bower:dstore:jar:1.1.2
+ License: BSD 3-Clause (https://spdx.org/licenses/BSD 3-Clause#licenseText)
From: 'Apache Software Foundation' (http://db.apache.org/)
- Apache Derby Database Engine and Embedded JDBC Driver (http://db.apache.org/derby/) org.apache.derby:derby:jar:10.13.1.1
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/3f5138a3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c33b3f6..09905c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1443,7 +1443,7 @@
<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>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>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>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org