1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
Description: Fetch the dependencies from /usr/share/maven-repo instead of Maven Central
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
@@ -224,7 +224,7 @@
</touch>
</target>
- <target name="init.git" depends="boot">
+ <target name="init.git">
<!-- replacestarr needs git.commit.sha, but doesn't want to run the init target (it computes maven.version.number) -->
<exec osfamily="unix" executable="tools/get-scala-commit-sha" outputproperty="git.commit.sha" failifexecutionfails="false" />
<exec osfamily="windows" executable="cmd.exe" outputproperty="git.commit.sha" failifexecutionfails="false">
@@ -272,16 +272,19 @@
<!-- 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">
+ <remoteRepository id="central" url="file:///usr/share/maven-repo"/>
<dependency groupId="biz.aQute" artifactId="bnd" version="1.50.0"/>
</artifact:dependencies>
<artifact:dependencies pathId="jarjar.classpath">
+ <remoteRepository id="central" url="file:///usr/share/maven-repo"/>
<dependency groupId="com.googlecode.jarjar" artifactId="jarjar" version="1.3"/>
</artifact:dependencies>
<!-- JUnit -->
<property name="junit.version" value="4.11"/>
<artifact:dependencies pathId="junit.classpath" filesetId="junit.fileset">
+ <remoteRepository id="central" url="file:///usr/share/maven-repo"/>
<dependency groupId="junit" artifactId="junit" version="${junit.version}"/>
</artifact:dependencies>
<copy-deps project="junit"/>
@@ -345,6 +348,7 @@
<prepareCross name="scalacheck"/>
<artifact:dependencies pathId="asm.classpath" filesetId="asm.fileset">
+ <remoteRepository id="central" url="file:///usr/share/maven-repo"/>
<dependency groupId="org.scala-lang.modules" artifactId="scala-asm" version="${scala-asm.version}"/>
</artifact:dependencies>
<copy-deps project="asm"/>
@@ -358,6 +362,7 @@
</artifact:dependencies>
<artifact:dependencies pathId="repl.deps.classpath" filesetId="repl.fileset" versionsId="repl.deps.versions">
+ <remoteRepository id="central" url="file:///usr/share/maven-repo"/>
<dependency groupId="jline" artifactId="jline" version="${jline.version}"/>
</artifact:dependencies>
<copy-deps project="repl"/>
@@ -365,12 +370,14 @@
<!-- used by the test.osgi target to create osgi bundles for the xml, parser-combinator jars
must specify sourcesFilesetId, javadocFilesetId to download these types of artifacts -->
<artifact:dependencies pathId="external-modules.deps.classpath" sourcesFilesetId="external-modules.sources.fileset" javadocFilesetId="external-modules.javadoc.fileset">
- <artifact:remoteRepository refid="extra-repo"/>
+ <remoteRepository id="central" url="file:///usr/share/maven-repo"/>
<dependency groupId="org.scala-lang.modules" artifactId="scala-xml${scala-xml.cross}" version="${scala-xml.version.number}"/>
<dependency groupId="org.scala-lang.modules" artifactId="scala-parser-combinators${scala-parser-combinators.cross}" version="${scala-parser-combinators.version.number}"/>
+<!--
<dependency groupId="org.scala-lang.plugins" artifactId="scala-continuations-plugin${scala-continuations-plugin.cross}" version="${scala-continuations-plugin.version.number}"/>
<dependency groupId="org.scala-lang.plugins" artifactId="scala-continuations-library${scala-continuations-library.cross}" version="${scala-continuations-library.version.number}"/>
<dependency groupId="org.scala-lang.modules" artifactId="scala-swing${scala-swing.cross}" version="${scala-swing.version.number}"/>
+-->
</artifact:dependencies>
<!-- External modules, excluding the core -->
@@ -397,7 +404,8 @@
<echo message="Using Scala ${starr.version} for STARR."/>
<artifact:dependencies pathId="starr.compiler.path" filesetId="starr.fileset">
- <artifact:remoteRepository refid="extra-repo"/>
+ <!--<artifact:remoteRepository refid="extra-repo"/>-->
+ <remoteRepository id="central" url="file:///usr/share/maven-repo"/>
<dependency groupId="org.scala-lang" artifactId="scala-library" version="${starr.version}"/>
<dependency groupId="org.scala-lang" artifactId="scala-reflect" version="${starr.version}"/>
<dependency groupId="org.scala-lang" artifactId="scala-compiler" version="${starr.version}"/>
|
