Author: maven-release Date: 2014-07-04 15:15:32 +0200 (Fri, 04 Jul 2014) New Revision: 92 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/92 Log: use jdk8 Modified: forge-tools/sys/chorem.org/tomcat-default forge-tools/sys/chorem.org/tomcat-init.d forge-tools/sys/codelutin.com/tomcat-default forge-tools/sys/codelutin.com/tomcat-init.d forge-tools/sys/nuiton.org/tomcat-default forge-tools/sys/nuiton.org/tomcat-init.d Modified: forge-tools/sys/chorem.org/tomcat-default =================================================================== --- forge-tools/sys/chorem.org/tomcat-default 2014-06-25 16:46:09 UTC (rev 91) +++ forge-tools/sys/chorem.org/tomcat-default 2014-07-04 13:15:32 UTC (rev 92) @@ -1,4 +1,4 @@ -export JAVA_HOME=/opt/jdk7 +export JAVA_HOME=/opt/jdk export JAVA_OPTS="-XX:MaxPermSize=256m -Xmx448m -Dhudson.DNSMultiCast.disabled=true -Djava.awt.headless=true -Dsvnkit.http.sslProtocols="SSLv3"" export JENKINS_HOME=/var/local/forge/data/chorem.org/jenkins export ANDROID_HOME=/opt/android Modified: forge-tools/sys/chorem.org/tomcat-init.d =================================================================== --- forge-tools/sys/chorem.org/tomcat-init.d 2014-06-25 16:46:09 UTC (rev 91) +++ forge-tools/sys/chorem.org/tomcat-init.d 2014-07-04 13:15:32 UTC (rev 92) @@ -53,7 +53,7 @@ # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not # defined in $DEFAULT) -JDK_DIRS="/opt/jdk7 /usr/lib/jvm/default-java /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-cacao /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-blackdown /usr/lib/j2se/1.4 /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.3-sun /usr/lib/j2sdk1.3-blackdown /usr/lib/jvm/java-gcj /usr/lib/kaffe" +JDK_DIRS="/opt/jdk /usr/lib/jvm/default-java /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-cacao /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-blackdown /usr/lib/j2se/1.4 /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.3-sun /usr/lib/j2sdk1.3-blackdown /usr/lib/jvm/java-gcj /usr/lib/kaffe" # Look for the right JVM to use for jdir in $JDK_DIRS; do Modified: forge-tools/sys/codelutin.com/tomcat-default =================================================================== --- forge-tools/sys/codelutin.com/tomcat-default 2014-06-25 16:46:09 UTC (rev 91) +++ forge-tools/sys/codelutin.com/tomcat-default 2014-07-04 13:15:32 UTC (rev 92) @@ -1,4 +1,4 @@ -export JAVA_HOME=/opt/jdk7 +export JAVA_HOME=/opt/jdk export JAVA_OPTS="-XX:MaxPermSize=256m -Xmx448m -Dhudson.DNSMultiCast.disabled=true -Djava.awt.headless=true -Dsvnkit.http.sslProtocols="SSLv3"" export JENKINS_HOME=/var/local/forge/data/codelutin.com/jenkins export ANDROID_HOME=/opt/android Modified: forge-tools/sys/codelutin.com/tomcat-init.d =================================================================== --- forge-tools/sys/codelutin.com/tomcat-init.d 2014-06-25 16:46:09 UTC (rev 91) +++ forge-tools/sys/codelutin.com/tomcat-init.d 2014-07-04 13:15:32 UTC (rev 92) @@ -53,7 +53,7 @@ # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not # defined in $DEFAULT) -JDK_DIRS="/opt/jdk7 /usr/lib/jvm/default-java /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-cacao /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-blackdown /usr/lib/j2se/1.4 /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.3-sun /usr/lib/j2sdk1.3-blackdown /usr/lib/jvm/java-gcj /usr/lib/kaffe" +JDK_DIRS="/opt/jdk /usr/lib/jvm/default-java /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-cacao /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-blackdown /usr/lib/j2se/1.4 /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.3-sun /usr/lib/j2sdk1.3-blackdown /usr/lib/jvm/java-gcj /usr/lib/kaffe" # Look for the right JVM to use for jdir in $JDK_DIRS; do Modified: forge-tools/sys/nuiton.org/tomcat-default =================================================================== --- forge-tools/sys/nuiton.org/tomcat-default 2014-06-25 16:46:09 UTC (rev 91) +++ forge-tools/sys/nuiton.org/tomcat-default 2014-07-04 13:15:32 UTC (rev 92) @@ -1,4 +1,4 @@ -export JAVA_HOME=/opt/jdk7 +export JAVA_HOME=/opt/jdk export JAVA_OPTS="-XX:MaxPermSize=256m -Xmx448m -Dhudson.DNSMultiCast.disabled=true -Djava.awt.headless=true -Dsvnkit.http.sslProtocols="SSLv3"" export JENKINS_HOME=/var/local/forge/data/nuiton.org/jenkins export ANDROID_HOME=/opt/android Modified: forge-tools/sys/nuiton.org/tomcat-init.d =================================================================== --- forge-tools/sys/nuiton.org/tomcat-init.d 2014-06-25 16:46:09 UTC (rev 91) +++ forge-tools/sys/nuiton.org/tomcat-init.d 2014-07-04 13:15:32 UTC (rev 92) @@ -53,7 +53,7 @@ # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not # defined in $DEFAULT) -JDK_DIRS="/opt/jdk7 /usr/lib/jvm/default-java /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-cacao /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-blackdown /usr/lib/j2se/1.4 /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.3-sun /usr/lib/j2sdk1.3-blackdown /usr/lib/jvm/java-gcj /usr/lib/kaffe" +JDK_DIRS="/opt/jdk /usr/lib/jvm/default-java /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-cacao /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-blackdown /usr/lib/j2se/1.4 /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.3-sun /usr/lib/j2sdk1.3-blackdown /usr/lib/jvm/java-gcj /usr/lib/kaffe" # Look for the right JVM to use for jdir in $JDK_DIRS; do