Bump dependencies

build.sbt

@@ -38,6 +38,7 @@ lazy val scalateCore = scalateProject("core")
     javaxServlet % Optional,
     logbackClassic % "runtime,optional",
     jerseyCore % Optional,
+    jerseyServlet % Optional,
     jerseyServer % Optional,
     osgiCore % "provided,optional",
     rhinoCoffeeScript % Optional,
@@ -64,14 +65,7 @@ lazy val scalateCamel = scalateProject("camel")
   .dependsOn(scalateCore, scalateTest % Test)
   .settings(
     description := "Camel component for Scalate.",
-    addScalaDependentDeps(
-      10 -> camelScala213,
-      10 -> camelSpring213,
-      11 -> camelScala214,
-      11 -> camelSpring214,
-      12 -> camelScala214,
-      12 -> camelSpring214
-    )
+    libraryDependencies ++= Seq(camelScala, camelSpring)
   )
 
 lazy val scalateGuice = scalateProject("guice")

project/Dependencies.scala

@@ -12,42 +12,41 @@ object Dependencies extends Plugin {
   val atmosphereJersey = "org.atmosphere" % "atmosphere-jersey" % "0.8.0-RC1"
   val axis = "axis" % "axis" % "1.4"
   val axisWsdl = "axis" % "axis-wsdl4j" % "1.5.1"
-  val camelScala214 = "org.apache.camel" % "camel-scala" % "2.14.0" // Supports Scala 2.11
-  val camelSpring214 = camelScala214.copy(name = "camel-spring")
-  val camelScala213 = camelScala214.copy(revision = "2.13.3") // Supports Scala 2.10
-  val camelSpring213 = camelScala213.copy(name = "camel-spring")
+  val camelScala = "org.apache.camel" % "camel-scala" % "2.18.0"
+  val camelSpring = camelScala.copy(name = "camel-spring")
   val confluenceSoap = "org.swift.common" % "confluence-soap" % "4.0.0" from
     "https://bitbucket.org/bob_swift/confluence-soap/downloads/confluence-soap-4.0.0.jar"
   val javaxServlet = "javax.servlet" % "servlet-api" % "2.5"
-  val jerseyCore = "com.sun.jersey" % "jersey-core" % "1.9"
+  val jerseyCore = "com.sun.jersey" % "jersey-core" % "1.19.3"
+  val jerseyServlet = "com.sun.jersey" % "jersey-servlet" % jerseyCore.revision
   val jerseyGuice = "com.sun.jersey.contribs" % "jersey-guice" % jerseyCore.revision
   val jerseyServer = "com.sun.jersey" % "jersey-server" % jerseyCore.revision
-  val jettyServer = "org.eclipse.jetty" % "jetty-server" % "7.2.1.v20101111"
+  val jettyServer = "org.eclipse.jetty" % "jetty-server" % "9.3.14.v20161028"
   val jettyWebapp = jettyServer.copy(name = "jetty-webapp")
   val jettyUtil = jettyServer.copy(name = "jetty-util")
   val jRebelSDK = "org.zeroturnaround" % "jr-sdk" % "4.6.2" from
     "https://repos.zeroturnaround.com/nexus/content/groups/zt-public/org/zeroturnaround/jr-sdk/4.6.2/jr-sdk-4.6.2.jar"
 
-  val jRubyComplete = "org.jruby" % "jruby-complete" % "1.6.7.2"
+  val jRubyComplete = "org.jruby" % "jruby-complete" % "1.6.8"
   val jTidy = "net.sf.jtidy" % "jtidy" % "r938"
-  val junit = "junit" % "junit" % "4.8.2"
-  val karafShell = "org.apache.karaf.shell" % "org.apache.karaf.shell.console" % "2.2.0-fuse-00-43"
-  val lessCssEngine = "com.asual.lesscss" % "lesscss-engine" % "1.3.3"
-  val logbackClassic = "ch.qos.logback" % "logback-classic" % "0.9.26"
+  val junit = "junit" % "junit" % "4.12"
+  val karafShell = "org.apache.karaf.shell" % "org.apache.karaf.shell.console" % "2.2.11"
+  val lessCssEngine = "com.asual.lesscss" % "lesscss-engine" % "1.4.2"
+  val logbackClassic = "ch.qos.logback" % "logback-classic" % "1.1.7"
   val markdownJ = "org.markdownj" % "markdownj" % "0.3.0-1.0.2b4"
-  val osgiCore = "org.osgi" % "org.osgi.core" % "4.2.0"
+  val osgiCore = "org.osgi" % "org.osgi.core" % "6.0.0"
   val pegdown = "org.pegdown" % "pegdown" % "1.1.0"
-  val rhinoCoffeeScript = "tv.cntt" % "rhinocoffeescript" % "1.6.2"
+  val rhinoCoffeeScript = "tv.cntt" % "rhinocoffeescript" % "1.10.0"
   val scalamd = "org.scalatra.scalate" %% "scalamd" % "1.7.0"
   val scalaTest = "org.scalatest" %% "scalatest" % "3.0.0"
   val seleniumDriver = "org.seleniumhq.selenium" % "selenium-htmlunit-driver" % "2.0a5"
-  val slf4jApi = "org.slf4j" % "slf4j-api" % "1.6.6"
-  val springMVC = "org.springframework" % "spring-webmvc" % "3.0.6.RELEASE"
+  val slf4jApi = "org.slf4j" % "slf4j-api" % "1.7.21"
+  val springMVC = "org.springframework" % "spring-webmvc" % "4.3.3.RELEASE"
   val scalaParserCombinators = (org: String) => s"$org.modules" %% "scala-parser-combinators" % "1.0.4"
-  val scalaXml = (org: String) => s"$org.modules" %% "scala-xml" % "1.0.5"
+  val scalaXml = (org: String) => s"$org.modules" %% "scala-xml" % "1.0.6"
   val scalaCompiler: (String, String) => ModuleID = _ % "scala-compiler" % _
   val scalaReflect: (String, String) => ModuleID = _ % "scala-reflect" % _
-  val snakeYaml = "org.yaml" % "snakeyaml" % "1.7"
+  val snakeYaml = "org.yaml" % "snakeyaml" % "1.17"
   val wikitextConfluence = "org.fusesource.wikitext" % "confluence-core" % "1.4"
   val wikitextTextile = wikitextConfluence.copy(name = "textile-core")
 

project/plugins.sbt

@@ -8,6 +8,7 @@ addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.3.2")
 addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.6.4")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.4.0")
 addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.6.0")
+addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.10")
 
 lazy val sbtOsgi = uri("git://github.com/arashi01/sbt-osgi.git#bd07211")
 

scalate-core/src/main/scala_2.10/org/fusesource/scalate/osgi/BundleClassPathBuilder.scala

@@ -54,7 +54,7 @@ object BundleClassPathBuilder {
   def fromWires(bundle: Bundle): List[AbstractFile] = {
     debug("Checking OSGi bundle wiring for %s", bundle)
     val context = bundle.getBundleContext
-    var ref: ServiceReference = context.getServiceReference(classOf[PackageAdmin].getName)
+    val ref: ServiceReference[_] = context.getServiceReference(classOf[PackageAdmin].getName)
 
     if (ref == null) {
       warn("PackageAdmin service is unavailable - unable to check bundle wiring information")

scalate-core/src/main/scala_2.11/org/fusesource/scalate/osgi/BundleClassPathBuilder.scala

@@ -84,7 +84,7 @@ object BundleClassPathBuilder {
   def fromWires(bundle: Bundle): List[AbstractFile] = {
     debug("Checking OSGi bundle wiring for %s", bundle)
     val context = bundle.getBundleContext
-    var ref: ServiceReference = context.getServiceReference(classOf[PackageAdmin].getName)
+    val ref: ServiceReference[_] = context.getServiceReference(classOf[PackageAdmin].getName)
 
     if (ref == null) {
       warn("PackageAdmin service is unavailable - unable to check bundle wiring information")