You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/07/19 07:39:41 UTC
[3/4] qpid-broker-j git commit: QPID-7864: Update dependency ref
w.r.t update of Google Guava dependency from 18.0 to 22.0
QPID-7864: Update dependency ref w.r.t update of Google Guava dependency from 18.0 to 22.0
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/8c18550b
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/8c18550b
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/8c18550b
Branch: refs/heads/master
Commit: 8c18550b06ec78ef0beaa01e77cf0e4339727d5c
Parents: 547399d
Author: Keith Wall <ke...@gmail.com>
Authored: Wed Jul 19 08:15:12 2017 +0100
Committer: Keith Wall <ke...@gmail.com>
Committed: Wed Jul 19 08:38:59 2017 +0100
----------------------------------------------------------------------
.../DEPENDENCIES_REFERENCE | 18 +++++++++++++++---
.../DEPENDENCIES_REFERENCE | 12 +++++++++++-
pom.xml | 4 ++--
3 files changed, 28 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/8c18550b/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 9a140ae..f6a0ac8 100644
--- a/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
+++ b/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
@@ -25,7 +25,13 @@ Apache Qpid Broker for Java
From: 'an unknown organization'
- - Guava: Google Core Libraries for Java (http://code.google.com/p/guava-libraries/guava) com.google.guava:guava:bundle:18.0
+ - FindBugs-jsr305 (http://findbugs.sourceforge.net/) com.google.code.findbugs:jsr305:jar:1.3.9
+ License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+ - error-prone annotations (http://nexus.sonatype.org/oss-repository-hosting.html/error_prone_parent/error_prone_annotations) com.google.errorprone:error_prone_annotations:jar:2.0.18
+ License: Apache 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+ - Guava: Google Core Libraries for Java (https://github.com/google/guava/guava) com.google.guava:guava:bundle:22.0
+ License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+ - J2ObjC Annotations (https://github.com/google/j2objc/) com.google.j2objc:j2objc-annotations:jar:1.1
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
@@ -38,6 +44,10 @@ 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
License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+From: 'Codehaus' (http://codehaus.org)
+ - Animal Sniffer Annotations (http://mojo.codehaus.org/animal-sniffer/animal-sniffer-annotations) org.codehaus.mojo:animal-sniffer-annotations:jar:1.14
+ License: MIT license (http://www.opensource.org/licenses/mit-license.php)
+
From: 'FasterXML' (http://fasterxml.com/)
- Jackson-annotations (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-annotations:bundle:2.8.0
License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
@@ -54,6 +64,10 @@ From: 'JolBox' (http://jolbox.com)
- BoneCP :: Core Library (http://jolbox.com/bonecp) com.jolbox:bonecp:bundle:0.7.1.RELEASE
License: Apache v2 (http://www.apache.org/licenses/LICENSE-2.0.html)
+From: 'Oracle Corporation' (http://www.oracle.com/)
+ - je com.sleepycat:je:jar:7.3.7
+
+
From: 'QOS.ch' (http://www.qos.ch)
- Logback Classic Module (http://logback.qos.ch/logback-classic) ch.qos.logback:logback-classic:jar:1.2.2
License: Eclipse Public License - v 1.0 (http://www.eclipse.org/legal/epl-v10.html) License: GNU Lesser General Public License (http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html)
@@ -136,8 +150,6 @@ From: 'Webtide' (https://webtide.com)
- Jetty :: Websocket :: Servlet Interface (http://www.eclipse.org/jetty/websocket-servlet) org.eclipse.jetty.websocket:websocket-servlet:jar:9.4.3.v20170317
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)
-From: 'Oracle Corporation' (http://www.oracle.com/)
- - je com.sleepycat:je:jar:7.3.7
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/8c18550b/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
----------------------------------------------------------------------
diff --git a/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE b/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
index 80edb6b..c6c1fd6 100644
--- a/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
+++ b/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
@@ -25,13 +25,23 @@ Apache Qpid Performance Tests
From: 'an unknown organization'
- - Guava: Google Core Libraries for Java (http://code.google.com/p/guava-libraries/guava) com.google.guava:guava:bundle:18.0
+ - FindBugs-jsr305 (http://findbugs.sourceforge.net/) com.google.code.findbugs:jsr305:jar:1.3.9
+ License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+ - error-prone annotations (http://nexus.sonatype.org/oss-repository-hosting.html/error_prone_parent/error_prone_annotations) com.google.errorprone:error_prone_annotations:jar:2.0.18
+ License: Apache 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+ - Guava: Google Core Libraries for Java (https://github.com/google/guava/guava) com.google.guava:guava:bundle:22.0
+ License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+ - J2ObjC Annotations (https://github.com/google/j2objc/) com.google.j2objc:j2objc-annotations:jar:1.1
License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
From: 'Apache Software Foundation' (http://www.apache.org)
- JMS 1.1 (http://geronimo.apache.org/specs/geronimo-jms_1.1_spec) org.apache.geronimo.specs:geronimo-jms_1.1_spec:jar:1.1.1
License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+From: 'Codehaus' (http://codehaus.org)
+ - Animal Sniffer Annotations (http://mojo.codehaus.org/animal-sniffer/animal-sniffer-annotations) org.codehaus.mojo:animal-sniffer-annotations:jar:1.14
+ License: MIT license (http://www.opensource.org/licenses/mit-license.php)
+
From: 'FasterXML' (http://fasterxml.com/)
- Jackson-annotations (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-annotations:bundle:2.8.0
License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/8c18550b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a4bb793..05f84d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1369,8 +1369,8 @@
<includedLicense>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</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>The MIT License|MIT License</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 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</licenseMerge>
<licenseMerge>Academic Free License v2.1|AFL-2.1</licenseMerge>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org