summaryrefslogtreecommitdiff
path: root/qpid/java/lib
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2013-08-16 11:07:04 +0000
committerRobert Gemmell <robbie@apache.org>2013-08-16 11:07:04 +0000
commita037dbf505ed39472c1ce436faf1bece22334be1 (patch)
tree3f53235e3893d3afdf747ce751c873be306bb562 /qpid/java/lib
parent2bc8d87a2fe3e8b1140b7c3499a85527aa3a63d7 (diff)
downloadqpid-python-a037dbf505ed39472c1ce436faf1bece22334be1.tar.gz
QPID-5074: update broker binary release tar process to handle plugins with dependencies, fix issues with generated poms
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1514654 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/lib')
-rw-r--r--qpid/java/lib/poms/bonecp-0.7.1.RELEASE.xml6
-rw-r--r--qpid/java/lib/poms/guava-14.0.1.xml2
2 files changed, 7 insertions, 1 deletions
diff --git a/qpid/java/lib/poms/bonecp-0.7.1.RELEASE.xml b/qpid/java/lib/poms/bonecp-0.7.1.RELEASE.xml
index a9b7581e3e..6a9ff3d214 100644
--- a/qpid/java/lib/poms/bonecp-0.7.1.RELEASE.xml
+++ b/qpid/java/lib/poms/bonecp-0.7.1.RELEASE.xml
@@ -19,4 +19,10 @@
<groupId>com.jolbox</groupId>
<artifactId>bonecp</artifactId>
<version>0.7.1.RELEASE</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
</dep>
diff --git a/qpid/java/lib/poms/guava-14.0.1.xml b/qpid/java/lib/poms/guava-14.0.1.xml
index 9ff023bef0..79e42308c2 100644
--- a/qpid/java/lib/poms/guava-14.0.1.xml
+++ b/qpid/java/lib/poms/guava-14.0.1.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
<dep>
- <groupId>com.google</groupId>
+ <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>14.0.1</version>
</dep>