Skip to content

Commit 60ecb66

Browse files
author
Hassan Radwan
committed
Updating the versions of the JRE and Jetty that we bundle
1 parent d98972d commit 60ecb66

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

project/DependencyFetcher.scala

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -290,16 +290,16 @@ object DependencyFetcher extends BuildExtra {
290290

291291
packageDependencyList in Dependencies := Nil,
292292

293-
jreWindowsUrl in Dependencies := "http://download.oracle.com/otn-pub/java/jdk/7u55-b13/jre-7u55-windows-i586.tar.gz",
293+
jreWindowsUrl in Dependencies := "http://download.oracle.com/otn-pub/java/jdk/7u75-b13/jre-7u75-windows-i586.tar.gz",
294294
jreWindows in Dependencies <<= (dependencyFolder in Dependencies) { _ / "win32" / "jre" },
295-
jreLinuxUrl in Dependencies := "http://download.oracle.com/otn-pub/java/jdk/7u55-b13/jre-7u55-linux-i586.tar.gz",
295+
jreLinuxUrl in Dependencies := "http://download.oracle.com/otn-pub/java/jdk/7u75-b13/jre-7u75-linux-i586.tar.gz",
296296
jreLinux in Dependencies <<= (dependencyFolder in Dependencies) { _ / "linux-x86" / "jre" },
297-
jreOsxUrl in Dependencies := "http://download.oracle.com/otn-pub/java/jdk/7u55-b13/jre-7u55-macosx-x64.tar.gz",
297+
jreOsxUrl in Dependencies := "http://download.oracle.com/otn-pub/java/jdk/7u75-b13/jre-7u75-macosx-x64.tar.gz",
298298
jreOsx in Dependencies <<= (dependencyFolder in Dependencies) { _ / "osx" / "jre" },
299299

300300
packageDependencyList in Dependencies <+= (jreWindowsUrl in Dependencies, jreWindows in Dependencies, jreLinuxUrl in Dependencies, jreLinux in Dependencies, jreOsxUrl in Dependencies, jreOsx in Dependencies) map { (jreWinUrl, jreWin, jreLinUrl, jreLin, jreOsxUrl, jreOsx) =>
301301
JreDependency(
302-
name = "jre 7u55", rawPath = "jre1.7.0_55",
302+
name = "jre 7u75", rawPath = "jre1.7.0_75",
303303
files = List(
304304
DependencyFile(Platform.Windows, jreWinUrl, jreWin, FileFormat.TarGz),
305305
DependencyFile(Platform.Linux, jreLinUrl, jreLin, FileFormat.TarGz),
@@ -333,13 +333,13 @@ object DependencyFetcher extends BuildExtra {
333333
},
334334

335335
jetty in Dependencies <<= (dependencyFolder in Dependencies) { _ / "common" / "jetty" },
336-
jettyUrl in Dependencies := "http://mirrors.xmission.com/eclipse/jetty/9.1.4.v20140401/dist/jetty-distribution-9.1.4.v20140401.zip",
336+
jettyUrl in Dependencies := "http://mirrors.xmission.com/eclipse/jetty/stable-9/dist/jetty-distribution-9.2.9.v20150224.zip",
337337
resourcer in Dependencies <<= (dependencyFolder in Dependencies) { _ / "tools" / "resourcer" },
338338
resourcerUrl in Dependencies := "https://dl.dropboxusercontent.com/s/zifogi9efgtsq1s/Anolis.Resourcer-0.9.zip?dl=1", // http://anolis.codeplex.com/downloads/get/81545
339339

340340
packageDependencyList in Dependencies <++= (jettyUrl in Dependencies, jetty in Dependencies, resourcerUrl in Dependencies, resourcer in Dependencies) map { (jettyUrl, jetty, resourcerUrl, resourcer) =>
341-
val jettyDep = new CommonDependency("Jetty 9.1.4 v20140401", DependencyFile(Platform.Unspecified, jettyUrl, jetty, FileFormat.Zip)) with PackageHelper {
342-
private val trimPathRegex = ("^\\Qjetty-distribution-9.1.4.v20140401\\E/").r
341+
val jettyDep = new CommonDependency("Jetty 9.2.9 v20150224", DependencyFile(Platform.Unspecified, jettyUrl, jetty, FileFormat.Zip)) with PackageHelper {
342+
private val trimPathRegex = ("^\\Qjetty-distribution-9.2.9.v20150224\\E/").r
343343
def trimPath(platform: Platform)(path: String) = {
344344
trimPathRegex.replaceFirstIn(path, "")
345345
}

0 commit comments

Comments
 (0)