summaryrefslogtreecommitdiff
path: root/src/eclipse/test-junit
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@gmail.com>2016-04-22 10:12:19 +0200
committerLukas Rytz <lukas.rytz@gmail.com>2016-04-22 10:22:49 +0200
commit9adfb0f354a5d356bba0beb0397dd00bf0503074 (patch)
tree33547e383124af77db1720d2c1c7acbdc31f5281 /src/eclipse/test-junit
parentf55dd2084eca97c576a982473ab6701f98fb79a7 (diff)
parent23159d2842fcc64f5d3fc962b292030627b3a1a1 (diff)
downloadscala-9adfb0f354a5d356bba0beb0397dd00bf0503074.tar.gz
scala-9adfb0f354a5d356bba0beb0397dd00bf0503074.tar.bz2
scala-9adfb0f354a5d356bba0beb0397dd00bf0503074.zip
Merge commit '23159d2' into merge-2.11-to-2.12-apr-22
Diffstat (limited to 'src/eclipse/test-junit')
-rw-r--r--src/eclipse/test-junit/.classpath6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/eclipse/test-junit/.classpath b/src/eclipse/test-junit/.classpath
index 995d94aa91..881b2b79ca 100644
--- a/src/eclipse/test-junit/.classpath
+++ b/src/eclipse/test-junit/.classpath
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="test-junit"/>
+ <classpathentry kind="var" path="SCALA_BASEDIR/build/deps/asm/scala-asm-5.0.4-scala-3.jar"/>
<classpathentry kind="var" path="SCALA_BASEDIR/lib/ant/ant.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/4.11/junit-4.11.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/reflect"/>
<classpathentry combineaccessrules="false" kind="src" path="/scala-library"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/scala-compiler"/>
<classpathentry combineaccessrules="false" kind="src" path="/repl"/>
- <classpathentry kind="var" path="SCALA_BASEDIR/build/deps/asm/scala-asm-5.0.4-scala-3.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/partest-extras"/>
<classpathentry combineaccessrules="false" kind="src" path="/scaladoc"/>
- <classpathentry kind="var" path="M2_REPO/org/scala-lang/modules/scala-xml_2.12.0-M2/1.0.5/scala-xml_2.12.0-M2-1.0.5.jar"/>
+ <classpathentry kind="var" path="SCALA_BASEDIR/build/deps/scaladoc/scala-xml_2.12.0_M4-1.0.5.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="output" path="build-test-junit"/>
</classpath>