diff options
Diffstat (limited to 'dev-lang/scala/files/scala-2.10.2-maven-deps.patch')
| -rw-r--r-- | dev-lang/scala/files/scala-2.10.2-maven-deps.patch | 70 |
1 files changed, 0 insertions, 70 deletions
diff --git a/dev-lang/scala/files/scala-2.10.2-maven-deps.patch b/dev-lang/scala/files/scala-2.10.2-maven-deps.patch deleted file mode 100644 index 133a2a4f7576..000000000000 --- a/dev-lang/scala/files/scala-2.10.2-maven-deps.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- scala-2.10.2-orig/build.xml 2013-05-31 00:44:27.000000000 +1000 -+++ scala-2.10.2/build.xml 2013-08-30 22:48:11.727055000 +1000 -@@ -202,30 +202,19 @@ - on repeated use of artifact:dependencies - --> - <if><not><isset property="maven-deps-done"></isset></not><then> -- <mkdir dir="${user.home}/.m2/repository"/> -- <!-- This task has an issue where if the user directory does not exist, so we create it above. UGH. --> -- <artifact:dependencies pathId="extra.tasks.classpath" filesetId="extra.tasks.fileset"> -- <dependency groupId="biz.aQute" artifactId="bnd" version="1.50.0"/> -- </artifact:dependencies> -+ <path id="extra.tasks.classpath"> -+ <pathelement path="BNDLIB_CLASSPATH"></pathelement> -+ </path> - - <!-- Pax runner --> -- <property name="pax.exam.version" value="2.5.0"/> -- <artifact:dependencies pathId="pax.exam.classpath" filesetId="pax.exam.fileset"> -- <dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-container-native" version="${pax.exam.version}"/> -- <dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-junit4" version="${pax.exam.version}"/> -- <dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-link-assembly" version="${pax.exam.version}"/> -- <dependency groupId="org.ops4j.pax.url" artifactId="pax-url-aether" version="1.4.0"/> -- <dependency groupId="org.ops4j.pax.swissbox" artifactId="pax-swissbox-framework" version="1.5.1"/> -- <dependency groupId="ch.qos.logback" artifactId="logback-core" version="0.9.20"/> -- <dependency groupId="ch.qos.logback" artifactId="logback-classic" version="0.9.20"/> -- <dependency groupId="junit" artifactId="junit" version="4.10"/> -- <dependency groupId="org.apache.felix" artifactId="org.apache.felix.framework" version="3.2.2"/> -- </artifact:dependencies> -- -- <artifact:dependencies pathId="partest.extras.classpath" filesetId="partest.extras.fileset" versionsId="partest.extras.versions"> -- <dependency groupId="com.googlecode.java-diff-utils" artifactId="diffutils" version="1.3.0"/> -- </artifact:dependencies> -- -+ <path id="pax.exam.classpath"> -+ <pathelement path="PAX_RUNNER_CLASSPATH"></pathelement> -+ </path> -+ -+ <path id="partest.extras.classpath"> -+ <pathelement path="DIFFUTILS_CLASSPATH"></pathelement> -+ </path> -+ <property name="partest.extras.versions" value="1.3.0"></property> - <!-- BND support --> - <typedef resource="aQute/bnd/ant/taskdef.properties" classpathref="extra.tasks.classpath" /> - -@@ -1247,10 +1236,8 @@ - <!-- depend on quick.done so quick.bin is run when pack.done is --> - <target name="pack.done" depends="quick.done, pack.bin"> - <!-- copy dependencies to build/pack/lib, it only takes a second so don't bother with uptodate checks --> -- <copy todir="${build-pack.dir}/lib"> -- <resources refid="partest.extras.fileset"/> -- <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" -- from="${partest.extras.versions}" to="flatten"/> -+ <copy todir="${build-pack.dir}/lib" flatten="true"> -+ <path><path refid="partest.extras.classpath"/></path> - </copy> - - <taskdef resource="scala/tools/ant/antlib.xml" classpathref="pack.compiler.path"/> -@@ -1769,10 +1756,8 @@ - </fileset> - </copy> - -- <copy todir="${dist.dir}/lib"> -- <resources refid="partest.extras.fileset"/> -- <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" -- from="${partest.extras.versions}" to="flatten"/> -+ <copy todir="${dist.dir}/lib" flatten="true"> -+ <path><path refid="partest.extras.classpath"/></path> - </copy> - - <mkdir dir="${dist.dir}/bin"/> |