summaryrefslogtreecommitdiffstats
path: root/vagrant
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2016-04-26 07:38:28 +0200
committerMarek Gradzki <mgradzki@cisco.com>2016-05-04 05:38:43 +0000
commitfd5c022142f871c78d29708c89afc941518acbd0 (patch)
tree92b6dd493d97101475959fada84ada8b0ca1fe43 /vagrant
parent4f849ffc9479c71011ca5690a2d8f98228c0a0a7 (diff)
HONEYCOMB-25: Use java 8 for sources and target JVM
Change-Id: Icdd2e8a393bd6214a9b69364a8498075fe3be43f Signed-off-by: Maros Marsalek <mmarsale@cisco.com> Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'vagrant')
-rw-r--r--vagrant/bootstrap.ubuntu1404.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/vagrant/bootstrap.ubuntu1404.sh b/vagrant/bootstrap.ubuntu1404.sh
index 30af409..28dda98 100644
--- a/vagrant/bootstrap.ubuntu1404.sh
+++ b/vagrant/bootstrap.ubuntu1404.sh
@@ -98,7 +98,7 @@ apt-get install -y linux-image-extra-`uname -r`
echo "---"
echo " Installing openjdk"
echo "---"
-apt-get install -y openjdk-7-jdk
+apt-get install -y openjdk-8-jdk
mkdir -p $APACHE_MAVEN_INSTALL_DIR
if [ -d "$KARAF_PACKAGES_MOUNT" ] ; then
APACHE_MAVEN_TARBALL="$KARAF_PACKAGES_MOUNT/$APACHE_MAVEN_TAR_GZ"
@@ -135,7 +135,7 @@ if [ "$(grep M2_HOME $VAGRANT_BASH_ALIASES)" = "" ] ; then
# Maven Environment variables
export M2_HOME=/usr/local/apache-maven/apache-maven-3.3.9
export MAVEN_OPTS="-Xms256m -Xmx512m" # Very important to put the "m" on the end
-export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
+export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
EOF
chown vagrant:vagrant $VAGRANT_BASH_ALIASES
fi