Permalink
Browse files

Bump cheshire, slingshot, and pomegranate deps.

  • Loading branch information...
1 parent d54f826 commit 3816f67861d4bffeb87aca776b705b3dfb2cb6d5 @technomancy committed Mar 19, 2013
Showing with 50 additions and 21 deletions.
  1. +45 −16 leiningen-core/pom.xml
  2. +1 −3 leiningen-core/project.clj
  3. +4 −2 project.clj
View
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>leiningen-core</groupId>
<artifactId>leiningen-core</artifactId>
+ <packaging>jar</packaging>
<version>2.1.0-SNAPSHOT</version>
<name>leiningen-core</name>
<description>Library for core functionality of Leiningen.</description>
@@ -14,32 +14,67 @@
<url>http://www.eclipse.org/legal/epl-v10.html</url>
</license>
</licenses>
+ <scm>
+ <connection>scm:git:git://github.com/technomancy/leiningen.git</connection>
+ <developerConnection>scm:git:ssh://git@github.com/technomancy/leiningen.git</developerConnection>
+ <tag>af3235cf8573c88ac354d8ac3307cc5f87855049</tag>
+ <url>https://github.com/technomancy/leiningen</url>
+ </scm>
<build>
<sourceDirectory>src</sourceDirectory>
<testSourceDirectory>test</testSourceDirectory>
<resources>
<resource>
+ <directory>dev-resources</directory>
+ </resource>
+ <resource>
<directory>resources</directory>
</resource>
</resources>
<testResources>
<testResource>
<directory>dev-resources</directory>
</testResource>
+ <testResource>
+ <directory>dev-resources</directory>
+ </testResource>
+ <testResource>
+ <directory>resources</directory>
+ </testResource>
</testResources>
+ <directory>target</directory>
+ <outputDirectory>target/classes</outputDirectory>
</build>
<repositories>
<repository>
<id>central</id>
- <url>http://repo1.maven.org/maven2</url>
+ <url>http://repo1.maven.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
</repository>
<repository>
<id>clojars</id>
- <url>http://clojars.org/repo/</url>
+ <url>https://clojars.org/repo/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
</repository>
<repository>
<id>sonatype</id>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
</repository>
</repositories>
<dependencies>
@@ -71,24 +106,18 @@
<dependency>
<groupId>com.cemerick</groupId>
<artifactId>pomegranate</artifactId>
- <version>0.0.14-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>dynapath</artifactId>
- <groupId>org.tcrawley</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.tcrawley</groupId>
- <artifactId>dynapath</artifactId>
- <version>0.2.3</version>
+ <version>0.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http</artifactId>
<version>2.4</version>
</dependency>
+ <dependency>
+ <groupId>com.hypirion</groupId>
+ <artifactId>io</artifactId>
+ <version>0.2.0-RC1</version>
+ </dependency>
</dependencies>
</project>
@@ -8,9 +8,7 @@
[classlojure "0.6.6"]
[useful "0.8.6"]
[robert/hooke "1.3.0"]
- [com.cemerick/pomegranate "0.0.14-SNAPSHOT" :exclusions [org.tcrawley/dynapath]]
- ;; depend on this directly until pomegranate upgrades
- [org.tcrawley/dynapath "0.2.3"]
+ [com.cemerick/pomegranate "0.2.0"]
[org.apache.maven.wagon/wagon-http "2.4"]
[com.hypirion/io "0.2.0-RC1"]]
;; until the pomegratate snapshot is released:
View
@@ -16,8 +16,10 @@
org.sonatype.aether/aether-util
org.sonatype.sisu/sisu-inject-plexus]]
[reply "0.1.10" :exclusions [ring/ring-core]]
- ;; drawbridge specifies an ancient version here, so bump it
- [clj-http "0.6.5" :exclusions [crouton cheshire]]]
+ ;; bump versions of various common transitive deps
+ [slingshot "0.10.3"]
+ [cheshire "5.0.2"]
+ [clj-http "0.6.5" :exclusions [crouton]]]
;; checkout-deps don't work with :eval-in :leiningen
:profiles {:dev {:resource-paths ["leiningen-core/dev-resources"]
:test-paths ["leiningen-core/test"]}

0 comments on commit 3816f67

Please sign in to comment.