Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2017-02-10 05:28:47 -0500
committerAlexander Kurtakov2017-02-10 05:31:52 -0500
commitec31ce2839b307d68448890bb67c7e9565ec10fb (patch)
treefc1e434b235ca015c68e383932470b0845b0661c
parent2bd49524b95674eebc0433e906f377ad339c8103 (diff)
downloadeclipse.platform.releng.aggregator-ec31ce2839b307d68448890bb67c7e9565ec10fb.tar.gz
eclipse.platform.releng.aggregator-ec31ce2839b307d68448890bb67c7e9565ec10fb.tar.xz
eclipse.platform.releng.aggregator-ec31ce2839b307d68448890bb67c7e9565ec10fb.zip
Bug 502962 - Activate build-individual-bundles profile automatically
The only case when bulid-individual-bundles shouldn't be enables is when doing aggregator build (aka full build). For any other place to start building some module one needs this profile enabled as otherwise the build fails with resolution problems. It would also happen new comers who will be able to clone e.g. platform.ui git repo and 'mvn clean verify' will work instead of the current situation where one has to find out the magical -Pbuild-individual-bundles to make it work. Change-Id: I714e3de04f0493692a5814ec934cb224ec6db7af Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
-rw-r--r--eclipse-platform-parent/pom.xml6
-rw-r--r--pom.xml6
-rwxr-xr-xproduction/build-functions.shsource1
3 files changed, 12 insertions, 1 deletions
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index b2b80609..d7bb2585 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -632,6 +632,12 @@
</profile>
<profile>
<id>build-individual-bundles</id>
+ <activation>
+ <property>
+ <!-- Enable if aggregatorBuild property is not set -->
+ <name>!aggregatorBuild</name>
+ </property>
+ </activation>
<properties>
<!--
This eclipse-p2-repo.url is specifically for the build individual bundles profile and Gerrit jobs.
diff --git a/pom.xml b/pom.xml
index 651bdc5c..d836dac5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2014 Eclipse Foundation.
+ Copyright (c) 2012, 2017 Eclipse Foundation.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
@@ -20,6 +20,10 @@
<artifactId>platform-aggregator</artifactId>
<version>4.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
+ <properties>
+ <!--Property used in parent pom which if defined disables activation of build-individual-bundles profile -->
+ <aggregatorBuild>true</aggregatorBuild>
+ </properties>
<modules>
diff --git a/production/build-functions.shsource b/production/build-functions.shsource
index 18c1dd34..a1b4a9f6 100755
--- a/production/build-functions.shsource
+++ b/production/build-functions.shsource
@@ -618,6 +618,7 @@ fn-pom-version-updater ()
mvn ${MAVEN_SETTINGS} $MARGS ${ALT_POM_FILE} \
org.eclipse.tycho:tycho-versions-plugin:0.26.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"
RC=$?
if [[ $RC != 0 ]]

Back to the top