Merge pull request #797 from jeffdik/master

Fix for dependency resolution conflict: sisu-inject-plexus 1.4.3 vs. 2.2.3
This commit is contained in:
Phil Hagelberg 2012-09-29 14:30:34 -07:00
commit 7daaad27e2

View file

@ -12,7 +12,8 @@
[org.apache.maven.indexer/indexer-core "4.1.3" [org.apache.maven.indexer/indexer-core "4.1.3"
:exclusions [org.apache.maven/maven-model :exclusions [org.apache.maven/maven-model
org.sonatype.aether/aether-api org.sonatype.aether/aether-api
org.sonatype.aether/aether-util]] org.sonatype.aether/aether-util
org.sonatype.sisu/sisu-inject-plexus]]
[reply "0.1.0-beta11" :exclusions [ring/ring-core]] [reply "0.1.0-beta11" :exclusions [ring/ring-core]]
[clj-http "0.4.2"]] [clj-http "0.4.2"]]
;; checkout-deps don't work with :eval-in :leiningen ;; checkout-deps don't work with :eval-in :leiningen