Update our runtime to the latest versions:

* JRE updated to 1.8 update 45
* node-webkit updated to NW.js 0.12.2
* Jetty updated to 9.3.0

Author: baffles

distrib/common/app/main.js

@@ -102,7 +102,7 @@ function startCodePulse() {
 			},
 
 			function(data) {
-				var m = data.match(/Started ServerConnector@\w+\{HTTP\/1.1\}\{([^\}]+)\}/)
+				var m = data.match(/Started ServerConnector@\w+\{[^\}]+}\{([^\}]+)\}/)
 				if (m) {
 					writeLog('Code Pulse running on ' + m[1] + '\n');
 					cpUrl = 'http://' + m[1] + '/';

project/DependencyFetcher.scala

@@ -290,16 +290,16 @@ object DependencyFetcher extends BuildExtra {
 
 		packageDependencyList in Dependencies := Nil,
 
-		jreWindowsUrl in Dependencies := "http://download.oracle.com/otn-pub/java/jdk/7u75-b13/jre-7u75-windows-i586.tar.gz",
+		jreWindowsUrl in Dependencies := "http://download.oracle.com/otn-pub/java/jdk/8u45-b15/jre-8u45-windows-i586.tar.gz",
 		jreWindows in Dependencies <<= (dependencyFolder in Dependencies) { _ / "win32" / "jre" },
-		jreLinuxUrl in Dependencies := "http://download.oracle.com/otn-pub/java/jdk/7u75-b13/jre-7u75-linux-i586.tar.gz",
+		jreLinuxUrl in Dependencies := "http://download.oracle.com/otn-pub/java/jdk/8u45-b14/jre-8u45-linux-i586.tar.gz",
 		jreLinux in Dependencies <<= (dependencyFolder in Dependencies) { _ / "linux-x86" / "jre" },
-		jreOsxUrl in Dependencies := "http://download.oracle.com/otn-pub/java/jdk/7u75-b13/jre-7u75-macosx-x64.tar.gz",
+		jreOsxUrl in Dependencies := "http://download.oracle.com/otn-pub/java/jdk/8u45-b14/jre-8u45-macosx-x64.tar.gz",
 		jreOsx in Dependencies <<= (dependencyFolder in Dependencies) { _ / "osx" / "jre" },
 
 		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) =>
 			JreDependency(
-				name = "jre 7u75", rawPath = "jre1.7.0_75",
+				name = "jre 8u45", rawPath = "jre1.8.0_45",
 				files = List(
 					DependencyFile(Platform.Windows, jreWinUrl, jreWin, FileFormat.TarGz),
 					DependencyFile(Platform.Linux, jreLinUrl, jreLin, FileFormat.TarGz),
@@ -308,12 +308,12 @@ object DependencyFetcher extends BuildExtra {
 			)
 		},
 
-		nwkWindows in Dependencies <<= (dependencyFolder in Dependencies) { _ / "win32" / "node-webkit" },
-		nwkWindowsUrl in Dependencies := "http://dl.node-webkit.org/v0.9.2/node-webkit-v0.9.2-win-ia32.zip",
-		nwkLinux in Dependencies <<= (dependencyFolder in Dependencies) { _ / "linux-x86" / "node-webkit" },
-		nwkLinuxUrl in Dependencies := "http://dl.node-webkit.org/v0.9.2/node-webkit-v0.9.2-linux-ia32.tar.gz",
-		nwkOsx in Dependencies <<= (dependencyFolder in Dependencies) { _ / "osx" / "node-webkit" },
-		nwkOsxUrl in Dependencies := "http://dl.node-webkit.org/v0.9.2/node-webkit-v0.9.2-osx-ia32.zip",
+		nwkWindows in Dependencies <<= (dependencyFolder in Dependencies) { _ / "win32" / "nwjs" },
+		nwkWindowsUrl in Dependencies := "http://dl.nwjs.io/v0.12.2/nwjs-v0.12.2-win-ia32.zip",
+		nwkLinux in Dependencies <<= (dependencyFolder in Dependencies) { _ / "linux-x86" / "nwjs" },
+		nwkLinuxUrl in Dependencies := "http://dl.nwjs.io/v0.12.2/nwjs-v0.12.2-linux-ia32.tar.gz",
+		nwkOsx in Dependencies <<= (dependencyFolder in Dependencies) { _ / "osx" / "nwjs" },
+		nwkOsxUrl in Dependencies := "http://dl.nwjs.io/v0.12.2/nwjs-v0.12.2-osx-ia32.zip",
 
 		packageDependencyList in Dependencies <+= (nwkWindowsUrl in Dependencies, nwkWindows in Dependencies, nwkLinuxUrl in Dependencies, nwkLinux in Dependencies, nwkOsxUrl in Dependencies, nwkOsx in Dependencies) map { (nwkWinUrl, nwkWin, nwkLinUrl, nwkLin, nwkOsxUrl, nwkOsx) =>
 			new PlatformDependency(
@@ -324,22 +324,19 @@ object DependencyFetcher extends BuildExtra {
 					DependencyFile(Platform.OSX, nwkOsxUrl, nwkOsx, FileFormat.Zip)
 				)
 			) with PackageHelper {
-				private val trimPathRegex = ("^\\Qnode-webkit-v0.9.2-linux-ia32\\E/").r
-				def trimPath(platform: Platform)(path: String) = platform match {
-					case Platform.Linux => trimPathRegex.replaceFirstIn(path, "")
-					case _ => path
-				}
+				private val trimPathRegex = (raw"^nwjs-[^/]+/").r
+				def trimPath(platform: Platform)(path: String) = trimPathRegex.replaceFirstIn(path, "")
 			}
 		},
 
 		jetty in Dependencies <<= (dependencyFolder in Dependencies) { _ / "common" / "jetty" },
-		jettyUrl in Dependencies := "http://mirrors.xmission.com/eclipse/jetty/stable-9/dist/jetty-distribution-9.2.9.v20150224.zip",
+		jettyUrl in Dependencies := "http://mirrors.xmission.com/eclipse/jetty/stable-9/dist/jetty-distribution-9.3.0.v20150612.zip",
 		resourcer in Dependencies <<= (dependencyFolder in Dependencies) { _ / "tools" / "resourcer" },
 		resourcerUrl in Dependencies := "https://dl.dropboxusercontent.com/s/zifogi9efgtsq1s/Anolis.Resourcer-0.9.zip?dl=1", // http://anolis.codeplex.com/downloads/get/81545
 
 		packageDependencyList in Dependencies <++= (jettyUrl in Dependencies, jetty in Dependencies, resourcerUrl in Dependencies, resourcer in Dependencies) map { (jettyUrl, jetty, resourcerUrl, resourcer) =>
-			val jettyDep = new CommonDependency("Jetty 9.2.9 v20150224", DependencyFile(Platform.Unspecified, jettyUrl, jetty, FileFormat.Zip)) with PackageHelper {
-				private val trimPathRegex = ("^\\Qjetty-distribution-9.2.9.v20150224\\E/").r
+			val jettyDep = new CommonDependency("Jetty 9.3.0 v20150612", DependencyFile(Platform.Unspecified, jettyUrl, jetty, FileFormat.Zip)) with PackageHelper {
+				private val trimPathRegex = ("^\\Qjetty-distribution-9.3.0.v20150612\\E/").r
 				def trimPath(platform: Platform)(path: String) = {
 					trimPathRegex.replaceFirstIn(path, "")
 				}

project/Distributor.scala

@@ -138,7 +138,7 @@ object Distributor extends BuildExtra {
 				case "win32" =>
 					// on windows, we need nw.pak, icudt.dll, rename nw.exe -> codepulse.exe, libEGL/libGLES and the d3d DLLs
 					val inclusions = List(
-						"icudt.dll", "libEGL.dll", "libGLESv2.dll", "nw.pak"
+						"d3dcompiler_47.dll", "icudtl.dat", "libEGL.dll", "libGLESv2.dll", "nw.pak"
 					).map(rootZipFolder + _).toSet
 
 					nwkFiles flatMap {
@@ -176,15 +176,15 @@ object Distributor extends BuildExtra {
 
 				case "osx" =>
 					// on osx, rename node-webkit.app to Code Pulse.app
-					def rewritePath(path: String) = "codepulse/Code Pulse.app" + path.stripPrefix("codepulse/node-webkit.app")
+					def rewritePath(path: String) = "codepulse/Code Pulse.app" + path.stripPrefix("codepulse/nwjs.app")
 
 					nwkFiles flatMap {
-						case ZipEntry(_, path, mode) if path == "codepulse/node-webkit.app/Contents/Resources/nw.icns" =>
+						case ZipEntry(_, path, mode) if path == "codepulse/nwjs.app/Contents/Resources/nw.icns" =>
 							// swap in our icon
 							val icns = appFolder / "app" / "icon.icns"
 							Some(ZipEntry(icns, rewritePath(path), mode))
 
-						case ZipEntry(file, path, mode) if path == "codepulse/node-webkit.app/Contents/Info.plist" =>
+						case ZipEntry(file, path, mode) if path == "codepulse/nwjs.app/Contents/Info.plist" =>
 							// prepare our own Info.plist
 							// pretty crappy using regular expressions for this, but plist files are absolutely awful to work with
 
@@ -215,18 +215,18 @@ object Distributor extends BuildExtra {
 
 							Some(ZipEntry(customizedInfo, rewritePath(path), mode))
 
-						case ZipEntry(file, path, mode) if path startsWith "codepulse/node-webkit.app" =>
+						case ZipEntry(file, path, mode) if path startsWith "codepulse/nwjs.app" =>
 							Some(ZipEntry(file, rewritePath(path), mode))
 
 						case ZipEntry(_, path, _) if path endsWith "/" => None // silent
 						case ZipEntry(_, path, _) => println("Excluding " + path); None
 					}
 
 				case "linux-x86" =>
-					// on linux, just keep nw and nw.pak. we don't need media features, so we can skip libffmpeg.so
+					// on linux, just keep nw and nw.pak. we don't need media features, so we can skip libffmpegsumo.so
 					nwkFiles flatMap {
 						case ZipEntry(file, path, _) if path == "codepulse/nw" => Some(ZipEntry(file, "codepulse/codepulse", Some(755))) // executable
-						case e @ ZipEntry(_, path, _) if path == "codepulse/nw.pak" => Some(e)
+						case e @ ZipEntry(_, path, _) if path == "codepulse/nw.pak" || path == "codepulse/icudtl.dat" => Some(e)
 
 						case ZipEntry(_, path, _) if path endsWith "/" => None // silent
 						case ZipEntry(_, path, _) => println("Excluding " + path); None
@@ -248,6 +248,7 @@ object Distributor extends BuildExtra {
 			// exclude unnecessary files. this is platform dependant
 			// I referenced <http://www.oracle.com/technetwork/java/javase/jdk-7-readme-429198.html#redistribution>
 			// and <http://www.oracle.com/technetwork/java/javase/jre-7-readme-430162.html>
+			// For Java 8: <http://www.oracle.com/technetwork/java/javase/jre-8-readme-2095710.html>
 			platform match {
 				case "win32" =>
 					val base = rootZipFolder + "jre/"
@@ -262,13 +263,14 @@ object Distributor extends BuildExtra {
 						"bin/jpiexp32.dll", "bin/jpinscp.dll", "bin/jpioji.dll",
 						"lib/deploy.jar", "lib/plugin.jar", "lib/javaws.jar",
 						"lib/javafx.properties", "lib/jfxrt.jar", "lib/security/javafx.policy",
+						"lib/jfr", "lib/jfr.jar",
 						"THIRDPARTYLICENSEREADME-JAVAFX.txt", "Welcome.html"
 					).map(base + _).toSet
 
 					val exclusionPatterns = List(
 						"bin/dtplugin/", "bin/plugin2/", "bin/server/",
 						"bin/npjpi", // <bin/npjpi*.dll>
-						"lib/deploy/"
+						"lib/deploy/", "lib/oblique-fonts/", "lib/desktop/", "plugin/"
 					).map(base + _)
 
 					jreFiles filter {
@@ -282,12 +284,15 @@ object Distributor extends BuildExtra {
 					val exclusions = List(
 						"bin/rmid", "bin/rmiregistry", "bin/tnameserv", "bin/keytool", "bin/policytool", "bin/orbd", "bin/servertool",
 						"lib/javafx.properties", "lib/jfxrt.jar", "lib/security/javafx.policy",
-						"lib/fxplugins.dylib", "lib/libdecora-sse.dylib","lib/libglass.dylib","lib/libglib-2.0.0.dylib","lib/libgstplugins-lite.dylib","lib/libgstreamer-lite.dylib","lib/libjavafx-font.dylib","lib/libjavafx-iio.dylib","lib/libjfxmedia.dylib","lib/libjfxwebkit.dylib","lib/libprism-es2.dylib",
+						"lib/fxplugins.dylib", "lib/libdecora-sse.dylib", "lib/libglass.dylib", "lib/libglib-2.0.0.dylib"," lib/libgstplugins-lite.dylib", "lib/libgstreamer-lite.dylib",
+						"lib/libjavafx-font.dylib", "lib/libjavafx-iio.dylib", "lib/libjfxmedia.dylib", "lib/libjfxwebkit.dylib", "lib/libprism-es2.dylib",
+						"lib/jfr", "lib/jfr.jar",
 						"THIRDPARTYLICENSEREADME-JAVAFX.txt", "Welcome.html"
 					).map(base + _).toSet
 
 					val exclusionDirs = List(
-						"man/"
+						"man/",
+						"lib/oblique-fonts/", "lib/desktop/", "plugin/"
 					).map(base + _)
 
 					jreFiles flatMap {
@@ -308,12 +313,15 @@ object Distributor extends BuildExtra {
 						"bin/rmid", "bin/rmiregistry", "bin/tnameserv", "bin/keytool", "bin/policytool", "bin/orbd", "bin/servertool",
 						"bin/ControlPanel", "bin/javaws",
 						"lib/javafx.properties", "lib/jfxrt.jar", "lib/security/javafx.policy",
-						"lib/i386/fxavcodecplugin-52.so", "lib/i386/fxavcodecplugin-53.so", "lib/i386/fxplugins.so", "lib/i386/libglass.so", "lib/i386/libgstplugins-lite.so", "lib/i386/libgstreamer-lite.so", "lib/i386/libjavafx-font.so", "lib/i386/libjavafx-iio.so", "lib/i386/libjfxmedia.so", "lib/i386/libjfxwebkit.so", "lib/i386/libprism-es2.so",
+						"lib/i386/fxavcodecplugin-52.so", "lib/i386/fxavcodecplugin-53.so", "lib/i386/fxplugins.so", "lib/i386/libglass.so", "lib/i386/libgstplugins-lite.so",
+						"lib/i386/libgstreamer-lite.so", "lib/i386/libjavafx-font.so", "lib/i386/libjavafx-iio.so", "lib/i386/libjfxmedia.so", "lib/i386/libjfxwebkit.so", "lib/i386/libprism-es2.so",
+						"lib/jfr", "lib/jfr.jar",
 						"THIRDPARTYLICENSEREADME-JAVAFX.txt", "Welcome.html"
 					).map(base + _).toSet
 
 					val exclusionDirs = List(
-						"man/", "lib/deploy/"
+						"man/", "lib/deploy/",
+						"lib/oblique-fonts/", "lib/desktop/", "plugin/"
 					).map(base + _)
 
 					jreFiles flatMap {

project/build.properties

@@ -1 +1 @@
-sbt.version = 0.13.7
+sbt.version = 0.13.8