From 672816d91fc30e0e50dd534afc6a5404f586e1ed Mon Sep 17 00:00:00 2001 From: Nikolaus Krismer <nikolaus.krismer@uibk.ac.at> Date: Thu, 26 Jun 2014 15:38:04 +0200 Subject: [PATCH] upgrading to java8 and apache-tomcat8 --- build.gradle | 11 ++++------- etc/vagrant/bootstrap.sh | 10 ++++------ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index a4e4b0ec..5e44adb1 100644 --- a/build.gradle +++ b/build.gradle @@ -6,10 +6,11 @@ apply plugin: 'jacoco' apply plugin: 'java' apply plugin: 'jdepend' apply plugin: 'maven-publish' -apply plugin: 'org.asciidoctor.gradle.asciidoctor' apply plugin: 'vagrant' apply plugin: 'wrapper' +apply plugin: 'org.asciidoctor.gradle.asciidoctor' + import org.apache.tools.ant.filters.FixCrLfFilter import org.apache.tools.ant.filters.ReplaceTokens @@ -17,15 +18,11 @@ import org.apache.tools.ant.filters.ReplaceTokens group = 'at.uibk.dbis' version = '0.3.2-SNAPSHOT' +sourceCompatibility=JavaVersion.VERSION_1_8 +targetCompatibility=JavaVersion.VERSION_1_8 description = 'PhD project of Nikolaus Krismer' -// Upgrade as soon as findbugs 3.0 is available (this version supports JDK8) -//sourceCompatibility=JavaVersion.VERSION_1_8 -//targetCompatibility=JavaVersion.VERSION_1_8 -sourceCompatibility=JavaVersion.VERSION_1_7 -targetCompatibility=JavaVersion.VERSION_1_7 - /* * Version handling: * diff --git a/etc/vagrant/bootstrap.sh b/etc/vagrant/bootstrap.sh index 7ff73da9..8f88cf7d 100644 --- a/etc/vagrant/bootstrap.sh +++ b/etc/vagrant/bootstrap.sh @@ -78,12 +78,10 @@ GEOSERVER_VERSION=2.5.1 GEOSERVER_FILE=geoserver-$GEOSERVER_VERSION-war.zip GEOSERVER_SHELL_VERSION=0.2-SNAPSHOT GEOSERVER_SHELL_FILE=gs-shell-$GEOSERVER_SHELL_VERSION-app.zip -JAVA_VERSION=7u60 -#JAVA_VERSION=8u5 +JAVA_VERSION=8u5 JAVA_FILE_32=jdk-$JAVA_VERSION-linux-i586.rpm JAVA_FILE_64=jdk-$JAVA_VERSION-linux-x64.rpm -JAVA_CRYPTO_FILE=UnlimitedJCEPolicyJDK7.zip -#JAVA_CRYPTO_FILE=jce_policy-8.zip +JAVA_CRYPTO_FILE=jce_policy-8.zip MAVEN_VERSION=3.2.1 MAVEN_FILE=apache-maven-$MAVEN_VERSION-bin.zip NEO4J_DB_USER=neo4j @@ -143,7 +141,7 @@ TABLE_PREFIX_ST=st_ TEMPLATE_VERSION_PSIPROBE=2.3.3 TEMPLATE_FILE_PSIPROBE=probe-$TEMPLATE_VERSION_PSIPROBE.zip TEMPLATE_DIR_ISOCHRONE=/vagrant -TOMCAT_VERSION=7.0.54 +TOMCAT_VERSION=8.0.9 TOMCAT_FILE=apache-tomcat-$TOMCAT_VERSION.tar.gz TOMCAT_MEMORY_OPTS="-Xmx2048m -Xms512m -XX:MaxPermSize=512m" TOMCAT_NAME=tomcat @@ -484,7 +482,7 @@ if $INSTALL_TOMCAT; then # yum -y install $TOMCAT_NAME $TOMCAT_NAME-webapps $TOMCAT_NAME-admin-webapps > install_tomcat.log 2>&1 # ln -sf /usr/share/$TOMCAT_NAME $DEPLOY_DIR/$TOMCAT_NAME - fn_download_newer $DOWNLOAD_DIR/$TOMCAT_FILE http://tweedo.com/mirror/apache/tomcat/tomcat-7/v$TOMCAT_VERSION/bin/$TOMCAT_FILE + fn_download_newer $DOWNLOAD_DIR/$TOMCAT_FILE http://tweedo.com/mirror/apache/tomcat/tomcat-8/v$TOMCAT_VERSION/bin/$TOMCAT_FILE cp $DOWNLOAD_DIR/$TOMCAT_FILE $DEPLOY_DIR/$TOMCAT_FILE tar -xvzf $DEPLOY_DIR/$TOMCAT_FILE -C $DEPLOY_DIR > install_tomcat.log 2>&1 rm -f $DEPLOY_DIR/$TOMCAT_FILE >> install_tomcat.log 2>&1 -- GitLab