diff options
| author | Paul Phillips <paulp@improving.org> | 2012-04-14 21:08:45 +0100 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-04-14 21:08:45 +0100 |
| commit | 5e29fec2d3f571757f79f21ce37f993520260850 (patch) | |
| tree | 8ddfad4cfe6af69e1519cef83450715bb435eb41 | |
| parent | 2a3cf291baf4003196c22c6bdaff987afc56c05a (diff) | |
| parent | 59bcf821eec1bbf61fd646ea3fe909083df02fba (diff) | |
| download | scala-5e29fec2d3f571757f79f21ce37f993520260850.tar.gz scala-5e29fec2d3f571757f79f21ce37f993520260850.tar.bz2 scala-5e29fec2d3f571757f79f21ce37f993520260850.zip | |
Merge branch 'master' into develop
| -rw-r--r-- | build.xml | 2 | ||||
| -rw-r--r-- | src/build/maven/scala-library-pom.xml | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -249,7 +249,7 @@ INITIALISATION <!-- Resolve maven dependencies --> <target name="init.maven.jars" depends="init.maven.tasks"> <artifact:dependencies pathId="dependency.classpath" filesetId="dependency.fileset"> - <dependency groupId="com.typesafe" artifactId="config" version="0.4.0"/> + <dependency groupId="org.skife.com.typesafe.config" artifactId="typesafe-config" version="0.3.0"/> </artifact:dependencies> </target> 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> |