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,6 +1,6 @@
 #!/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

frameworks/Scala/colossus/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java8 sbt
+fw_depends java sbt
 
 sbt 'oneJar'
 

frameworks/Scala/finagle/setup.sh

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

frameworks/Scala/finch/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java8 sbt
+fw_depends java sbt
 
 sbt 'oneJar'
 

frameworks/Scala/http4s/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java8 sbt
+fw_depends java sbt
 
 sbt 'oneJar'
 

frameworks/Scala/lift-stateless/setup.sh

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

frameworks/Scala/plain/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/resources/application.conf
 

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/setup.sh

@@ -1,6 +1,6 @@
 #!/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
 

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,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java8 sbt
+fw_depends java sbt
 
 sbt_opts='-J-XX:+UseG1GC -J-Xmx2G -J-XX:MaxMetaspaceSize=512m'
 

frameworks/Scala/spray/setup.sh

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

frameworks/Scala/unfiltered/setup_unfiltered.sh

@@ -1,6 +1,6 @@
 #!/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

toolset/setup/linux/languages/java.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+RETCODE=$(fw_exists java.installed)
+[ ! "$RETCODE" == 0 ] || { \
+  # Load environment variables
+  source $IROOT/java.installed
+  return 0; }
+
+# TODO: Someday get away from apt-get
+sudo add-apt-repository -y ppa:webupd8team/java
+sudo apt-get update
+echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | sudo /usr/bin/debconf-set-selections
+sudo apt-get install -y oracle-java8-installer
+
+# Setup environment variables
+JAVA_HOME=/usr/lib/jvm/java-8-oracle
+echo "export JAVA_HOME=${JAVA_HOME}" > $IROOT/java.installed
+echo -e "export PATH=\$JAVA_HOME/bin:\$PATH" >> $IROOT/java.installed
+
+source $IROOT/java.installed

toolset/setup/linux/languages/java7.sh

@@ -1,24 +0,0 @@
-#!/bin/bash
-
-RETCODE=$(fw_exists ${IROOT}/java7.installed)
-[ ! "$RETCODE" == 0 ] || { \
-  # Load environment variables
-  source $IROOT/java7.installed
-  return 0; }
-
-JAVA=$IROOT/java7
-
-# TODO: Someday move away from apt-get
-sudo add-apt-repository -y ppa:webupd8team/java
-sudo apt-get update
-# First remove java6
-sudo apt-get remove -y --purge openjdk-6-jre openjdk-6-jre-headless
-# Then install java7
-echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | sudo /usr/bin/debconf-set-selections
-sudo apt-get install -y oracle-java7-installer
-
-# Setup environment variables
-echo "export JAVA_HOME=/usr/lib/jvm/java-7-oracle" > $IROOT/java7.installed
-echo -e "export PATH=\$JAVA_HOME/bin:\$PATH" >> $IROOT/java7.installed
-
-source $IROOT/java7.installed

toolset/setup/linux/languages/java8.sh

@@ -1,36 +0,0 @@
-#!/bin/bash
-
-RETCODE=$(fw_exists java8.installed)
-[ ! "$RETCODE" == 0 ] || { \
-  # Load environment variables
-  source $IROOT/java8.installed
-  return 0; }
-
-# TODO: Someday get away from apt-get
-sudo add-apt-repository -y ppa:webupd8team/java
-sudo apt-get update
-echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | sudo /usr/bin/debconf-set-selections
-sudo apt-get install -y oracle-java8-installer
-
-# set Java 7 (OpenJDK) as the default, as before.
-J7_HOME=/usr/lib/jvm/java-7-oracle
-sudo update-alternatives --set java $J7_HOME/jre/bin/java
-sudo update-alternatives --set javac $J7_HOME/bin/javac
-
-# try to make sure all JDK binaries default to OpenJDK 7, not Java 8
-update-alternatives --get-selections | grep java-8 | sed -e "s|java-8-oracle|$J7_HOME|" | while read line
-do
-  l=(${line// / })
-  n=${l[0]}
-  p=${l[2]}
-  if [ -e "$p" ]; then
-    sudo update-alternatives --set $n "$p"
-  fi
-done
-
-# Setup environment variables
-JAVA_HOME=/usr/lib/jvm/java-8-oracle
-echo "export JAVA_HOME=${JAVA_HOME}" > $IROOT/java8.installed
-echo -e "export PATH=\$JAVA_HOME/bin:\$PATH" >> $IROOT/java8.installed
-
-source $IROOT/java8.installed