move to 4.2 Eclispe SDK as bases for aggregation and tests

aggr.properties

diff --git a/aggr.properties b/aggr.properties
index 12f8f81..6a5a677 100644
--- a/aggr.properties
+++ b/aggr.properties
@@ -52,11 +52,9 @@
 
 # properties say what to consider eclipse home
 ECLIPSE_HOME_42=${ECLIPSE_INSTALL}/eclipse42
-ECLIPSE_HOME_42_TEST=${ECLIPSE_INSTALL}/eclipse42Test
 
 ECLIPSE_HOME=${ECLIPSE_HOME_42}
 
-#ECLIPSE_HOME_TEST=${ECLIPSE_HOME_42_TEST}
 ECLIPSE_HOME_TEST=${BUILD_HOME}/testInstance
 ECLIPSE_TEST_EXE=${ECLIPSE_HOME_TEST}/eclipse/eclipse
 

aggr_properties.shsource

diff --git a/aggr_properties.shsource b/aggr_properties.shsource
index 6d91a06..4a342ac 100644
--- a/aggr_properties.shsource
+++ b/aggr_properties.shsource
@@ -51,11 +51,9 @@
 
 # properties say what to consider eclipse home
 ECLIPSE_HOME_42=${ECLIPSE_INSTALL}/eclipse42
-ECLIPSE_HOME_42_TEST=${ECLIPSE_INSTALL}/eclipse42Test
 
 ECLIPSE_HOME=${ECLIPSE_HOME_42}
 
-#ECLIPSE_HOME_TEST=${ECLIPSE_HOME_42_TEST}
 ECLIPSE_HOME_TEST=${BUILD_HOME}/testInstance
 ECLIPSE_TEST_EXE=${ECLIPSE_HOME_TEST}/eclipse/eclipse
 

pauseAll.sh

diff --git a/pauseAll.sh b/pauseAll.sh
index f08f939..7007644 100644
--- a/pauseAll.sh
+++ b/pauseAll.sh
@@ -21,6 +21,7 @@
 else
     echo
     echo "release: ${release}"
+    export "release"
     echo
 fi
 

production.properties

diff --git a/production.properties b/production.properties
index 20139be..d105816 100644
--- a/production.properties
+++ b/production.properties
@@ -52,11 +52,9 @@
 
 # properties say what to consider eclipse home
 ECLIPSE_HOME_42=${ECLIPSE_INSTALL}/eclipse42
-ECLIPSE_HOME_42_TEST=${ECLIPSE_INSTALL}/eclipse42Test
 
 ECLIPSE_HOME=${ECLIPSE_HOME_42}
 
-#ECLIPSE_HOME_TEST=${ECLIPSE_HOME_42_TEST}
 ECLIPSE_HOME_TEST=${BUILD_HOME}/testInstance
 ECLIPSE_TEST_EXE=${ECLIPSE_HOME_TEST}/eclipse/eclipse
 

sampleLocalOverrides/aggr.properties

diff --git a/sampleLocalOverrides/aggr.properties b/sampleLocalOverrides/aggr.properties
index 0609a9e..7e7a16c 100755
--- a/sampleLocalOverrides/aggr.properties
+++ b/sampleLocalOverrides/aggr.properties
@@ -53,14 +53,14 @@
 
 # properties say what to consider eclipse home
 ECLIPSE_HOME_42=${ECLIPSE_INSTALL}/eclipse42
-ECLIPSE_HOME_42_TEST=${ECLIPSE_INSTALL}/eclipse42Test
 
 ECLIPSE_HOME=${ECLIPSE_HOME_42}
 
-#ECLIPSE_HOME_TEST=${ECLIPSE_HOME_42_TEST}
 ECLIPSE_HOME_TEST=${BUILD_HOME}/testInstance
 ECLIPSE_TEST_EXE=${ECLIPSE_HOME_TEST}/eclipse/eclipse
 
+# note, stagingsegment must be set before this file is "read" by ant
+# and then ant will set stagingDirectory correctly
 stagingDirectory=${REPO_ROOT}/releases/${stagingsegment}
 releaseDirectory=${REPO_ROOT}/releases/${release}
 testRepoDirectory=${stagingDirectory}

sampleLocalOverrides/aggr_properties.shsource

diff --git a/sampleLocalOverrides/aggr_properties.shsource b/sampleLocalOverrides/aggr_properties.shsource
index ccfc195..5a0fda1 100755
--- a/sampleLocalOverrides/aggr_properties.shsource
+++ b/sampleLocalOverrides/aggr_properties.shsource
@@ -51,11 +51,9 @@
 
 # properties say what to consider eclipse home
 ECLIPSE_HOME_42=${ECLIPSE_INSTALL}/eclipse42
-ECLIPSE_HOME_42_TEST=${ECLIPSE_INSTALL}/eclipse42Test
 
 ECLIPSE_HOME=${ECLIPSE_HOME_42}
 
-#ECLIPSE_HOME_TEST=${ECLIPSE_HOME_42_TEST}
 ECLIPSE_HOME_TEST=${BUILD_HOME}/testInstance
 ECLIPSE_TEST_EXE=${ECLIPSE_HOME_TEST}/eclipse/eclipse
 
@@ -98,7 +96,7 @@
 # We use this redirection, so scripts only need to use "full_filename", but exact version controlled by properties
 FULL_FILENAME=${FULL_FILENAME_420}
 
-BRANCH_BUILD=master
+BRANCH_BUILD=${BRANCH_BUILD:-master}
 TMPDIR_BUILD=sbbuild
 BRANCH_TOOLS=master
 TMPDIR_TOOLS=sbtools