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 2016/10/24 11:46:11 UTC
svn commit: r1766388 - in /qpid/java/trunk: ./
broker/src/main/assembly/dependency-verification/
client/src/main/assembly/dependency-verification/
perftests/src/main/assembly/dependency-verification/
Author: orudyy
Date: Mon Oct 24 11:46:11 2016
New Revision: 1766388
URL: http://svn.apache.org/viewvc?rev=1766388&view=rev
Log:
NO-JIRA: Update dependency check references and merge license names to fix dependency check
Modified:
qpid/java/trunk/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
qpid/java/trunk/client/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
qpid/java/trunk/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
qpid/java/trunk/pom.xml
Modified: qpid/java/trunk/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE?rev=1766388&r1=1766387&r2=1766388&view=diff
==============================================================================
--- qpid/java/trunk/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE (original)
+++ qpid/java/trunk/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE Mon Oct 24 11:46:11 2016
@@ -21,6 +21,7 @@
# TRIMMED 3RD PARTY DEPENDENCY INFORMATION FOR MODIFICATION CHECKS
#// ------------------------------------------------------------------
+Apache Qpid Broker for Java
From: 'an unknown organization'
@@ -28,6 +29,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)
From: 'Apache Software Foundation' (http://db.apache.org/)
- Apache Derby Database Engine and Embedded JDBC Driver (http://db.apache.org/derby/derby/) org.apache.derby:derby:jar:10.11.1.1
@@ -46,6 +51,8 @@ From: 'JolBox' (http://jolbox.com)
License: Apache v2 (http://www.apache.org/licenses/LICENSE-2.0.html)
From: 'Mort Bay Consulting' (http://www.mortbay.com)
+ - Jetty :: Asynchronous HTTP Client (http://www.eclipse.org/jetty) org.eclipse.jetty:jetty-client:jar:8.1.17.v20150415
+ License: Apache Software License - Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) License: Eclipse Public License - Version 1.0 (http://www.eclipse.org/org/documents/epl-v10.php)
- Jetty :: Continuation (http://www.eclipse.org/jetty) org.eclipse.jetty:jetty-continuation:jar:8.1.17.v20150415
License: Apache Software License - Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) License: Eclipse Public License - Version 1.0 (http://www.eclipse.org/org/documents/epl-v10.php)
- Jetty :: Http Utility (http://www.eclipse.org/jetty) org.eclipse.jetty:jetty-http:jar:8.1.17.v20150415
@@ -58,6 +65,8 @@ From: 'Mort Bay Consulting' (http://www.
License: Apache Software License - Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) License: Eclipse Public License - Version 1.0 (http://www.eclipse.org/org/documents/epl-v10.php)
- Jetty :: Servlet Handling (http://www.eclipse.org/jetty) org.eclipse.jetty:jetty-servlet:jar:8.1.17.v20150415
License: Apache Software License - Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) License: Eclipse Public License - Version 1.0 (http://www.eclipse.org/org/documents/epl-v10.php)
+ - Jetty :: Utility Servlets and Filters (http://www.eclipse.org/jetty) org.eclipse.jetty:jetty-servlets:jar:8.1.17.v20150415
+ License: Apache Software License - Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) License: Eclipse Public License - Version 1.0 (http://www.eclipse.org/org/documents/epl-v10.php)
- Jetty :: Utilities (http://www.eclipse.org/jetty) org.eclipse.jetty:jetty-util:jar:8.1.17.v20150415
License: Apache Software License - Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) License: Eclipse Public License - Version 1.0 (http://www.eclipse.org/org/documents/epl-v10.php)
- Jetty :: Websocket (http://www.eclipse.org/jetty) org.eclipse.jetty:jetty-websocket:jar:8.1.17.v20150415
@@ -102,15 +111,15 @@ From: 'The Apache Software Foundation' (
License: Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- Apache Qpid JDBC Message Store Broker Plug-in (http://qpid.apache.org/components/broker-plugins/qpid-broker-plugins-jdbc-store) org.apache.qpid:qpid-broker-plugins-jdbc-store:jar
License: Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+ - Apache Qpid LogBack Logging Broker Plug-in (http://qpid.apache.org/components/broker-plugins/qpid-broker-plugins-logging-logback) org.apache.qpid:qpid-broker-plugins-logging-logback:jar
+ License: Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- Apache Qpid HTTP Management Broker Plug-in (http://qpid.apache.org/components/broker-plugins/qpid-broker-plugins-management-http) org.apache.qpid:qpid-broker-plugins-management-http:jar
License: Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- Apache Qpid Memory Message Store Broker Plug-in (http://qpid.apache.org/components/broker-plugins/qpid-broker-plugins-memory-store) org.apache.qpid:qpid-broker-plugins-memory-store:jar
License: Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- Apache Qpid WebSocket Broker Plug-in (http://qpid.apache.org/components/broker-plugins/qpid-broker-plugins-websocket) org.apache.qpid:qpid-broker-plugins-websocket:jar
License: Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- - Apache Qpid Common (http://qpid.apache.org/components/management/qpid-common) org.apache.qpid:qpid-common:jar
- License: Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- - Apache Qpid Management Common (http://qpid.apache.org/components/management/qpid-management-common) org.apache.qpid:qpid-management-common:jar
+ - Apache Qpid Common (http://qpid.apache.org/components/qpid-common) org.apache.qpid:qpid-common:jar
License: Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
From: 'The Dojo Foundation' (http://dojotoolkit.org/foundation)
Modified: qpid/java/trunk/client/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE?rev=1766388&r1=1766387&r2=1766388&view=diff
==============================================================================
--- qpid/java/trunk/client/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE (original)
+++ qpid/java/trunk/client/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE Mon Oct 24 11:46:11 2016
@@ -21,6 +21,7 @@
# TRIMMED 3RD PARTY DEPENDENCY INFORMATION FOR MODIFICATION CHECKS
#// ------------------------------------------------------------------
+Apache Qpid JMS Client for AMQP 0-9-1/0-10
From: 'QOS.ch' (http://www.qos.ch)
@@ -28,7 +29,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 Qpid Common (http://qpid.apache.org/components/management/qpid-common) org.apache.qpid:qpid-common:jar
+ - Apache Qpid Common (http://qpid.apache.org/components/qpid-common) org.apache.qpid:qpid-common:jar
License: Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
Modified: qpid/java/trunk/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE?rev=1766388&r1=1766387&r2=1766388&view=diff
==============================================================================
--- qpid/java/trunk/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE (original)
+++ qpid/java/trunk/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE Mon Oct 24 11:46:11 2016
@@ -21,6 +21,7 @@
# TRIMMED 3RD PARTY DEPENDENCY INFORMATION FOR MODIFICATION CHECKS
#// ------------------------------------------------------------------
+Apache Qpid Performance Tests
From: 'an unknown organization'
@@ -44,9 +45,17 @@ 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 Codec (http://commons.apache.org/proper/commons-codec/) commons-codec:commons-codec:jar:1.9
+ License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+ - Apache Commons Logging (http://commons.apache.org/proper/commons-logging/) commons-logging:commons-logging:jar:1.2
+ License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+ - Apache HttpClient (http://hc.apache.org/httpcomponents-client) org.apache.httpcomponents:httpclient:jar:4.4
+ License: Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+ - Apache HttpCore (http://hc.apache.org/httpcomponents-core-ga) org.apache.httpcomponents:httpcore:jar:4.4
+ License: Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- Apache Qpid JMS Client for AMQP 0-9-1/0-10 (http://qpid.apache.org/components/qpid-client) org.apache.qpid:qpid-client:jar
License: Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- - Apache Qpid Common (http://qpid.apache.org/components/management/qpid-common) org.apache.qpid:qpid-common:jar
+ - Apache Qpid Common (http://qpid.apache.org/components/qpid-common) org.apache.qpid:qpid-common:jar
License: Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
Modified: qpid/java/trunk/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/pom.xml?rev=1766388&r1=1766387&r2=1766388&view=diff
==============================================================================
--- qpid/java/trunk/pom.xml (original)
+++ qpid/java/trunk/pom.xml Mon Oct 24 11:46:11 2016
@@ -941,8 +941,9 @@
<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>The MIT License|MIT License</licenseMerge>
- <licenseMerge>BSD License|New BSD|New BSD 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>Academic Free License v2.1|AFL-2.1</licenseMerge>
</licenseMerges>
</configuration>
<executions>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org