Merge pull request #1882 from TechEmpower/move-everything-to-java-8

Removed Java 7 install, now only Java 8 is supported

frameworks/Clojure/aleph/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java7 leiningen
+fw_depends java leiningen
 
 cd hello
 lein clean

frameworks/Clojure/compojure/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java8 resin leiningen
+fw_depends java resin leiningen
 
 sed -i 's|:subname "//.*:3306|:subname "//'"${DBHOST}"':3306|g' hello/src/hello/handler.clj
 

frameworks/Clojure/http-kit/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends leiningen java8
+fw_depends leiningen java
 
 sed -i 's|:subname "//.*:3306|:subname "//'"${DBHOST}"':3306|g' hello/src/hello/handler.clj
 

frameworks/Clojure/luminus/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java7 resin leiningen 
+fw_depends java resin leiningen 
 
 # Update db host in the source file
 sed -i 's|:subname "//.*:3306|:subname "//'"${DBHOST}"':3306|g' hello/src/hello/db/core.clj

frameworks/Clojure/pedestal/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java7 leiningen
+fw_depends java leiningen
 
 sed -i 's|127.0.0.1:3306|'${DBHOST}':3306|g' src/pedestal/service.clj
 

frameworks/Groovy/grails/setup.sh

@@ -2,7 +2,7 @@
 
 sed -i 's|jdbc:mysql://.*:3306|jdbc:mysql://'"${DBHOST}"':3306|g' hello/grails-app/conf/DataSource.groovy
 
-fw_depends java7 grails resin 
+fw_depends java grails resin 
 
 cd hello
 grails -Dgrails.work.dir=${IROOT}/.grails -non-interactive -plain-output refresh-dependencies

frameworks/Java/README.md

@@ -6,7 +6,6 @@ For further guidance, review the
 
 ## Infrastructure Software Versions
 
-* Java 7
 * Java 8
 
 ## Adding a New Java Framework
@@ -20,14 +19,7 @@ should have an `install.sh` that contains at least
 
     fw_depends java
 
-This installs the OpenJDK 7 JVM.
-
-Frameworks can also choose to install Oracle Java 8 JVM by 
-declaring a dependency on "java8" instead of java. In order 
-to use Java 8 JVM frameworks need to add the following line 
-in their "setup.sh" file:
-
-    export JAVA_HOME=/opt/java8
+This installs the Oracle Java 8 JDK.
 
 ## Get Help
 

frameworks/Java/activeweb/setup.sh

@@ -3,7 +3,7 @@
 sed -i 's|localhost|'"${DBHOST}"'|g' src/main/webapp/WEB-INF/resin-web.xml
 sed -i 's|localhost|'"${DBHOST}"'|g' src/main/java/app/config/DbConfig.java
 
-fw_depends java7 resin maven
+fw_depends java resin maven
 
 mvn clean package
 rm -rf $RESIN_HOME/webapps/*

frameworks/Java/comsat-servlet/setup-generic.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java8
+fw_depends java
 
 $TROOT/gradlew clean capsule
 

frameworks/Java/comsat-webactors/setup-generic.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java8
+fw_depends java
 
 $TROOT/gradlew capsule
 

frameworks/Java/curacao/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java7 sbt
+fw_depends java sbt
 
 sbt assembly
 

frameworks/Java/dropwizard/setup_mongo.sh

@@ -1,10 +1,9 @@
 #!/bin/bash
 
-# load java environment variables
-source $IROOT/java7.installed
+fw_depends java maven
 
 sed -i 's|host: 127.0.0.1|host: '"${DBHOST}"'|g' hello-world-mongo.yml
 
 mvn -P mongo clean package
 
-java -jar target/hello-world-0.0.1-SNAPSHOT.jar server hello-world-mongo.yml &
+java -jar target/hello-world-0.0.1-SNAPSHOT.jar server hello-world-mongo.yml &

frameworks/Java/dropwizard/setup_mysql.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
-sed -i 's|url: jdbc:mysql://.*/hello_world|url: jdbc:mysql://'"${DBHOST}"':3306/hello_world|g' hello-world-mysql.yml
+fw_depends java maven
 
-fw_depends java7 maven
+sed -i 's|url: jdbc:mysql://.*/hello_world|url: jdbc:mysql://'"${DBHOST}"':3306/hello_world|g' hello-world-mysql.yml
 
 mvn -P mysql clean package
 

