Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2018-06-05 04:28:12 -0400
committerAlexander Kurtakov2018-06-05 04:28:12 -0400
commitae1518b252f63590fcfaac2c8d8e6e2a96fdef63 (patch)
tree096a19f5e1b5a8ca30325ed476b3fc7677b4913e /production/build-functions.shsource
parent8e3a0239c2634766eb4345ee055557886c6ed73c (diff)
downloadeclipse.platform.releng.aggregator-ae1518b252f63590fcfaac2c8d8e6e2a96fdef63.tar.gz
eclipse.platform.releng.aggregator-ae1518b252f63590fcfaac2c8d8e6e2a96fdef63.tar.xz
eclipse.platform.releng.aggregator-ae1518b252f63590fcfaac2c8d8e6e2a96fdef63.zip
Bug 535537 - Use released Tycho 1.2.0 version
Really changed to 1.2.0 in update-poms invocation. Removed the various patch builds configs to reduce the clutter. Change-Id: I8929b8a6c33bc0644e9ae05472b13ed7f9ead908 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Diffstat (limited to 'production/build-functions.shsource')
-rwxr-xr-xproduction/build-functions.shsource47
1 files changed, 2 insertions, 45 deletions
diff --git a/production/build-functions.shsource b/production/build-functions.shsource
index f8af53bb..a85684df 100755
--- a/production/build-functions.shsource
+++ b/production/build-functions.shsource
@@ -424,15 +424,6 @@ 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
- 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}" ${FORCEQUALIFIERARG} ${CODE_WARNINGS} ${JAVA_DOC_TOOL}
- else
mvn $MARGS ${FAIL_OPTION} ${MAVEN_SETTINGS} -V ${ALT_POM_FILE} \
clean verify \
-DskipTests=true \
@@ -441,7 +432,6 @@ fn-maven-build-aggregator ()
-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
@@ -626,18 +616,11 @@ fn-pom-version-updater ()
report=${TMP_DIR}/pom_${BUILD_ID}.txt
pushd "$REPO_DIR"
- if [[ "${PATCH_BUILD}" == "junit5" ]]; then
mvn ${MAVEN_SETTINGS} $MARGS ${ALT_POM_FILE} \
org.eclipse.tycho:tycho-versions-plugin:1.2.0:update-pom \
-Dmaven.repo.local=$LOCAL_REPO -Djava.io.tmpdir=${MAVEN_TMP_DIR}\
- -DbuildTimestamp="${TIMESTAMP}" -DbuildType="${BUILD_TYPE}" -DbuildId="${BUILD_ID}"
- else
- mvn ${MAVEN_SETTINGS} $MARGS ${ALT_POM_FILE} \
- org.eclipse.tycho:tycho-versions-plugin:1.1.0: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
@@ -668,34 +651,8 @@ fn-gather-repo ()
BUILD_ID="$1"; shift
REPO_DIR="$1"; shift
BUILD_DIR="$1"; shift
- if [[ -n "${PATCH_BUILD}" ]]
- then
- case "${PATCH_BUILD}" in
- "junit5" )
- PATCH_BUILD_GENERIC=junit5
- ;;
- "java9patch47" )
- PATCH_BUILD_GENERIC=java9patch
- ;;
- * )
- PATCH_BUILD_GENERIC=java10patch
- ;;
- esac
- ORIG_PATH=eclipse.platform.releng.tychoeclipsebuilder/${PATCH_BUILD}/eclipse.releng.repository.${PATCH_BUILD_GENERIC}/target/site
- TARGET_PATH=eclipse.platform.releng.tychoeclipsebuilder/${PATCH_BUILD}/eclipse.releng.repository.${PATCH_BUILD_GENERIC}/target/repository
- ORIG_DIR_REPOSITORY=$REPO_DIR/${ORIG_PATH}
- REPO_DIR_REPOSITORY=$REPO_DIR/${TARGET_PATH}
- # old site update-site repos are created in 'site', so we move to 'repository'
- # newer eclipse-repository are in 'repository' already.
- if [[ -e "${ORIG_PATH}" ]]
- then
- mv ${ORIG_DIR_REPOSITORY} ${REPO_DIR_REPOSITORY}
- fi
-
- else
- TARGET_PATH=eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/repository
- REPO_DIR_REPOSITORY=$REPO_DIR/$TAGET_PATH
- fi
+ TARGET_PATH=eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/repository
+ REPO_DIR_REPOSITORY=$REPO_DIR/$TAGET_PATH
if [[ -d "$REPO_DIR_REPOSITORY" ]]
then
pushd "$REPO_DIR"

Back to the top