aboutsummaryrefslogtreecommitdiff
path: root/stage2/ToolsTasks.scala
diff options
context:
space:
mode:
authormchav <mchavinda@colgate.edu>2016-11-25 21:50:41 -0500
committermchav <mchavinda@colgate.edu>2016-11-25 21:50:41 -0500
commit0edcab0aa4ed7798501d62dfefdbf73ae0918cdf (patch)
tree92424db82c4e1c662fc90f6ecafbb352e4a17cf4 /stage2/ToolsTasks.scala
parente44d6d698235dfee4bc0a5fd6ddc092d1557ab08 (diff)
downloadcbt-0edcab0aa4ed7798501d62dfefdbf73ae0918cdf.tar.gz
cbt-0edcab0aa4ed7798501d62dfefdbf73ae0918cdf.tar.bz2
cbt-0edcab0aa4ed7798501d62dfefdbf73ae0918cdf.zip
Remove classifier from pom files.
Diffstat (limited to 'stage2/ToolsTasks.scala')
-rw-r--r--stage2/ToolsTasks.scala6
1 files changed, 3 insertions, 3 deletions
diff --git a/stage2/ToolsTasks.scala b/stage2/ToolsTasks.scala
index 324b7d8..975b49a 100644
--- a/stage2/ToolsTasks.scala
+++ b/stage2/ToolsTasks.scala
@@ -96,7 +96,7 @@ class ToolsTasks(
val n = valName(d)
s"""
// ${d.groupId}:${d.artifactId}:${d.version}
- download(new URL(mavenUrl + "${d.basePath}.jar"), Paths.get(${n}File), "${d.jarSha1}");
+ download(new URL(mavenUrl + "${d.basePath(true)}.jar"), Paths.get(${n}File), "${d.jarSha1}");
String[] ${n}ClasspathArray = new String[]{${deps.sortBy(_.jar).map(valName(_)+"File").mkString(", ")}};
String ${n}Classpath = classpath( ${n}ClasspathArray );
@@ -131,9 +131,9 @@ ${files.map(d => s""" String ${valName(d)}File;""").mkString("\n")}
public EarlyDependencies(
String mavenCache, String mavenUrl, ClassLoaderCache2<ClassLoader> classLoaderCache, ClassLoader rootClassLoader
) throws Exception {
-${files.map(d => s""" ${valName(d)}File = mavenCache + "${d.basePath}.jar";""").mkString("\n")}
+${files.map(d => s""" ${valName(d)}File = mavenCache + "${d.basePath(true)}.jar";""").mkString("\n")}
-${scalaDeps.map(d => s""" download(new URL(mavenUrl + "${d.basePath}.jar"), Paths.get(${valName(d)}File), "${d.jarSha1}");""").mkString("\n")}
+${scalaDeps.map(d => s""" download(new URL(mavenUrl + "${d.basePath(true)}.jar"), Paths.get(${valName(d)}File), "${d.jarSha1}");""").mkString("\n")}
${assignments.mkString("\n")}
classLoader = scalaXml_${scalaXmlVersion.replace(".","_")}_;