Repository: jclouds Updated Branches: refs/heads/update-PR-841 730d24478 -> c9195594e
Looks like the duplicate-finder exception is needed after all. Ah, well ;-) Follow-up to 730d24478 Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/c9195594 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/c9195594 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/c9195594 Branch: refs/heads/update-PR-841 Commit: c9195594eaf81fb2fdb940163145c784fdbee4fe Parents: 730d244 Author: Andrew Phillips <[email protected]> Authored: Tue Aug 11 13:05:49 2015 -0400 Committer: Andrew Phillips <[email protected]> Committed: Tue Aug 11 13:05:49 2015 -0400 ---------------------------------------------------------------------- project/pom.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/c9195594/project/pom.xml ---------------------------------------------------------------------- diff --git a/project/pom.xml b/project/pom.xml index 560c2ae..095f800 100644 --- a/project/pom.xml +++ b/project/pom.xml @@ -572,6 +572,23 @@ <package>com.google</package> </packages> </exception> + <exception> + <conflictingDependencies> + <dependency> + <groupId>com.jcraft</groupId> + <artifactId>jsch.agentproxy.core</artifactId> + <version>0.0.9</version> + </dependency> + <dependency> + <groupId>com.jcraft</groupId> + <artifactId>jsch.agentproxy.connector-factory</artifactId> + <version>0.0.9</version> + </dependency> + </conflictingDependencies> + <packages> + <package>com.jcraft.jsch.agentproxy</package> + </packages> + </exception> </exceptions> <ignoredResources> <!-- For all the jetty packages -->
