summaryrefslogtreecommitdiff
path: root/src/build/maven/scala-library-pom.xml
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-04-14 21:08:45 +0100
committerPaul Phillips <paulp@improving.org>2012-04-14 21:08:45 +0100
commit5e29fec2d3f571757f79f21ce37f993520260850 (patch)
tree8ddfad4cfe6af69e1519cef83450715bb435eb41 /src/build/maven/scala-library-pom.xml
parent2a3cf291baf4003196c22c6bdaff987afc56c05a (diff)
parent59bcf821eec1bbf61fd646ea3fe909083df02fba (diff)
downloadscala-5e29fec2d3f571757f79f21ce37f993520260850.tar.gz
scala-5e29fec2d3f571757f79f21ce37f993520260850.tar.bz2
scala-5e29fec2d3f571757f79f21ce37f993520260850.zip
Merge branch 'master' into develop
Diffstat (limited to 'src/build/maven/scala-library-pom.xml')
-rw-r--r--src/build/maven/scala-library-pom.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/build/maven/scala-library-pom.xml b/src/build/maven/scala-library-pom.xml
index e8db512125..c3f8a4531c 100644
--- a/src/build/maven/scala-library-pom.xml
+++ b/src/build/maven/scala-library-pom.xml
@@ -32,9 +32,9 @@
</issueManagement>
<dependencies>
<dependency>
- <groupId>com.typesafe</groupId>
- <artifactId>config</artifactId>
- <version>0.4.0</version>
+ <groupId>org.skife.com.typesafe.config</groupId>
+ <artifactId>typesafe-config</artifactId>
+ <version>0.3.0</version>
</dependency>
</dependencies>
<distributionManagement>