Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2015-03-07 14:55:42 +0000
committerDavid Williams2015-03-07 14:55:42 +0000
commite78217dcf13d94cdfbdf646937d81f27ed4236ca (patch)
treeaae20d93883ada10040cba565298455bd8f8f775
parent0d7a4f7dbd8b5e618cb02772d27faeda2b3829b8 (diff)
downloadeclipse.platform.releng.aggregator-e78217dcf13d94cdfbdf646937d81f27ed4236ca.tar.gz
eclipse.platform.releng.aggregator-e78217dcf13d94cdfbdf646937d81f27ed4236ca.tar.xz
eclipse.platform.releng.aggregator-e78217dcf13d94cdfbdf646937d81f27ed4236ca.zip
Bug 460848 - Move to use JDK 1.8 to "run build"
This commit is for all "miscellanious" uses of Java, for various "side" tasks. Less important to move to Java 8, and some chance some of them perhaps should not use Java 8? (but, nothing obvious).
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/buildproperties.phpHoldForLocalTests4
-rwxr-xr-xproduction/sdk/collect.sh2
-rw-r--r--production/sdk/promoteStableRelease/promoteImpl/promoteUtilities.shsource2
-rwxr-xr-xproduction/sdk/promotion/runAntRunner.sh2
-rwxr-xr-xproduction/sdk/updaterepo/updateComposite.sh2
-rwxr-xr-xproduction/testScripts/configuration/sdk.tests/testScripts/testTestXMLScript.sh4
-rwxr-xr-xproduction/testScripts/test_runTests2.xml.sh4
-rwxr-xr-xproduction/testScripts/updateTestResultsPages.sh2
-rwxr-xr-xscripts/xsl/upVersionParents.sh2
9 files changed, 12 insertions, 12 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/buildproperties.phpHoldForLocalTests b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/buildproperties.phpHoldForLocalTests
index 668ad46d..1d7f6a9d 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.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";
+$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";
$INITIAL_ENV_FILE = "/shared/eclipse/builds/4N/production/build_eclipse_org.shsource";
$BUILD_ROOT = "/shared/eclipse/builds/4N";
$BRANCH = "master";
@@ -17,7 +17,7 @@ $STREAM = "4.5.0";
$BUILD_TYPE = "N";
$TIMESTAMP = "20140707-2000";
$TMP_DIR = "/shared/eclipse/builds/4N/tmp";
-$JAVA_HOME = "/shared/common/jdk1.7.0-latest";
+$JAVA_HOME = "/shared/common/jdk1.8.0_x64-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";
diff --git a/production/sdk/collect.sh b/production/sdk/collect.sh
index 2cb2ca6f..3e26ee34 100755
--- a/production/sdk/collect.sh
+++ b/production/sdk/collect.sh
@@ -36,7 +36,7 @@ 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.7.0-latest
+export JAVA_HOME=/shared/common/jdk1.8.0_x64-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 65cf9c50..2acd7b1c 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.7.0-latest
+export JAVA_HOME=/shared/common/jdk1.8.0_x64-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 19fd581f..3ded9b5c 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.7.0-latest}
+ export JAVA_HOME=${JAVA_HOME:-/shared/common/jdk1.8.0_x64-latest}
fi
if [[ ! -d "${JAVA_HOME}" ]]
then
diff --git a/production/sdk/updaterepo/updateComposite.sh b/production/sdk/updaterepo/updateComposite.sh
index 274f54a4..506b9a1e 100755
--- a/production/sdk/updaterepo/updateComposite.sh
+++ b/production/sdk/updaterepo/updateComposite.sh
@@ -6,7 +6,7 @@
JAVA_5_HOME=${JAVA_5_HOME:-/shared/common/jdk1.5.0-latest}
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_7_HOME=${JAVA_7_HOME:-/shared/common/jdk1.8.0_x64-latest}
export JAVA_HOME=${JAVA_7_HOME}
diff --git a/production/testScripts/configuration/sdk.tests/testScripts/testTestXMLScript.sh b/production/testScripts/configuration/sdk.tests/testScripts/testTestXMLScript.sh
index 373b3db3..4d150c70 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.7.0-latest
+#export JAVA_HOME=/shared/common/jdk1.8.0_x64-latest
+export JAVA_HOME=/shared/common/jdk1.8.0_x64-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 34489349..7b51acbc 100755
--- a/production/testScripts/test_runTests2.xml.sh
+++ b/production/testScripts/test_runTests2.xml.sh
@@ -44,9 +44,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.7.0-latest
+#export JAVA_HOME=/shared/common/jdk1.8.0_x64-latest
+export JAVA_HOME=/shared/common/jdk1.8.0_x64-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 b9140df0..e44f3b5b 100755
--- a/production/testScripts/updateTestResultsPages.sh
+++ b/production/testScripts/updateTestResultsPages.sh
@@ -103,7 +103,7 @@ fi
-JAVA_7_HOME=${JAVA_7_HOME:-/shared/common/jdk1.7.0-latest}
+JAVA_7_HOME=${JAVA_7_HOME:-/shared/common/jdk1.8.0_x64-latest}
export JAVA_HOME=${JAVA_HOME:-${JAVA_7_HOME}}
diff --git a/scripts/xsl/upVersionParents.sh b/scripts/xsl/upVersionParents.sh
index d2056d46..4fbe86fd 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.7.0-latest
+export JAVA_HOME=/opt/local/jdk1.8.0_x64-latest
TMP_DIR=$(pwd)/../tmp
mkdir -p $TMP_DIR
export MAVEN_OPTS="-Xmx2560m -XX:MaxPermSize=256M -Djava.io.tmpdir=${TMP_DIR}"

Back to the top