Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSravan Kumar Lakkimsetti2017-07-27 08:13:16 -0400
committerSravan Kumar Lakkimsetti2017-07-27 08:13:16 -0400
commit1714befb5257277a9ffb3c6165d185f10d557ca2 (patch)
treef48e6ebcb59e1a23bce9f1784e0c935d5889d788
parent57253d3e947a700a135526b23674553e4e7c2cfd (diff)
downloadeclipse.platform.releng.aggregator-1714befb5257277a9ffb3c6165d185f10d557ca2.tar.gz
eclipse.platform.releng.aggregator-1714befb5257277a9ffb3c6165d185f10d557ca2.tar.xz
eclipse.platform.releng.aggregator-1714befb5257277a9ffb3c6165d185f10d557ca2.zip
Bug 518239 - [JUnit 5] Feature patch for JUnit 5 support on 4.7
Change-Id: Idf89434d20c822eae2c800ca56453b90dfaa2e16 Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
-rwxr-xr-xproduction/build-functions.shsource43
1 files changed, 30 insertions, 13 deletions
diff --git a/production/build-functions.shsource b/production/build-functions.shsource
index a35aea98..1635d00e 100755
--- a/production/build-functions.shsource
+++ b/production/build-functions.shsource
@@ -424,14 +424,24 @@ 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.
- mvn $MARGS ${FAIL_OPTION} ${MAVEN_SETTINGS} -V ${ALT_POM_FILE} \
- clean verify \
- -DskipTests=true \
- -Dmaven.repo.local=$LOCAL_REPO $CBI_JDT_REPO_URL_ARG $CBI_JDT_VERSION_ARG \
- -Dtycho.debug.artifactcomparator -Djava.io.tmpdir=${MAVEN_TMP_DIR}\
- -Dcbi.jarsigner.continueOnFail=true -Djgit.dirtyWorkingTree=error \
- -DaggregatorBuild=true \
- -DbuildTimestamp="${TIMESTAMP}" -DbuildType="${BUILD_TYPE}" -DbuildId="${BUILD_ID}" -Declipse-p2-repo.url="NOT_FOR_PRODUCTION_USE" ${FORCEQUALIFIERARG} ${CODE_WARNINGS} ${JAVA_DOC_TOOL}
+ if [[ "${PATCH_BUILD}" == "junit5" ]] then
+ mvn $MARGS ${FAIL_OPTION} ${MAVEN_SETTINGS} -V ${ALT_POM_FILE} \
+ clean verify \
+ -DskipTests=true \
+ -Dmaven.repo.local=$LOCAL_REPO $CBI_JDT_REPO_URL_ARG $CBI_JDT_VERSION_ARG \
+ -Dtycho.debug.artifactcomparator -Djava.io.tmpdir=${MAVEN_TMP_DIR}\
+ -Dcbi.jarsigner.continueOnFail=true -Djgit.dirtyWorkingTree=error \
+ -DbuildTimestamp="${TIMESTAMP}" -DbuildType="${BUILD_TYPE}" -DbuildId="${BUILD_ID}" -Declipse-p2-repo.url="NOT_FOR_PRODUCTION_USE" ${FORCEQUALIFIERARG} ${CODE_WARNINGS} ${JAVA_DOC_TOOL}
+ else
+ mvn $MARGS ${FAIL_OPTION} ${MAVEN_SETTINGS} -V ${ALT_POM_FILE} \
+ clean verify \
+ -DskipTests=true \
+ -Dmaven.repo.local=$LOCAL_REPO $CBI_JDT_REPO_URL_ARG $CBI_JDT_VERSION_ARG \
+ -Dtycho.debug.artifactcomparator -Djava.io.tmpdir=${MAVEN_TMP_DIR}\
+ -Dcbi.jarsigner.continueOnFail=true -Djgit.dirtyWorkingTree=error \
+ -DaggregatorBuild=true \
+ -DbuildTimestamp="${TIMESTAMP}" -DbuildType="${BUILD_TYPE}" -DbuildId="${BUILD_ID}" -Declipse-p2-repo.url="NOT_FOR_PRODUCTION_USE" ${FORCEQUALIFIERARG} ${CODE_WARNINGS} ${JAVA_DOC_TOOL}
+ fi
rc=$?
popd
return $rc
@@ -616,11 +626,18 @@ fn-pom-version-updater ()
report=${TMP_DIR}/pom_${BUILD_ID}.txt
pushd "$REPO_DIR"
- 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}\
- -DaggregatorBuild=true \
- -DbuildTimestamp="${TIMESTAMP}" -DbuildType="${BUILD_TYPE}" -DbuildId="${BUILD_ID}" -Declipse-p2-repo.url="NOT_FOR_PRODUCTION_USE"
+ 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}\
+ -DbuildTimestamp="${TIMESTAMP}" -DbuildType="${BUILD_TYPE}" -DbuildId="${BUILD_ID}" -Declipse-p2-repo.url="NOT_FOR_PRODUCTION_USE"
+ else
+ 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}\
+ -DaggregatorBuild=true \
+ -DbuildTimestamp="${TIMESTAMP}" -DbuildType="${BUILD_TYPE}" -DbuildId="${BUILD_ID}" -Declipse-p2-repo.url="NOT_FOR_PRODUCTION_USE"
+ fi
RC=$?
if [[ $RC != 0 ]]
then

Back to the top