diff options
| author | Paul Phillips <paulp@improving.org> | 2012-04-14 16:13:22 +0100 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-04-14 16:13:22 +0100 |
| commit | ef809bb11c12a237d4d360b144426a3b4daa5c7f (patch) | |
| tree | 259433053a3342db300c07256e8bb06435edf39b | |
| parent | 9b50dc0dc2c11990e88a8de045dd6e92a409a0cf (diff) | |
| parent | f67a00a3cef270835369b8ab1bb57cbe8b2bd2a3 (diff) | |
| download | scala-ef809bb11c12a237d4d360b144426a3b4daa5c7f.tar.gz scala-ef809bb11c12a237d4d360b144426a3b4daa5c7f.tar.bz2 scala-ef809bb11c12a237d4d360b144426a3b4daa5c7f.zip | |
Merge commit 'refs/pull/398/head' 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="org.skife.com.typesafe.config" artifactId="typesafe-config" version="0.3.0"/> + <dependency groupId="com.typesafe" artifactId="config" version="0.4.0"/> </artifact:dependencies> </target> diff --git a/src/build/maven/scala-library-pom.xml b/src/build/maven/scala-library-pom.xml index c3f8a4531c..e8db512125 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>org.skife.com.typesafe.config</groupId> - <artifactId>typesafe-config</artifactId> - <version>0.3.0</version> + <groupId>com.typesafe</groupId> + <artifactId>config</artifactId> + <version>0.4.0</version> </dependency> </dependencies> <distributionManagement> |