Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSravan Kumar Lakkimsetti2017-07-27 08:16:33 -0400
committerSravan Kumar Lakkimsetti2017-07-27 08:18:09 -0400
commitb7ba3f77d3219e651783eb1e6e31fdb4f61431d5 (patch)
tree5e11066f7d89b9905068c3b17f249b2ac869856e
parent1714befb5257277a9ffb3c6165d185f10d557ca2 (diff)
downloadeclipse.platform.releng.aggregator-b7ba3f77d3219e651783eb1e6e31fdb4f61431d5.tar.gz
eclipse.platform.releng.aggregator-b7ba3f77d3219e651783eb1e6e31fdb4f61431d5.tar.xz
eclipse.platform.releng.aggregator-b7ba3f77d3219e651783eb1e6e31fdb4f61431d5.zip
Bug 518239 - [JUnit 5] Feature patch for JUnit 5 support on 4.7
Change-Id: Id733e697246e37feaa2c1f8676e3baad5c7e75ba Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
-rwxr-xr-xproduction/build-functions.shsource4
-rwxr-xr-xproduction/sdk/bootstrap/mb47U_hudson.sh2
2 files changed, 3 insertions, 3 deletions
diff --git a/production/build-functions.shsource b/production/build-functions.shsource
index 1635d00e..428da5a4 100755
--- a/production/build-functions.shsource
+++ b/production/build-functions.shsource
@@ -424,7 +424,7 @@ fn-maven-build-aggregator ()
# bug 471835 (See bug 478483)
# Note: reactorBuildTimestampProperty was added as a work around for bug 486698.
# It should be removed once bug 486783 is fixed. I created bug 489510 as a reminder to remove the workaround.
- if [[ "${PATCH_BUILD}" == "junit5" ]] then
+ if [[ "${PATCH_BUILD}" == "junit5" ]]; then
mvn $MARGS ${FAIL_OPTION} ${MAVEN_SETTINGS} -V ${ALT_POM_FILE} \
clean verify \
-DskipTests=true \
@@ -626,7 +626,7 @@ fn-pom-version-updater ()
report=${TMP_DIR}/pom_${BUILD_ID}.txt
pushd "$REPO_DIR"
- if [[ "${PATCH_BUILD}" == "junit5" ]] then
+ if [[ "${PATCH_BUILD}" == "junit5" ]]; then
mvn ${MAVEN_SETTINGS} $MARGS ${ALT_POM_FILE} \
org.eclipse.tycho:tycho-versions-plugin:1.1.0-SNAPSHOT:update-pom \
-Dmaven.repo.local=$LOCAL_REPO -Djava.io.tmpdir=${MAVEN_TMP_DIR}\
diff --git a/production/sdk/bootstrap/mb47U_hudson.sh b/production/sdk/bootstrap/mb47U_hudson.sh
index 5d11f943..c4a1364d 100755
--- a/production/sdk/bootstrap/mb47U_hudson.sh
+++ b/production/sdk/bootstrap/mb47U_hudson.sh
@@ -83,7 +83,7 @@ echo "umask explicitly set to $NEWUMASK, old value was $oldumask"
#export BRANCH=BETA_JAVA9
export BRANCH=master
export BUILD_TYPE=U
-export STREAM=4.7.0
+export STREAM=4.8.0
export PATCH_BUILD=junit5
eclipseStreamMajor=${STREAM:0:1}

Back to the top