frameworks/Java/dropwizard/setup_postgres.sh

@@ -1,10 +1,9 @@
 #!/bin/bash
 
-# load java environment variables
-source $IROOT/java7.installed
+fw_depends java maven
 
 sed -i 's|url: jdbc:postgresql://.*/hello_world|url: jdbc:postgresql://'"${DBHOST}"':5432/hello_world|g' hello-world-postgres.yml
 
 mvn -P postgres clean package
 
-java -jar target/hello-world-0.0.1-SNAPSHOT.jar server hello-world-postgres.yml &
+java -jar target/hello-world-0.0.1-SNAPSHOT.jar server hello-world-postgres.yml &

frameworks/Java/gemini/start.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java7 resin maven
+fw_depends java resin maven
 
 sed -i 's|db.ConnectString = .*/|db.ConnectString = '"$DBHOST"':3306/|g' Docroot/WEB-INF/GeminiHello.conf
 sed -i 's|root-directory=".*/FrameworkBenchmarks/frameworks/Java/gemini|root-directory="'"$TROOT"'|g' Docroot/WEB-INF/resin.xml

frameworks/Java/gemini/start_postgres.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java7 resin maven
+fw_depends java resin maven
 
 sed -i 's|db.ConnectString = .*/|db.ConnectString = '"$DBHOST"':5432/|g' Docroot/WEB-INF/GeminiHello.conf
 sed -i 's|root-directory=".*/FrameworkBenchmarks/frameworks/Java/gemini|root-directory="'"$TROOT"'|g' Docroot/WEB-INF/resin.xml

frameworks/Java/grizzly-bm/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java7 maven
+fw_depends java maven
 
 mvn clean compile assembly:single
 

frameworks/Java/grizzly-jersey/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java7 maven
+fw_depends java maven
 
 mvn clean package
 

frameworks/Java/jawn/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java8
+fw_depends java
 
 ./gradlew clean
 

frameworks/Java/jetty-servlet/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java7 maven
+fw_depends java maven
 
 mvn clean compile assembly:single
 

frameworks/Java/jetty/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java8 maven
+fw_depends java maven
 
 mvn clean compile assembly:single
 

frameworks/Java/jooby/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java8 maven
+fw_depends java maven
 
 mvn clean package
 

frameworks/Java/netty/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java7 maven
+fw_depends java maven
 
 mvn clean compile assembly:single
 

frameworks/Java/ninja-standalone/setup.sh

@@ -2,7 +2,7 @@
 
 sed -i 's|mysql://.*:3306|mysql://'"${DBHOST}"':3306|g' src/main/java/conf/application.conf
 
-fw_depends java7 maven
+fw_depends java maven
 
 mvn clean compile assembly:single
 

frameworks/Java/play1/setup.sh

@@ -2,6 +2,6 @@
 
 sed -i 's|jdbc:mysql://.*:3306|jdbc:mysql://'"${DBHOST}"':3306|g' conf/application.conf
 
-fw_depends java7 play1 
+fw_depends java play1 
 
 $PLAY1_HOME/play start --%prod

frameworks/Java/play1siena/setup.sh

@@ -2,7 +2,7 @@
 
 sed -i 's|jdbc:mysql://.*:3306|jdbc:mysql://'"${DBHOST}"':3306|g' conf/application.conf
 
