diff options
10 files changed, 16 insertions, 16 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/buildproperties.phpHoldForLocalTests b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/buildproperties.phpHoldForLocalTests index ca411f794..668ad46db 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/buildproperties.phpHoldForLocalTests +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/buildproperties.phpHoldForLocalTests @@ -9,7 +9,7 @@ // a recent copy. This was copied circa July 8, 2014. // properties written for N20140707-2000 -$PATH = "/shared/common/jdk1.8.0_x64-latest/bin:/shared/common/apache-maven-3.1.1/bin:/shared/common/apache-ant-1.9.2/bin:/usr/local/bin:/usr/bin:/bin:/opt/buildhomes/e4Build/bin"; +$PATH = "/shared/common/jdk1.7.0-latest/bin:/shared/common/apache-maven-3.1.1/bin:/shared/common/apache-ant-1.9.2/bin:/usr/local/bin:/usr/bin:/bin:/opt/buildhomes/e4Build/bin"; $INITIAL_ENV_FILE = "/shared/eclipse/builds/4N/production/build_eclipse_org.shsource"; $BUILD_ROOT = "/shared/eclipse/builds/4N"; $BRANCH = "master"; @@ -17,8 +17,8 @@ $STREAM = "4.5.0"; $BUILD_TYPE = "N"; $TIMESTAMP = "20140707-2000"; $TMP_DIR = "/shared/eclipse/builds/4N/tmp"; -$JAVA_HOME = "/shared/common/jdk1.8.0_x64-latest"; -$MAVEN_OPTS = "-Xmx2560m -Djava.io.tmpdir=/shared/eclipse/builds/4N/tmp -Dtycho.localArtifacts=ignore; +$JAVA_HOME = "/shared/common/jdk1.7.0-latest"; +$MAVEN_OPTS = "-Xmx2560m -XX:MaxPermSize=256M -Djava.io.tmpdir=/shared/eclipse/builds/4N/tmp -Dtycho.localArtifacts=ignore; $MAVEN_PATH = "/shared/common/apache-maven-3.1.1/bin"; $AGGREGATOR_REPO = "file:///gitroot/platform/eclipse.platform.releng.aggregator.git"; $BASEBUILDER_TAG = "R38M6PlusRC3G"; diff --git a/production/build_eclipse_org.shsource b/production/build_eclipse_org.shsource index f3e4c2fd9..03eadf507 100644 --- a/production/build_eclipse_org.shsource +++ b/production/build_eclipse_org.shsource @@ -47,7 +47,7 @@ export JAVA_HOME=${JAVA_HOME:-/shared/common/jdk1.7.0-latest} # required for when ant is used. Unclear how maven's "antrun" finds its version of Ant, # built in? Or system path? # But, without the ANT_OPTS, we do get messages about "to get repeatable builds, to ignore sysclasspath" -export ANT_HOME=${ANT_HOME:-/shared/common/apache-ant-1.9.4} +export ANT_HOME=${ANT_HOME:-/shared/common/apache-ant-1.9.2} export ANT_OPTS=${ANT_OPTS:-"-Dbuild.sysclasspath=ignore -Dincludeantruntime=false"} # # remember, MaxPermSize is specific to "Oracle VMs". It has to be removed (or over ridden) diff --git a/production/sdk/collect.sh b/production/sdk/collect.sh index 0eca4f9d7..2cb2ca6ff 100755 --- a/production/sdk/collect.sh +++ b/production/sdk/collect.sh @@ -36,8 +36,8 @@ echo "umask explicitly set to 0002, old value was $oldumask" source localBuildProperties.shsource 2>/dev/null export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds} -export JAVA_HOME=/shared/common/jdk1.8.0_x64-latest -export ANT_HOME=/shared/common/apache-ant-1.9.4 +export JAVA_HOME=/shared/common/jdk1.7.0-latest +export ANT_HOME=/shared/common/apache-ant-1.9.2 export PATH=${JAVA_HOME}/bin:${ANT_HOME}/bin:$PATH diff --git a/production/sdk/promoteStableRelease/promoteImpl/promoteUtilities.shsource b/production/sdk/promoteStableRelease/promoteImpl/promoteUtilities.shsource index 2acd7b1cf..65cf9c502 100644 --- a/production/sdk/promoteStableRelease/promoteImpl/promoteUtilities.shsource +++ b/production/sdk/promoteStableRelease/promoteImpl/promoteUtilities.shsource @@ -1,6 +1,6 @@ #!/usr/bin/env bash -export JAVA_HOME=/shared/common/jdk1.8.0_x64-latest +export JAVA_HOME=/shared/common/jdk1.7.0-latest export JAVA_EXEC_DIR=${JAVA_HOME}/bin export JAVA_CMD=${JAVA_EXEC_DIR}/java diff --git a/production/sdk/promotion/runAntRunner.sh b/production/sdk/promotion/runAntRunner.sh index 3ded9b5c6..19fd581f2 100755 --- a/production/sdk/promotion/runAntRunner.sh +++ b/production/sdk/promotion/runAntRunner.sh @@ -71,7 +71,7 @@ fi if [[ -z "${JAVA_HOME}" ]] then - export JAVA_HOME=${JAVA_HOME:-/shared/common/jdk1.8.0_x64-latest} + export JAVA_HOME=${JAVA_HOME:-/shared/common/jdk1.7.0-latest} fi if [[ ! -d "${JAVA_HOME}" ]] then diff --git a/production/sdk/updaterepo/updateComposite.sh b/production/sdk/updaterepo/updateComposite.sh index 47a698679..d5d84afc4 100755 --- a/production/sdk/updaterepo/updateComposite.sh +++ b/production/sdk/updaterepo/updateComposite.sh @@ -9,7 +9,7 @@ JAVA_6_HOME=${JAVA_6_HOME:-/shared/common/jdk1.6.0-latest} JAVA_7_HOME=${JAVA_7_HOME:-/shared/common/jdk1.7.0-latest} JAVA_8_HOME=${JAVA_8_HOME:-/shared/common/jdk1.8.0_x64-latest} -export JAVA_HOME=${JAVA_8_HOME} +export JAVA_HOME=${JAVA_7_HOME} devJRE="${JAVA_HOME}"/bin/java diff --git a/production/testScripts/configuration/sdk.tests/testScripts/testTestXMLScript.sh b/production/testScripts/configuration/sdk.tests/testScripts/testTestXMLScript.sh index edfd592b0..373b3db35 100755 --- a/production/testScripts/configuration/sdk.tests/testScripts/testTestXMLScript.sh +++ b/production/testScripts/configuration/sdk.tests/testScripts/testTestXMLScript.sh @@ -42,9 +42,9 @@ export ANT_HOME=/shared/common/apache-ant-1.8.4/ # it also becomes the instance that runs the tests. #export JAVA_HOME=/shared/common/jdk1.5.0-latest #export JAVA_HOME=/shared/common/jdk1.6.0-latest +#export JAVA_HOME=/shared/common/jdk1.7.0-latest #export JAVA_HOME=/shared/common/jdk1.8.0_x64-latest -#export JAVA_HOME=/shared/common/jdk1.8.0_x64-latest -export JAVA_HOME=${JAVA_HOME:-/shared/common/jdk1.8.0_x64-latest} +export JAVA_HOME=/shared/common/jdk1.7.0-latest export PATH=${JAVA_HOME}/bin:${ANT_HOME}/bin:/usr/local/bin:/usr/bin:/bin:${HOME}/bin diff --git a/production/testScripts/test_runTests2.xml.sh b/production/testScripts/test_runTests2.xml.sh index fa912e333..40d7c2da8 100755 --- a/production/testScripts/test_runTests2.xml.sh +++ b/production/testScripts/test_runTests2.xml.sh @@ -44,9 +44,10 @@ export ANT_HOME=/shared/common/apache-ant-1.8.4/ # it also becomes the instance that runs the tests. #export JAVA_HOME=/shared/common/jdk1.5.0-latest #export JAVA_HOME=/shared/common/jdk1.6.0-latest +#export JAVA_HOME=/shared/common/jdk1.7.0-latest #export JAVA_HOME=/shared/common/jdk1.8.0_x64-latest -#export JAVA_HOME=/shared/common/jdk1.8.0_x64-latest -export JAVA_HOME=${JAVA_HOME:-/shared/common/jdk1.8.0_x64-latest} + +export JAVA_HOME=/shared/common/jdk1.7.0-latest export WORKSPACE=${HOME}/tempworkarea/ export PATH=${JAVA_HOME}/bin:${ANT_HOME}/bin:/usr/local/bin:/usr/bin:/bin:${HOME}/bin diff --git a/production/testScripts/updateTestResultsPages.sh b/production/testScripts/updateTestResultsPages.sh index 4fbc87773..869eb3761 100755 --- a/production/testScripts/updateTestResultsPages.sh +++ b/production/testScripts/updateTestResultsPages.sh @@ -103,10 +103,9 @@ fi JAVA_7_HOME=${JAVA_7_HOME:-/shared/common/jdk1.7.0-latest} - JAVA_8_HOME=${JAVA_8_HOME:-/shared/common/jdk1.8.0_x64-latest} -export JAVA_HOME=${JAVA_HOME:-${JAVA_8_HOME}} +export JAVA_HOME=${JAVA_HOME:-${JAVA_7_HOME}} devJRE=$JAVA_HOME/jre/bin/java diff --git a/scripts/xsl/upVersionParents.sh b/scripts/xsl/upVersionParents.sh index 4fbe86fd4..d2056d46f 100755 --- a/scripts/xsl/upVersionParents.sh +++ b/scripts/xsl/upVersionParents.sh @@ -7,7 +7,7 @@ LOG=$(pwd)/log_$( date +%Y%m%d%H%M%S ).txt exec >>$LOG 2>&1 LREPO=$(pwd)/../localMavenRepo -export JAVA_HOME=/opt/local/jdk1.8.0_x64-latest +export JAVA_HOME=/opt/local/jdk1.7.0-latest TMP_DIR=$(pwd)/../tmp mkdir -p $TMP_DIR export MAVEN_OPTS="-Xmx2560m -XX:MaxPermSize=256M -Djava.io.tmpdir=${TMP_DIR}" |