diff options
| author | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-07-25 16:58:55 -0700 |
|---|---|---|
| committer | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-07-25 16:58:55 -0700 |
| commit | ad08f24448729009fc8d5ff0acf307a43b4cfe0a (patch) | |
| tree | d7504130003a8b26c24d3016901ea46d23f63302 | |
| parent | c3ac0ec12ee2b08917cdd0379b868a2fb12171d8 (diff) | |
| parent | d3758908f5b605159283637171ada74d54a9542b (diff) | |
| download | scala-2.10.0-M6.tar.gz scala-2.10.0-M6.tar.bz2 scala-2.10.0-M6.zip | |
Merge pull request #993 from jsuereth/fix/typesafe-config-removalv2.10.0-M6
Remove typesafe-config as dependency for library. Akka-actors will draw...
| -rw-r--r-- | build.xml | 2 | ||||
| -rw-r--r-- | src/build/maven/scala-library-pom.xml | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -280,7 +280,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="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 e8db512125..d1192b2dd8 100644 --- a/src/build/maven/scala-library-pom.xml +++ b/src/build/maven/scala-library-pom.xml @@ -31,11 +31,11 @@ <url>https://issues.scala-lang.org/</url> </issueManagement> <dependencies> - <dependency> + <!--<dependency> <groupId>com.typesafe</groupId> <artifactId>config</artifactId> <version>0.4.0</version> - </dependency> + </dependency>--> </dependencies> <distributionManagement> <repository> |