-fw_depends java7 play1 siena resin
+fw_depends java play1 siena resin
 
 rm -rf $RESIN_HOME/webapps/*
 play war -o $RESIN_HOME/webapps/play1 --exclude benchmark_config.json

frameworks/Java/play2-java/setup_java.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java8 sbt
+fw_depends java sbt
 
 cd play2-java
 

frameworks/Java/play2-java/setup_java_ebean_bonecp.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java8 sbt
+fw_depends java sbt
 
 sed -i 's|127.0.0.1:3306|'${DBHOST}':3306|g' play2-java-ebean-bonecp/conf/application.conf
 

frameworks/Java/play2-java/setup_java_ebean_hikaricp.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java8 sbt
+fw_depends java sbt
 
 sed -i 's|127.0.0.1|'${DBHOST}'|g' play2-java-ebean-hikaricp/conf/application.conf
 

frameworks/Java/play2-java/setup_java_jpa_bonecp.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java8 sbt
+fw_depends java sbt
 
 sed -i 's|127.0.0.1|'${DBHOST}'|g' play2-java-jpa-bonecp/conf/application.conf
 

frameworks/Java/play2-java/setup_java_jpa_hikaricp.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java8 sbt
+fw_depends java sbt
 
 sed -i 's|127.0.0.1|'${DBHOST}'|g' play2-java-jpa-hikaricp/conf/application.conf
 

frameworks/Java/rapidoid/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java7 maven
+fw_depends java maven
 
 mvn clean compile assembly:single
 

frameworks/Java/restexpress/setup.sh

@@ -3,7 +3,7 @@
 sed -i 's|mongodb://.*/hello_world|mongodb://'"${DBHOST}"'/hello_world|g' config/dev/environment.properties
 sed -i 's|mysql://.*:3306|mysql://'"${DBHOST}"':3306|g' config/dev/environment.properties
 
-fw_depends java7 maven
+fw_depends java maven
 
 mvn clean package
 mvn assembly:single

frameworks/Java/sabina/jetty-mongodb.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-fw_depends java8 maven
+fw_depends java maven
 
 ./setup.sh -Dsabina.backend=jetty -Dsabina.benchmark.repository=mongodb

frameworks/Java/sabina/jetty.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-fw_depends java8 maven
+fw_depends java maven
 
 ./setup.sh -Dsabina.backend=jetty -Dsabina.benchmark.repository=mysql

frameworks/Java/sabina/undertow-mongodb.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-fw_depends java8 maven
+fw_depends java maven
 
 ./setup.sh -Dsabina.backend=undertow -Dsabina.benchmark.repository=mongodb

frameworks/Java/sabina/undertow.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-fw_depends java8 maven
+fw_depends java maven
 
 ./setup.sh -Dsabina.backend=undertow -Dsabina.benchmark.repository=mysql

