Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2013-06-19 18:12:52 -0400
committerDavid Williams2013-06-19 18:12:52 -0400
commitc1c4c2fb70af96e1c32f3cf9c1041e27f44847df (patch)
treeddb5bdec87d61f1d071b5fdd7ac6d852dc6db5b3
parentf469e9ce3856af121611941de91f950d637549ac (diff)
downloadeclipse.platform.releng.aggregator-c1c4c2fb70af96e1c32f3cf9c1041e27f44847df.tar.gz
eclipse.platform.releng.aggregator-c1c4c2fb70af96e1c32f3cf9c1041e27f44847df.tar.xz
eclipse.platform.releng.aggregator-c1c4c2fb70af96e1c32f3cf9c1041e27f44847df.zip
Bug 410835 - Update javadoc version used by our build
-rwxr-xr-xbootstrap/mb4I.sh2
-rwxr-xr-xbootstrap/mb4M.sh2
-rwxr-xr-xbootstrap/mb4N.sh2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/example-buildproperties.php4
-rw-r--r--production/build_eclipse_org.shsource2
-rwxr-xr-xproduction/sdk/collect.sh2
-rw-r--r--production/sdk/promoteKepler/promoteUtilities.shsource2
-rwxr-xr-xproduction/sdk/promotion/runAntRunner.sh2
-rwxr-xr-xproduction/sdk/relengUtils/re-mb4I.sh2
-rwxr-xr-xproduction/sdk/updaterepo/updateComposite.sh2
-rwxr-xr-xproduction/testScripts/updateTestResultsPages.sh2
-rwxr-xr-xscripts/xsl/upVersionParents.sh2
12 files changed, 13 insertions, 13 deletions
diff --git a/bootstrap/mb4I.sh b/bootstrap/mb4I.sh
index 93d29a46..7a7e9d9d 100755
--- a/bootstrap/mb4I.sh
+++ b/bootstrap/mb4I.sh
@@ -61,7 +61,7 @@ source buildeclipse.shsource 2>/dev/null
export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds}
# we should not need the following here in boot strap, for now, but might in future
-#export JAVA_HOME=${JAVA_HOME:-/shared/common/jdk1.7.0_11}
+#export JAVA_HOME=${JAVA_HOME:-/shared/common/jdk1.7.0_25}
#export ANT_HOME=${ANT_HOME:-/shared/common/apache-ant-1.8.4}
#export ANT_OPTS=${ANT_OPTS:-"-Dbuild.sysclasspath=ignore -Dincludeantruntime=false"}
#export MAVEN_PATH=${MAVEN_PATH:-/shared/common/apache-maven-3.0.4/bin}
diff --git a/bootstrap/mb4M.sh b/bootstrap/mb4M.sh
index 6cf69654..f42e9858 100755
--- a/bootstrap/mb4M.sh
+++ b/bootstrap/mb4M.sh
@@ -61,7 +61,7 @@ source buildeclipse.shsource 2>/dev/null
export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds}
# we should not need the following here in boot strap, for now, but might in future
-#export JAVA_HOME=${JAVA_HOME:-/shared/common/jdk1.7.0_11}
+#export JAVA_HOME=${JAVA_HOME:-/shared/common/jdk1.7.0_25}
#export ANT_HOME=${ANT_HOME:-/shared/common/apache-ant-1.8.4}
#export ANT_OPTS=${ANT_OPTS:-"-Dbuild.sysclasspath=ignore -Dincludeantruntime=false"}
#export MAVEN_PATH=${MAVEN_PATH:-/shared/common/apache-maven-3.0.4/bin}
diff --git a/bootstrap/mb4N.sh b/bootstrap/mb4N.sh
index 6903c7fc..63837b5b 100755
--- a/bootstrap/mb4N.sh
+++ b/bootstrap/mb4N.sh
@@ -61,7 +61,7 @@ source buildeclipse.shsource 2>/dev/null
export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds}
# we should not need the following here in boot strap, for now, but might in future
-#export JAVA_HOME=${JAVA_HOME:-/shared/common/jdk1.7.0_11}
+#export JAVA_HOME=${JAVA_HOME:-/shared/common/jdk1.7.0_25}
#export ANT_HOME=${ANT_HOME:-/shared/common/apache-ant-1.8.4}
#export ANT_OPTS=${ANT_OPTS:-"-Dbuild.sysclasspath=ignore -Dincludeantruntime=false"}
#export MAVEN_PATH=${MAVEN_PATH:-/shared/common/apache-maven-3.0.4/bin}
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/example-buildproperties.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/example-buildproperties.php
index f8eceff7..be0439e2 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/example-buildproperties.php
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/example-buildproperties.php
@@ -7,7 +7,7 @@
// a recent copy. This was copied circa March 14, 2013.
// properties written for I20130314-1330
-$PATH = "/shared/common/jdk1.7.0_11/bin:/shared/common/apache-maven-3.0.4/bin:/shared/common/apache-ant-1.8.4/bin:/usr/local/bin:/usr/bin:/bin:/opt/buildhomes/e4Build/bin";
+$PATH = "/shared/common/jdk1.7.0_25/bin:/shared/common/apache-maven-3.0.4/bin:/shared/common/apache-ant-1.8.4/bin:/usr/local/bin:/usr/bin:/bin:/opt/buildhomes/e4Build/bin";
$INITIAL_ENV_FILE = "/shared/eclipse/builds/4I/production/build_eclipse_org.shsource";
$BUILD_ROOT = "/shared/eclipse/builds/4I";
$BRANCH = "master";
@@ -15,7 +15,7 @@ $STREAM = "4.3.0";
$BUILD_TYPE = "I";
$TIMESTAMP = "20130314-1330";
$TMP_DIR = "/shared/eclipse/builds/4I/tmp";
-$JAVA_HOME = "/shared/common/jdk1.7.0_11";
+$JAVA_HOME = "/shared/common/jdk1.7.0_25";
$MAVEN_OPTS = "-Xmx2048m -XX:MaxPermSize=256M -Djava.io.tmpdir=/shared/eclipse/builds/4I/tmp -Dtycho.localArtifacts=ignore";
$MAVEN_PATH = "/shared/common/apache-maven-3.0.4/bin";
$AGGREGATOR_REPO = "git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git";
diff --git a/production/build_eclipse_org.shsource b/production/build_eclipse_org.shsource
index 6a5374cc..30e0eec9 100644
--- a/production/build_eclipse_org.shsource
+++ b/production/build_eclipse_org.shsource
@@ -19,7 +19,7 @@ export TMP_DIR=${TMP_DIR:-${BUILD_ROOT}/tmp}
mkdir -p ${TMP_DIR}
# these could be machine specific
-export JAVA_HOME=${JAVA_HOME:-/shared/common/jdk1.7.0_11}
+export JAVA_HOME=${JAVA_HOME:-/shared/common/jdk1.7.0_25}
# 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"
diff --git a/production/sdk/collect.sh b/production/sdk/collect.sh
index f50166a0..671660d1 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 buildeclipse.shsource 2>/dev/null
-export JAVA_HOME=/shared/common/jdk1.7.0_11
+export JAVA_HOME=/shared/common/jdk1.7.0_25
export ANT_HOME=/shared/common/apache-ant-1.8.4
export PATH=${JAVA_HOME}/bin:${ANT_HOME}/bin:$PATH
diff --git a/production/sdk/promoteKepler/promoteUtilities.shsource b/production/sdk/promoteKepler/promoteUtilities.shsource
index 9bdbe74e..75bb2978 100644
--- a/production/sdk/promoteKepler/promoteUtilities.shsource
+++ b/production/sdk/promoteKepler/promoteUtilities.shsource
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-export JAVA_HOME=/shared/common/jdk1.7.0_11
+export JAVA_HOME=/shared/common/jdk1.7.0_25
export JAVA_EXEC_DIR=${JAVA_HOME}/jre/bin
export JAVA_CMD=${JAVA_EXEC_DIR}/java
diff --git a/production/sdk/promotion/runAntRunner.sh b/production/sdk/promotion/runAntRunner.sh
index df11ed0c..1e77d46f 100755
--- a/production/sdk/promotion/runAntRunner.sh
+++ b/production/sdk/promotion/runAntRunner.sh
@@ -72,7 +72,7 @@ fi
if [[ -z "${JAVA_HOME}" ]]
then
- export JAVA_HOME=${JAVA_HOME:-/shared/common/jdk1.7.0_11}
+ export JAVA_HOME=${JAVA_HOME:-/shared/common/jdk1.7.0_25}
fi
if [[ ! -d "${JAVA_HOME}" ]]
then
diff --git a/production/sdk/relengUtils/re-mb4I.sh b/production/sdk/relengUtils/re-mb4I.sh
index dbfc7142..406e9ee9 100755
--- a/production/sdk/relengUtils/re-mb4I.sh
+++ b/production/sdk/relengUtils/re-mb4I.sh
@@ -77,7 +77,7 @@ source buildeclipse.shsource 2>/dev/null
export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds}
# we should not need the following here in boot strap, for now, but might in future
-#export JAVA_HOME=${JAVA_HOME:-/shared/common/jdk1.7.0_11}
+#export JAVA_HOME=${JAVA_HOME:-/shared/common/jdk1.7.0_25}
#export ANT_HOME=${ANT_HOME:-/shared/common/apache-ant-1.8.4}
#export ANT_OPTS=${ANT_OPTS:-"-Dbuild.sysclasspath=ignore -Dincludeantruntime=false"}
#export MAVEN_PATH=${MAVEN_PATH:-/shared/common/apache-maven-3.0.4/bin}
diff --git a/production/sdk/updaterepo/updateComposite.sh b/production/sdk/updaterepo/updateComposite.sh
index 7a09540d..6f330afb 100755
--- a/production/sdk/updaterepo/updateComposite.sh
+++ b/production/sdk/updaterepo/updateComposite.sh
@@ -7,7 +7,7 @@
#JAVA_5_HOME=${JAVA_5_HOME:-/home/shared/orbit/apps/ibm-java2-i386-50/jre}
JAVA_5_HOME=${JAVA_5_HOME:-/shared/common/jdk-1.5.0-22.x86_64/jre}
JAVA_6_HOME=${JAVA_6_HOME:-/shared/common/sun-jdk1.6.0_21_x64}
-JAVA_7_HOME=${JAVA_7_HOME:-/shared/common/jdk1.7.0_11}
+JAVA_7_HOME=${JAVA_7_HOME:-/shared/common/jdk1.7.0_25}
export JAVA_HOME=${JAVA_7_HOME}
diff --git a/production/testScripts/updateTestResultsPages.sh b/production/testScripts/updateTestResultsPages.sh
index 234b8c03..acd430bd 100755
--- a/production/testScripts/updateTestResultsPages.sh
+++ b/production/testScripts/updateTestResultsPages.sh
@@ -75,7 +75,7 @@ fi
-JAVA_7_HOME=${JAVA_7_HOME:-/shared/common/jdk1.7.0_11}
+JAVA_7_HOME=${JAVA_7_HOME:-/shared/common/jdk1.7.0_25}
export JAVA_HOME=${JAVA_HOME:-${JAVA_7_HOME}}
diff --git a/scripts/xsl/upVersionParents.sh b/scripts/xsl/upVersionParents.sh
index 47e8b1fb..fc5b926b 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_11
+export JAVA_HOME=/opt/local/jdk1.7.0_25
TMP_DIR=$(pwd)/../tmp
mkdir -p $TMP_DIR
export MAVEN_OPTS="-Xmx2048m -XX:MaxPermSize=256M -Djava.io.tmpdir=${TMP_DIR}"

Back to the top