commit 0a2f9177bef32d80965b6131fdce0e6c4d7ed383 Author: Karsten Loesing karsten.loesing@gmx.net Date: Sun Sep 7 10:17:36 2014 +0200
Switch to Java 7.
Thanks to iwakeh for all the suggestions to get this running!
Implements #12881. --- build.xml | 2 +- vagrant/bootstrap.sh | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml index bfe1067..b4a9031 100644 --- a/build.xml +++ b/build.xml @@ -12,7 +12,7 @@ value="${config}/web.xml.template"/> <property name="webxml" value="${config}/web.xml"/> <property name="warfile" value="onionoo.war"/> - <property name="source-and-target-java-version" value="1.6" /> + <property name="source-and-target-java-version" value="1.7" /> <path id="classpath"> <pathelement path="${classes}"/> <fileset dir="/usr/share/java"> diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh index d4b1724..b3733de 100644 --- a/vagrant/bootstrap.sh +++ b/vagrant/bootstrap.sh @@ -6,10 +6,14 @@ echo "Updating package list and upgrading existing packages." apt-get update apt-get -y upgrade
+echo "Removing Java 6 packages." +apt-get purge -y openjdk-6-jdk default-jre + echo "Installing required packages." +apt-get install -y openjdk-7-jdk apt-get install -y libcommons-codec-java libcommons-compress-java \ libcommons-lang-java libgoogle-gson-java junit4 libservlet3.0-java \ -openjdk-6-jdk ant tomcat6 libslf4j-java liblogback-java +ant tomcat6 libslf4j-java liblogback-java
echo "Setting up paths and creating symbolic links." mkdir -p /srv/onionoo.torproject.org/onionoo/