frameworks/Java/servlet-dsl/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java7 resin maven
+fw_depends java resin maven
 
 mvn clean compile war:war
 rm -rf $RESIN_HOME/webapps/*

frameworks/Java/servlet/setup.sh

@@ -2,7 +2,7 @@
 
 sed -i 's|localhost|'"${DBHOST}"'|g' src/main/webapp/WEB-INF/resin-web.xml
 
-fw_depends java7 resin maven
+fw_depends java resin maven
 
 mvn clean compile war:war
 rm -rf $RESIN_HOME/webapps/*

frameworks/Java/servlet3-cass/setup.sh

@@ -2,7 +2,7 @@
 
 sed -i 's|localhost|'"${DBHOST}"'|g' src/main/resources/application.properties
 
-fw_depends java8 resin maven
+fw_depends java resin maven
 
 mvn clean compile war:war
 rm -rf $RESIN_HOME/webapps/*

frameworks/Java/spark/setup.sh

@@ -2,7 +2,7 @@
 
 sed -i 's|mysql://.*:3306|mysql://'"${DBHOST}"':3306|g' src/main/webapp/WEB-INF/resin-web.xml
 
-fw_depends java7 resin maven
+fw_depends java resin maven
 
 mvn clean package -Ddb-host=${DBHOST}
 rm -rf $RESIN_HOME/webapps/*

frameworks/Java/spring/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java7 maven
+fw_depends java maven
 
 mvn clean package
 cd target

frameworks/Java/tapestry/setup.sh

@@ -2,7 +2,7 @@
 
 sed -i 's|mysql://.*:3306|mysql://'"${DBHOST}"':3306|g' hello/src/main/webapp/WEB-INF/resin-web.xml
 
-fw_depends java7 resin maven
+fw_depends java resin maven
 
 cd hello
 mvn clean compile war:war

frameworks/Java/undertow-edge/setup.sh

@@ -2,7 +2,7 @@
 
 sed -i 's|127.0.0.1|'${DBHOST}'|g' src/main/resources/hello/server.properties
 
-fw_depends java7 maven
+fw_depends java maven
 
 mvn clean package
 java -Djava.library.path=target/ -jar target/undertow-edge-0.1-jar-with-dependencies.jar &

frameworks/Java/undertow/setup.sh

@@ -2,7 +2,7 @@
 
 sed -i 's|DATABASE_HOST|'"${DBHOST}"'|g' src/main/resources/hello/server.properties
 
-fw_depends java8 maven
+fw_depends java maven
 
 mvn clean compile assembly:single
 cd target

frameworks/Java/vertx/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java8 maven
+fw_depends java maven
 
 mvn clean package 
 

frameworks/Java/wicket/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java7 resin maven
+fw_depends java resin maven
 
 sed -i 's|127.0.0.1|'${DBHOST}'|g' src/main/webapp/WEB-INF/resin-web.xml
 

frameworks/Java/wildfly-ee7/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java7 maven
+fw_depends java maven
 
 export JAVA_OPTS="-Djava.net.preferIPv4Stack=true -Xms2g -Xmx2g -XX:MaxPermSize=256m -XX:+UseG1GC -XX:MaxGCPauseMillis=25 -verbosegc -Xloggc:/tmp/wildfly_gc.log"
 

frameworks/Ruby/grape/run_jruby_puma.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends rvm java7 jruby-1.7.8
+fw_depends rvm java jruby-1.7.8
 
 sed -i 's|  host:.*|  host: '"${DBHOST}"'|g' config/database.yml
 

frameworks/Ruby/grape/run_torqbox.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends rvm java7 jruby-1.7.8
+fw_depends rvm java jruby-1.7.8
 
 sed -i 's|  host:.*|  host: '"${DBHOST}"'|g' config/database.yml
 

frameworks/Ruby/grape/run_trinidad.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends rvm java7 jruby-1.7.8
+fw_depends rvm java jruby-1.7.8
 
 sed -i 's|  host:.*|  host: '"${DBHOST}"'|g' config/database.yml
 

frameworks/Ruby/padrino/run_jruby_puma.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends rvm java7 jruby-1.7.8
+fw_depends rvm java jruby-1.7.8
 
 rvm jruby-1.7.8 do bundle install --gemfile=$TROOT/Gemfile
 

frameworks/Ruby/padrino/run_mri_puma.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends rvm java7 ruby-2.0.0-p0
+fw_depends rvm java ruby-2.0.0-p0
 
 rvm ruby-2.0.0-p0 do bundle install --gemfile=$TROOT/Gemfile --path vendor/bundle
 

frameworks/Ruby/padrino/run_torqbox.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends rvm java7 jruby-1.7.8
+fw_depends rvm java jruby-1.7.8
 
 rvm jruby-1.7.8 do bundle install --gemfile=$TROOT/Gemfile
 

frameworks/Ruby/padrino/run_trinidad.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends rvm java7 jruby-1.7.8
+fw_depends rvm java jruby-1.7.8
 
 rvm jruby-1.7.8 do bundle install --gemfile=$TROOT/Gemfile
 

frameworks/Ruby/rack/run_jruby_puma.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends rvm java7 jruby-1.7.8
+fw_depends rvm java jruby-1.7.8
 
 sed -i 's|127.0.0.1|'${DBHOST}'|g' config/database.yml
 

frameworks/Ruby/rack/run_torqbox.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends rvm java7 jruby-1.7.8
+fw_depends rvm java jruby-1.7.8
 
 sed -i 's|127.0.0.1|'${DBHOST}'|g' config/database.yml
 

frameworks/Ruby/rack/run_trinidad.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends rvm java7 jruby-1.7.8
+fw_depends rvm java jruby-1.7.8
 
 sed -i 's|127.0.0.1|'${DBHOST}'|g' config/database.yml
 

frameworks/Ruby/rails-stripped/setup_jruby.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends rvm java7 jruby-1.7.8
+fw_depends rvm java jruby-1.7.8
 
 sed -i 's|host: .*|host: '"${DBHOST}"'|g' config/database.yml
 

frameworks/Ruby/rails/run_jruby_puma.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends rvm java7 jruby-1.7.13
+fw_depends rvm java jruby-1.7.13
 
 rvm jruby-1.7.13 do bundle install --gemfile=$TROOT/Gemfile
 

frameworks/Ruby/rails/run_torqbox.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends rvm java7 jruby-1.7.13
+fw_depends rvm java jruby-1.7.13
 
 rvm jruby-1.7.13 do bundle install --gemfile=$TROOT/Gemfile
 

frameworks/Ruby/rails/run_trinidad.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends rvm java7 jruby-1.7.13
+fw_depends rvm java jruby-1.7.13
 
 rvm jruby-1.7.13 do bundle install --gemfile=$TROOT/Gemfile
 

frameworks/Ruby/sinatra/run_jruby_puma.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends rvm java7 jruby-1.7.8
+fw_depends rvm java jruby-1.7.8
 
 rvm jruby-1.7.8 do bundle install --gemfile=$TROOT/Gemfile
 

frameworks/Ruby/sinatra/run_torqbox.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends rvm java7 jruby-1.7.8
+fw_depends rvm java jruby-1.7.8
 
 rvm jruby-1.7.8 do bundle install --gemfile=$TROOT/Gemfile
 

frameworks/Ruby/sinatra/run_trinidad.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends rvm java7 jruby-1.7.8
+fw_depends rvm java jruby-1.7.8
 
 rvm jruby-1.7.8 do bundle install --gemfile=$TROOT/Gemfile
 

frameworks/Scala/akka-http/setup.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 
-fw_depends java8 sbt
+fw_depends java sbt
 
 sed -i 's|dbhost: "0.0.0.0"|dbhost: "'${DBHOST}'"|g' src/main/resources/application.conf
 sed -i 's|0.0.0.0:3306|'${DBHOST}':3306|g' src/main/resources/application.conf
 
-sbt 'assembly'
+sbt 'assembly' -batch
 
 java -server -jar target/scala-2.11/akka-http-benchmark.jar &

frameworks/Scala/colossus/setup.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_depends java8 sbt
+fw_depends java sbt
 
-sbt 'oneJar'
+sbt 'oneJar' -batch
 
 java -jar target/scala-2.11/colossus*one-jar.jar

frameworks/Scala/finagle/build.sbt

@@ -2,7 +2,7 @@ name := "finagle"
 
 organization := "com.falmarri"
 
-scalaVersion := "2.10.3"
+scalaVersion := "2.11.7"
 
 version := "1.0"
 

frameworks/Scala/finagle/project/build.properties

@@ -1 +1 @@
-sbt.version=0.12.1
+sbt.version=0.13.9

frameworks/Scala/finagle/setup.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_depends java7 sbt
+fw_depends java sbt
 
-sbt update compile
+sbt update compile -batch
 
 sbt -Ddb.host=${DBHOST} run &

frameworks/Scala/finch/setup.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_depends java8 sbt
+fw_depends java sbt
 
-sbt 'oneJar'
+sbt 'oneJar' -batch
 
 java -jar target/scala-2.11/*finch*one-jar.jar &

frameworks/Scala/http4s/setup.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_depends java8 sbt
+fw_depends java sbt
 
-sbt 'oneJar'
+sbt 'oneJar' -batch
 
 java -jar target/scala-2.11/http4s*one-jar.jar &

frameworks/Scala/lift-stateless/build.sbt

@@ -1,4 +1,4 @@
-import AssemblyKeys._
+import sbtassembly.AssemblyKeys._
 
 organization := "code"
 
@@ -6,7 +6,7 @@ name := "lift-stateless"
 
 version := "0.0.1"
 
-scalaVersion := "2.10.1"
+scalaVersion := "2.11.7"
 
 scalacOptions ++= Seq(
   "-deprecation",

frameworks/Scala/lift-stateless/project/Deploy.scala

@@ -1,6 +1,6 @@
 import sbt._
 import Keys._
-import sbtassembly.Plugin.AssemblyKeys._
+import sbtassembly.AssemblyKeys._
 
 object Deploy {
   val deployPackTask = TaskKey[Unit]("deploy-pack")

frameworks/Scala/lift-stateless/project/build.properties

@@ -1 +1 @@
-sbt.version=0.12.2
+sbt.version=0.13.9

frameworks/Scala/lift-stateless/project/plugins.sbt

@@ -1,5 +1,5 @@
-addSbtPlugin("io.spray" % "sbt-revolver" % "0.6.2")
+addSbtPlugin("io.spray" % "sbt-revolver" % "0.8.0")
 
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.8.6")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.1")
 
-addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.2.2")
+addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.5.0")

frameworks/Scala/lift-stateless/setup.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 
-fw_depends java7 sbt
+fw_depends java sbt
 
 sed -i 's|> ".*:3306|> "'"${DBHOST}"':3306|g' src/main/scala/Main.scala
 
-sbt update assembly
+sbt update assembly -batch
 
 ./run &

frameworks/Scala/plain/build.sbt

@@ -1,14 +1,13 @@
 import sbt._
 import Keys._
-import spray.revolver.RevolverPlugin.Revolver
-import sbtassembly.Plugin._
-import AssemblyKeys._
+import spray.revolver.RevolverPlugin
+import sbtassembly.AssemblyPlugin._
 
 name := "plain-benchmark"
 
 organization := "com.ibm"
 
-scalaVersion := "2.10.3"
+scalaVersion := "2.11.7"
 
 version := "1.0.1"
 
@@ -19,7 +18,7 @@ mainClass in Compile := Some("com.ibm.plain.bootstrap.Main")
 scalacOptions in Compile ++= Seq(
 	"-g:vars",
 	"-encoding", "UTF-8", 
-	"-target:jvm-1.7", 
+	"-target:jvm-1.8", 
 	"-deprecation", 
 	"-feature", 
 	"-optimise"
@@ -31,8 +30,8 @@ libraryDependencies ++= Seq(
   "com.typesafe" % "config" % "1.0.2",
   "ch.qos.logback" % "logback-classic" % "1.0.13",
   "org.codehaus.janino" % "janino" % "2.6.1",
-  "com.typesafe.akka" %% "akka-actor" % "2.2.3",
-  "com.typesafe.akka" %% "akka-slf4j" % "2.2.3",
+  "com.typesafe.akka" %% "akka-actor" % "2.4.1",
+  "com.typesafe.akka" %% "akka-slf4j" % "2.4.1",
   "org.apache.commons" % "commons-lang3" % "3.1",
   "org.apache.commons" % "commons-compress" % "1.5",
   "commons-io" % "commons-io" % "2.4",
@@ -45,10 +44,11 @@ libraryDependencies ++= Seq(
   "net.lingala.zip4j" % "zip4j" % "1.3.1", 
   "com.fasterxml.jackson.core" % "jackson-databind" % "2.3.0",
   "com.sun.jersey" % "jersey-json" % "1.17.1",
-  "mysql" % "mysql-connector-java" % "5.1.27"
+  "mysql" % "mysql-connector-java" % "5.1.27",
+  "org.scala-lang" % "scala-xml" % "2.11.0-M4"
 )
 
-Revolver.settings
+RevolverPlugin.settings
 
 scalariformSettings
 

frameworks/Scala/plain/project/build.properties

@@ -1 +1 @@
-sbt.version=0.12.4
+sbt.version=0.13.9

frameworks/Scala/plain/project/plugins.sbt

@@ -6,15 +6,15 @@ resolvers += "spray repo" at "http://repo.spray.io"
 
 addSbtPlugin("com.github.retronym" % "sbt-onejar" % "0.8")
 
-addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.1.2")
+addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "4.0.0")
 
-addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.3")
+addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.8")
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.0.1")
+addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.6.0")
 
 addSbtPlugin("me.lessis" % "ls-sbt" % "0.1.2")
 
-addSbtPlugin("io.spray" % "sbt-revolver" % "0.6.2")
+addSbtPlugin("io.spray" % "sbt-revolver" % "0.8.0")
 
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.8.8")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.1")
 

frameworks/Scala/plain/setup.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 
-fw_depends java7 sbt
+fw_depends java sbt
 
 sed -i 's|127.0.0.1|'"${DBHOST}"'|g' src/main/resources/application.conf
 
-sbt assembly && rm -rf target/scala-2.10/cache
+sbt assembly -batch && rm -rf target/scala-2.10/cache
 
 java -jar target/scala-2.10/plain-benchmark-assembly-1.0.1.jar &

frameworks/Scala/play2-scala/setup_scala.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java8 sbt
+fw_depends java sbt
 
 cd play2-scala
 sed -i "s|jdbc:mysql:\/\/.*:3306|jdbc:mysql://${DBHOST}:3306|g" ${TROOT}/play2-scala/conf/application.conf

frameworks/Scala/play2-scala/setup_scala_activate.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java7 sbt
+fw_depends java sbt
 
 cd play2-scala-activate
 sed -i 's|jdbc:mysql://.*:3306|jdbc:mysql://'"${DBHOST}"':3306|g' $TROOT/play2-scala-activate/conf/application.conf

frameworks/Scala/play2-scala/setup_scala_anorm.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java8 sbt
+fw_depends java sbt
 
 cd play2-scala-anorm
 sed -i "s|jdbc:mysql:\/\/.*:3306|jdbc:mysql://${DBHOST}:3306|g" ${TROOT}/play2-scala-anorm/conf/application.conf

frameworks/Scala/play2-scala/setup_scala_reactivemongo.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java8 sbt
+fw_depends java sbt
 
 cd play2-scala-reactivemongo
 sed -i 's|jdbc:mysql://.*:3306|jdbc:mysql://'"${DBHOST}"':3306|g' ${TROOT}/play2-scala-reactivemongo/conf/application.conf

frameworks/Scala/play2-scala/setup_scala_slick.sh

@@ -1,8 +1,6 @@
 #!/bin/bash
 
-export JAVA_HOME=/opt/java8
-
-fw_depends java8 sbt
+fw_depends java sbt
 
 cd play2-scala-slick
 sed -i "s|jdbc:mysql:\/\/.*:3306|jdbc:mysql://${DBHOST}:3306|g" ${TROOT}/play2-scala-slick/conf/application.conf

frameworks/Scala/scalatra/project/build.properties

@@ -1 +1 @@
-sbt.version=0.12.2
+sbt.version=0.13.9

frameworks/Scala/scalatra/project/build.scala

@@ -9,7 +9,7 @@ object BenchmarkBuild extends Build {
   val Organization = "hello.benchmark"
   val Name = "scalatra"
   val Version = "1.0-SNAPSHOT"
-  val ScalaVersion = "2.10.0"
+  val ScalaVersion = "2.11.7"
   val ScalatraVersion = "2.2.0"
 
   lazy val project = Project (

frameworks/Scala/scalatra/project/plugins.sbt

@@ -1,6 +1,6 @@
 addSbtPlugin("com.mojolly.scalate" % "xsbt-scalate-generator" % "0.4.2")
 
-addSbtPlugin("org.scalatra.sbt" % "scalatra-sbt" % "0.2.0")
+addSbtPlugin("org.scalatra.sbt" % "scalatra-sbt" % "0.5.0")
 
-addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.2.0")
+addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")
 

frameworks/Scala/scalatra/setup.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 
-fw_depends java7 resin sbt
+fw_depends java resin sbt
 
 sed -i 's|mysql://.*:3306|mysql://'"${DBHOST}"':3306|g' src/main/webapp/WEB-INF/resin-web.xml
 
-sbt clean package
+sbt clean package -batch
 
 rm -rf $RESIN_HOME/webapps/*
 cp target/scala-2.10/scalatra*.war $RESIN_HOME/webapps/scalatra.war

frameworks/Scala/scruffy/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java7 sbt
+fw_depends java sbt
 
 sed -i 's|127.0.0.1|'${DBHOST}'|g' src/main/scala/scruffy/examples/Test2Endpoint.scala
 

frameworks/Scala/spray-es/setup.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 
-fw_depends java8 sbt
+fw_depends java sbt
 
 sbt_opts='-J-XX:+UseG1GC -J-Xmx2G -J-XX:MaxMetaspaceSize=512m'
 
-sbt $sbt_opts package
-sbt $sbt_opts assembly
+sbt $sbt_opts package -batch
+sbt $sbt_opts assembly -batch
 
 java -Dtfb.db_host=$DBHOST -jar target/scala-2.11/spray-es-assembly-0.1.jar &

frameworks/Scala/spray/build.sbt

@@ -1,10 +1,10 @@
-import spray.revolver.RevolverPlugin.Revolver
+import spray.revolver.RevolverPlugin
 
 name := "spray-benchmark"
 
 organization := "io.spray"
 
-scalaVersion := "2.10.1"
+scalaVersion := "2.11.7"
 
 version := "1.0"
 
@@ -14,13 +14,14 @@ resolvers ++= Seq(
 )
 
 libraryDependencies ++= Seq(
-  "io.spray" %% "spray-json" % "1.2.4",
+  "io.spray" %% "spray-json" % "1.3.2",
   "io.spray" % "spray-can" % "1.1-20130619",
-  "com.typesafe.akka" %%  "akka-actor" % "2.1.2",
-  "com.typesafe.akka" %%  "akka-slf4j" % "2.1.2",
-  "ch.qos.logback"% "logback-classic" % "1.0.12" % "runtime"
+  "com.typesafe.akka" %%  "akka-actor" % "2.4.1",
+  "com.typesafe.akka" %%  "akka-slf4j" % "2.4.1",
+  "ch.qos.logback"% "logback-classic" % "1.0.12" % "runtime",
+  "org.scala-lang" % "scala-xml" % "2.11.0-M4"
 )
 
-Revolver.settings
+RevolverPlugin.settings
 
-sbtassembly.Plugin.assemblySettings
+sbtassembly.AssemblyPlugin.assemblySettings

frameworks/Scala/spray/project/build.properties

@@ -1 +1 @@
-sbt.version=0.12.3
+sbt.version=0.13.9

frameworks/Scala/spray/project/plugins.sbt

@@ -1,5 +1,5 @@
 resolvers += "spray repo" at "http://repo.spray.io"
 
-addSbtPlugin("io.spray" % "sbt-revolver" % "0.6.2")
+addSbtPlugin("io.spray" % "sbt-revolver" % "0.8.0")
 
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.8.8")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.1")

frameworks/Scala/spray/setup.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_depends java7 scala sbt
+fw_depends java scala sbt
 
-sbt assembly
+sbt assembly -batch
 
 java -jar target/scala-2.10/spray-benchmark-assembly-1.0.jar &

frameworks/Scala/unfiltered/project/Build.scala

@@ -1,24 +1,24 @@
 import sbt._
 import Keys._
-import sbtassembly.Plugin._
-import AssemblyKeys._
+import sbtassembly.AssemblyPlugin._
+//import AssemblyKeys._
 
 object Bench extends Build {
   lazy val project = Project(
     "bench", 
     file("."),
     settings = Defaults.defaultSettings ++ assemblySettings ++ Seq(
-      scalaVersion := "2.10.1",
+      scalaVersion := "2.11.7",
       version := "1.0.0",
       name := "bench",
       libraryDependencies ++= Seq(
-        "net.databinder" %% "unfiltered-netty-server" % "0.6.8",
-        "net.databinder.dispatch" %% "dispatch-core" % "0.9.5",
-        "net.databinder" %% "unfiltered-json4s" % "0.6.8",
-        "net.databinder" %% "unfiltered-spec" % "0.6.8" % "test",
-        "org.clapper" %% "avsl" % "1.0.1",
-        "org.json4s" %% "json4s-jackson" % "3.2.3",
-        "com.typesafe.slick" %% "slick" % "1.0.0",
+        "net.databinder" %% "unfiltered-netty-server" % "0.8.4",
+        "net.databinder.dispatch" %% "dispatch-core" % "0.11.2",
+        "net.databinder" %% "unfiltered-json4s" % "0.8.4",
+        "net.databinder" %% "unfiltered-specs2" % "0.8.4" % "test",
+        "org.clapper" %% "avsl" % "1.0.2",
+        "org.json4s" %% "json4s-jackson" % "3.3.0",
+        "com.typesafe.slick" %% "slick" % "3.1.1",
         "mysql" % "mysql-connector-java" % "5.1.24",
         "com.jolbox" % "bonecp" % "0.7.1.RELEASE",
         "com.typesafe" % "config" % "1.0.0"

frameworks/Scala/unfiltered/project/build.properties

@@ -1 +1 @@
-sbt.version=0.12.3
+sbt.version=0.13.9

frameworks/Scala/unfiltered/project/plugins.sbt

@@ -1 +1 @@
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.8.7")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.1")

frameworks/Scala/unfiltered/setup_unfiltered.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 
-fw_depends java7 scala sbt
+fw_depends java scala sbt
 
 sed -i 's|jdbc:mysql://.*:3306|jdbc:mysql://'"${DBHOST}"':3306|g' src/main/resources/application.conf
 sed -i 's|maxThreads = .*|maxThreads = '"${MAX_THREADS}"'|g' src/main/resources/application.conf
 
-sbt assembly
+sbt assembly -batch
 
 cd target/scala-2.10
 java -jar bench-assembly-1.0.0.jar &