diff options
| author | Kim van der Riet <kpvdr@apache.org> | 2013-09-20 18:59:30 +0000 |
|---|---|---|
| committer | Kim van der Riet <kpvdr@apache.org> | 2013-09-20 18:59:30 +0000 |
| commit | c70bf3ea28cdf6bafd8571690d3e5c466a0658a2 (patch) | |
| tree | 68b24940e433f3f9c278b054d9ea1622389bd332 /qpid/java/lib/poms | |
| parent | fcdf1723c7b5cdf0772054a93edb6e7d97c4bb1e (diff) | |
| download | qpid-python-c70bf3ea28cdf6bafd8571690d3e5c466a0658a2.tar.gz | |
QPID-4984: WIP - Merge from trunk r.1525056
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/linearstore@1525101 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/lib/poms')
| -rw-r--r-- | qpid/java/lib/poms/bonecp-0.7.1.RELEASE.xml | 6 | ||||
| -rw-r--r-- | qpid/java/lib/poms/guava-14.0.1.xml | 2 | ||||
| -rw-r--r-- | qpid/java/lib/poms/je-5.0.84.xml (renamed from qpid/java/lib/poms/je-5.0.73.xml) | 2 |
3 files changed, 8 insertions, 2 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> diff --git a/qpid/java/lib/poms/je-5.0.73.xml b/qpid/java/lib/poms/je-5.0.84.xml index d55c4ec14f..7a556bbe1c 100644 --- a/qpid/java/lib/poms/je-5.0.73.xml +++ b/qpid/java/lib/poms/je-5.0.84.xml @@ -18,5 +18,5 @@ <dep> <groupId>com.sleepycat</groupId> <artifactId>je</artifactId> - <version>5.0.73</version> + <version>5.0.84</version> </dep> |