Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSravan Kumar Lakkimsetti2018-02-05 09:26:19 +0000
committerSravan Kumar Lakkimsetti2018-02-05 09:26:19 +0000
commitd25a73dd1bdad57d63ad806e0fed229cb09dc2e5 (patch)
tree37faf62efea6e9a571ac11e87da7908506fa49dd
parent5034d297df7776917fb29c1c08fd9956fb347c79 (diff)
downloadeclipse.platform.releng.aggregator-d25a73dd1bdad57d63ad806e0fed229cb09dc2e5.tar.gz
eclipse.platform.releng.aggregator-d25a73dd1bdad57d63ad806e0fed229cb09dc2e5.tar.xz
eclipse.platform.releng.aggregator-d25a73dd1bdad57d63ad806e0fed229cb09dc2e5.zip
Bug 512100 - Move to tycho 1.1.0
Change-Id: I1abe3c4c18f34a1e4fca83db1fb9f667001d756d Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
-rw-r--r--eclipse-platform-parent/pom.xml6
-rwxr-xr-xproduction/build-functions.shsource4
2 files changed, 5 insertions, 5 deletions
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index 2a430bf53..8d1459760 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -71,15 +71,15 @@
Need to enable the tycho-snapshot-repo in <pluginRepositories> further down!
Do not use snapshot version for pom-version-updater defined in build-functions.shsource
Use released version for pom-updater
- -->
<tycho.version>1.1.0-SNAPSHOT</tycho.version>
<tycho-extras.version>1.1.0-SNAPSHOT</tycho-extras.version>
+ -->
<!-- using released version (normal case)
when upgrading make sure you change pom-version-updater version in build-functions.shsource
- <tycho.version>0.26.0</tycho.version>
- <tycho-extras.version>0.26.0</tycho-extras.version>
-->
+ <tycho.version>1.1.0</tycho.version>
+ <tycho-extras.version>1.1.0</tycho-extras.version>
<cbi-plugins.version>1.1.5-SNAPSHOT</cbi-plugins.version>
diff --git a/production/build-functions.shsource b/production/build-functions.shsource
index bda03e950..160d140ce 100755
--- a/production/build-functions.shsource
+++ b/production/build-functions.shsource
@@ -628,12 +628,12 @@ fn-pom-version-updater ()
pushd "$REPO_DIR"
if [[ "${PATCH_BUILD}" == "junit5" ]]; then
mvn ${MAVEN_SETTINGS} $MARGS ${ALT_POM_FILE} \
- org.eclipse.tycho:tycho-versions-plugin:1.1.0-SNAPSHOT:update-pom \
+ org.eclipse.tycho:tycho-versions-plugin:1.1.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-SNAPSHOT:update-pom \
+ 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"

Back to the top